pkg/database/client.go

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

pkg/models/config.go

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

test/helper.go

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