From 93bddfdccd90c52308ca24a673e50808b4f26dbd Mon Sep 17 00:00:00 2001 From: c9s Date: Fri, 26 Jan 2024 16:39:05 +0800 Subject: [PATCH] fix database config parsing --- pkg/bbgo/config.go | 6 +++--- pkg/bbgo/environment.go | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/bbgo/config.go b/pkg/bbgo/config.go index 2fce203da6..ff85a5a98f 100644 --- 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 index 4caf86c3d6..a7873ef6bf 100644 --- 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 }