Anthrove/otter-space-sdk
5
0
Fork 0
Code Issues Pull Requests Actions Projects Releases 9 Activity

Merge branch 'main' into dev/post-reports
All checks were successful
Gitea Build Check / Build (pull_request) Successful in 3m2s
Details

Browse Source
This commit is contained in:
SoXX 2024-11-06 11:11:59 +00:00
commit 8bb2328307
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/database/client.go
View File

@ -70,9 +70,11 @@ func Connect(ctx context.Context, config models.DatabaseConfig) error {
return utils.HandleError(ctx, span, localLogger, err) return utils.HandleError(ctx, span, localLogger, err)
} }
err = migrateDatabase(ctx, sqlDB, config) if config.Migrate {
if err != nil { err = migrateDatabase(ctx, sqlDB, config)
return utils.HandleError(ctx, span, localLogger, err) if err != nil {
return utils.HandleError(ctx, span, localLogger, err)
}
} }
client = sqlDB client = sqlDB

1
pkg/models/config.go
View File

@ -9,4 +9,5 @@ type DatabaseConfig struct {
SSL bool `env:"DB_SSL,required" envDefault:"true"` SSL bool `env:"DB_SSL,required" envDefault:"true"`
Timezone string `env:"DB_TIMEZONE,required" envDefault:"Europe/Berlin"` Timezone string `env:"DB_TIMEZONE,required" envDefault:"Europe/Berlin"`
Debug bool `env:"DB_DEBUG" envDefault:"false"` Debug bool `env:"DB_DEBUG" envDefault:"false"`
Migrate bool
} }

1
test/helper.go
View File

@ -121,6 +121,7 @@ func DatabaseModesFromConnectionString(ctx context.Context, pgContainer *postgre
SSL: false, SSL: false,
Timezone: "Europe/Berlin", Timezone: "Europe/Berlin",
Debug: true, Debug: true,
Migrate: true,
} }
return databaseConfig, nil return databaseConfig, nil