Skip to content

Bump docker/metadata-action from 3 to 4 #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dependabot wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Bump docker/metadata-action from 3 to 4 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
52e73a8
PROT-2523 | Fork dbmate to work with CH Cluster (#2)
diman-neosec Oct 24, 2021
a9cdead
Merge branch 'amacneil:main' into main
diman-neosec Apr 28, 2022
c5e352e
Bump docker/metadata-action from 3 to 4
dependabot[bot] May 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ jobs:

- name: Generate Docker image tags
id: meta
uses: docker/metadata-action@v3
uses: docker/metadata-action@v4
if: ${{ github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v') }}
with:
images: |
Expand Down
39 changes: 33 additions & 6 deletions pkg/driver/clickhouse/clickhouse.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,11 @@ func (drv *Driver) databaseName() string {
return name
}

func (drv *Driver) onCluster() bool {
onCluster := dbutil.MustParseURL(connectionString(drv.databaseURL)).Query().Get("on_cluster")
return strings.ToLower(onCluster) == "true"
}

var clickhouseValidIdentifier = regexp.MustCompile(`^[a-zA-Z_][0-9a-zA-Z_]*$`)

func (drv *Driver) quoteIdentifier(str string) string {
Expand All @@ -119,7 +124,11 @@ func (drv *Driver) CreateDatabase() error {
}
defer dbutil.MustClose(db)

_, err = db.Exec("create database " + drv.quoteIdentifier(name))
if drv.onCluster() {
_, err = db.Exec("create database " + drv.quoteIdentifier(name) + " on cluster '{cluster}'")
} else {
_, err = db.Exec("create database " + drv.quoteIdentifier(name))
}

return err
}
Expand All @@ -135,15 +144,23 @@ func (drv *Driver) DropDatabase() error {
}
defer dbutil.MustClose(db)

_, err = db.Exec("drop database if exists " + drv.quoteIdentifier(name))
if drv.onCluster() {
_, err = db.Exec("drop database if exists " + drv.quoteIdentifier(name) + " on cluster '{cluster}'")
} else {
_, err = db.Exec("drop database if exists " + drv.quoteIdentifier(name))
}

return err
}

func (drv *Driver) schemaDump(db *sql.DB, buf *bytes.Buffer, databaseName string) error {
buf.WriteString("\n--\n-- Database schema\n--\n\n")

buf.WriteString("CREATE DATABASE " + drv.quoteIdentifier(databaseName) + " IF NOT EXISTS;\n\n")
if drv.onCluster() {
buf.WriteString("CREATE DATABASE " + drv.quoteIdentifier(databaseName) + " IF NOT EXISTS ON CLUSTER '{cluster}';\n\n")
} else {
buf.WriteString("CREATE DATABASE " + drv.quoteIdentifier(databaseName) + " IF NOT EXISTS;\n\n")
}

tables, err := dbutil.QueryColumn(db, "show tables")
if err != nil {
Expand Down Expand Up @@ -244,15 +261,25 @@ func (drv *Driver) MigrationsTableExists(db *sql.DB) (bool, error) {

// CreateMigrationsTable creates the schema migrations table
func (drv *Driver) CreateMigrationsTable(db *sql.DB) error {
onCluster := drv.onCluster()

onClusterClause := ""
engineClause := "engine = ReplacingMergeTree(ts)"

if onCluster {
onClusterClause = "on cluster '{cluster}'"
engineClause = "engine = ReplicatedReplacingMergeTree('/clickhouse/{installation}/{cluster}/tables/{table}', '{replica}', ts)"
}

_, err := db.Exec(fmt.Sprintf(`
create table if not exists %s (
create table if not exists %s %s (
version String,
ts DateTime default now(),
applied UInt8 default 1
) engine = ReplacingMergeTree(ts)
) %s
primary key version
order by version
`, drv.quotedMigrationsTableName()))
`, drv.quotedMigrationsTableName(), onClusterClause, engineClause))

return err
}
Expand Down