update (#88)

Author: alexeyxo

internal/migrator/clickhouse.go

@@ -20,13 +20,13 @@ import (
 	"github.com/hashicorp/go-multierror"
 
 	_ "github.com/ClickHouse/clickhouse-go/v2"
+	_ "github.com/golang-migrate/migrate/v4/source/file"
 )
 
 var (
 	multiStmtDelimiter = []byte(";")
 
 	DefaultMigrationsTable       = "schema_migrations"
-	DefaultMigrationsTableEngine = "TinyLog"
 	DefaultMultiStatementMaxSize = 10 * 1 << 20 // 10 MB
 
 	ErrNilConfig = fmt.Errorf("no config")
@@ -76,7 +76,7 @@ func (ch *ClickHouse) Open(dsn string) (database.Driver, error) {
 		}
 	}
 
-	migrationsTableEngine := DefaultMigrationsTableEngine
+	migrationsTableEngine := ch.config.MigrationsTableEngine
 	if s := purl.Query().Get("x-migrations-table-engine"); len(s) > 0 {
 		migrationsTableEngine = s
 	}
@@ -115,10 +115,6 @@ func (ch *ClickHouse) init() error {
 		ch.config.MultiStatementMaxSize = DefaultMultiStatementMaxSize
 	}
 
-	if len(ch.config.MigrationsTableEngine) == 0 {
-		ch.config.MigrationsTableEngine = DefaultMigrationsTableEngine
-	}
-
 	return ch.ensureVersionTable()
 }
 

pkl/settings/Settings.pkl

@@ -5,11 +5,11 @@ import "package://pkg.pkl-lang.org/pkl-go/[email protected]#/go.pkl"
 import "healthcheck/HealthcheckConfig.pkl"
 import "logger/LoggerConfig.pkl"
 import "metrics/MetricsConfig.pkl"
-import "migrations/MigrationsConfig.pkl"
+import "migrations/Migration.pkl"
 
 logger: LoggerConfig
 healthCheck: HealthcheckConfig?
 metrics: MetricsConfig?
-migrations:Listing<MigrationsConfig.Migration>?
+migrations:Listing<Migration.Migration>?
 startGCAfterMessageProcess: Boolean = false
 gracefulShutdownDelay:Duration = 15.s

pkl/settings/migrations/MigrationsConfig.pkl renamed to pkl/settings/migrations/Migration.pkl

@@ -15,5 +15,5 @@ class Clickhouse extends Migration {
   fixed driver = "clickhouse"
   path = "/migrations/clickhouse"
   credentials: Common.ChCredentials
-  engine: String?
+  engine: String = "TinyLog"
 }