diff --git a/cmd/web/main.go b/cmd/web/main.go index a465e34..f12e4dc 100644 --- a/cmd/web/main.go +++ b/cmd/web/main.go @@ -3,7 +3,7 @@ package main import ( - db2 "code.dlmw.ch/dlmw/qv/internal/db" + "code.dlmw.ch/dlmw/qv/internal/migrations" "code.dlmw.ch/dlmw/qv/internal/models" "context" "database/sql" @@ -33,7 +33,7 @@ func main() { os.Exit(1) } defer db.Close() - err = db2.RunMigrations(db) + err = migrations.Run(db) if err != nil { logger.Error(err.Error()) os.Exit(1) diff --git a/internal/db/migrations.go b/internal/migrations/migrations.go similarity index 83% rename from internal/db/migrations.go rename to internal/migrations/migrations.go index 9bc3fd4..5161097 100644 --- a/internal/db/migrations.go +++ b/internal/migrations/migrations.go @@ -1,4 +1,4 @@ -package db +package migrations import ( "database/sql" @@ -10,16 +10,16 @@ import ( "github.com/golang-migrate/migrate/v4/source/iofs" ) -//go:embed migrations/*.sql +//go:embed sql/*.sql var migrationsFS embed.FS -func RunMigrations(db *sql.DB) error { +func Run(db *sql.DB) error { driver, err := msqlite3.WithInstance(db, &msqlite3.Config{}) if err != nil { return err } - d, err := iofs.New(migrationsFS, "migrations") + d, err := iofs.New(migrationsFS, "sql") if err != nil { return err } diff --git a/internal/db/migrations/000001_init.down.sql b/internal/migrations/sql/000001_init.down.sql similarity index 100% rename from internal/db/migrations/000001_init.down.sql rename to internal/migrations/sql/000001_init.down.sql diff --git a/internal/db/migrations/000001_init.up.sql b/internal/migrations/sql/000001_init.up.sql similarity index 100% rename from internal/db/migrations/000001_init.up.sql rename to internal/migrations/sql/000001_init.up.sql