fix database config parsing

c9s · Jan 26, 2024 · 93bddfd · 93bddfd
1 parent 2742b19
commit 93bddfd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/pkg/bbgo/config.go b/pkg/bbgo/config.go
@@ -327,10 +327,10 @@ type ServiceConfig struct {
 }
 
 type DatabaseConfig struct {
-	Driver string `json:"driver"`
-	DSN    string `json:"dsn"`
+	Driver string `json:"driver" yaml:"driver"`
+	DSN    string `json:"dsn" yaml:"dsn"`
 
-	ExtraMigrationPackages []string `json:"extraMigrationPackages"`
+	ExtraMigrationPackages []string `json:"extraMigrationPackages" yaml:"extraMigrationPackages"`
 }
 
 type EnvironmentConfig struct {

diff --git a/pkg/bbgo/environment.go b/pkg/bbgo/environment.go
@@ -198,13 +198,13 @@ func (environ *Environment) ConfigureDatabase(ctx context.Context, config *Confi
 
 func (environ *Environment) ConfigureDatabaseDriver(ctx context.Context, driver string, dsn string, extraPkgNames ...string) error {
 	environ.DatabaseService = service.NewDatabaseService(driver, dsn)
+	environ.DatabaseService.AddMigrationPackages(extraPkgNames...)
+
 	err := environ.DatabaseService.Connect()
 	if err != nil {
 		return err
 	}
 
-	environ.DatabaseService.AddMigrationPackages(extraPkgNames...)
-
 	if err := environ.DatabaseService.Upgrade(ctx); err != nil {
 		return err
 	}