jacob-mathison/query-orchestration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

Merged in feature/linting (pull request #168)

Browse Source 
Linting Updates

* precommit

* smallerchecks

* govuln
This commit is contained in:
Michael McGuinness
2025-06-23 15:58:20 +00:00
parent daf4d4b94b
commit 3028fe7eaa
24 changed files with 226 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/database/migrations.go
+8 -7
View File
@@ -4,6 +4,7 @@ import (
"context"
"database/sql"
"embed"
"errors"
"fmt"
"log/slog"
@@ -21,14 +22,14 @@ func createDB(ctx context.Context, cfg database.ConfigProvider) error {
db, err := sql.Open(cfg.GetDBDriver(), cfg.GetDBAdminDBURI())
if err != nil {
return fmt.Errorf("error opening admin database: %v", err)
return fmt.Errorf("error opening admin database: %w", err)
}
slog.Debug("pinging admin database", "uri", cfg.GetDBAdminDBURI())
err = db.PingContext(ctx)
if err != nil {
return fmt.Errorf("error pinging admin database: %v", err)
return fmt.Errorf("error pinging admin database: %w", err)
}
slog.Debug("creating admin database", "uri", cfg.GetDBAdminDBURI())
@@ -44,14 +45,14 @@ func createDB(ctx context.Context, cfg database.ConfigProvider) error {
db, err = sql.Open(cfg.GetDBDriver(), cfg.GetDBURI())
if err != nil {
return fmt.Errorf("error opening database: %v", err)
return fmt.Errorf("error opening database: %w", err)
}
slog.Debug("pinging database", "uri", cfg.GetDBAdminDBURI())
err = db.PingContext(ctx)
if err != nil {
return fmt.Errorf("error pinging database: %v", err)
return fmt.Errorf("error pinging database: %w", err)
}
return nil
@@ -73,14 +74,14 @@ func RunMigrations(ctx context.Context, cfg database.ConfigProvider) error {
m, err := migrate.NewWithSourceInstance("iofs", source, cfg.GetDBURI())
if err != nil {
return fmt.Errorf("failed to create migrate instance: %v", err)
return fmt.Errorf("failed to create migrate instance: %w", err)
}
err = m.Up()
if err == migrate.ErrNoChange {
if errors.Is(err, migrate.ErrNoChange) {
slog.Info("No migration changes required")
} else if err != nil {
return fmt.Errorf("failed to apply migrations: %v", err)
return fmt.Errorf("failed to apply migrations: %w", err)
} else {
slog.Info("Migrations applied successfully!")
}