diff options
| author | Eugene Triguba <eugenetriguba@gmail.com> | 2024-03-02 08:31:26 -0500 |
|---|---|---|
| committer | Eugene Triguba <eugenetriguba@gmail.com> | 2024-03-02 08:31:26 -0500 |
| commit | 75a1bfa521ef1e10514330b984f46b84e1cef926 (patch) | |
| tree | 03f7cb67e5518d9b0250438f83e8280e1d2801e7 | |
| parent | Add proper tests for ApplyAllMigrations and ApplyUpToVersion (diff) | |
| download | cli-75a1bfa521ef1e10514330b984f46b84e1cef926.zip | |
Remove NewMigrationServiceFromConfig
| -rw-r--r-- | internal/commands/down.go | 20 | ||||
| -rw-r--r-- | internal/commands/status.go | 20 | ||||
| -rw-r--r-- | internal/commands/up.go | 20 | ||||
| -rw-r--r-- | internal/services/migration.go | 26 |
4 files changed, 46 insertions, 40 deletions
diff --git a/internal/commands/down.go b/internal/commands/down.go index 8e88fc7..116d9ce 100644 --- a/internal/commands/down.go +++ b/internal/commands/down.go @@ -7,6 +7,7 @@ import ( "github.com/eugenetriguba/bolt/internal/configloader" "github.com/eugenetriguba/bolt/internal/output" + "github.com/eugenetriguba/bolt/internal/repositories" "github.com/eugenetriguba/bolt/internal/services" "github.com/eugenetriguba/bolt/internal/storage" "github.com/google/subcommands" @@ -63,16 +64,25 @@ func (cmd *DownCmd) Execute( } defer db.Close() - migrationService, err := services.NewMigrationServiceFromConfig( - db, - consoleOutputter, - *cfg, - ) + migrationDBRepo, err := repositories.NewMigrationDBRepo(db) + if err != nil { + consoleOutputter.Error(err) + return subcommands.ExitFailure + } + + migrationFsRepo, err := repositories.NewMigrationFsRepo(&cfg.Migrations) if err != nil { consoleOutputter.Error(err) return subcommands.ExitFailure } + migrationService := services.NewMigrationService( + migrationDBRepo, + migrationFsRepo, + *cfg, + consoleOutputter, + ) + if cmd.version == "" { err = migrationService.RevertAllMigrations() if err != nil { diff --git a/internal/commands/status.go b/internal/commands/status.go index eaf4332..76f7427 100644 --- a/internal/commands/status.go +++ b/internal/commands/status.go @@ -7,6 +7,7 @@ import ( "github.com/eugenetriguba/bolt/internal/configloader" "github.com/eugenetriguba/bolt/internal/output" + "github.com/eugenetriguba/bolt/internal/repositories" "github.com/eugenetriguba/bolt/internal/services" "github.com/eugenetriguba/bolt/internal/storage" "github.com/google/subcommands" @@ -53,16 +54,25 @@ func (m *StatusCmd) Execute( } defer db.Close() - migrationService, err := services.NewMigrationServiceFromConfig( - db, - consoleOutputter, - *cfg, - ) + migrationDBRepo, err := repositories.NewMigrationDBRepo(db) + if err != nil { + consoleOutputter.Error(err) + return subcommands.ExitFailure + } + + migrationFsRepo, err := repositories.NewMigrationFsRepo(&cfg.Migrations) if err != nil { consoleOutputter.Error(err) return subcommands.ExitFailure } + migrationService := services.NewMigrationService( + migrationDBRepo, + migrationFsRepo, + *cfg, + consoleOutputter, + ) + migrations, err := migrationService.ListMigrations(services.SortOrderAsc) if err != nil { consoleOutputter.Error(fmt.Errorf("unable to list migrations: %w", err)) diff --git a/internal/commands/up.go b/internal/commands/up.go index e10386a..330864f 100644 --- a/internal/commands/up.go +++ b/internal/commands/up.go @@ -7,6 +7,7 @@ import ( "github.com/eugenetriguba/bolt/internal/configloader" "github.com/eugenetriguba/bolt/internal/output" + "github.com/eugenetriguba/bolt/internal/repositories" "github.com/eugenetriguba/bolt/internal/services" "github.com/eugenetriguba/bolt/internal/storage" "github.com/google/subcommands" @@ -63,16 +64,25 @@ func (cmd *UpCmd) Execute( } defer db.Close() - migrationService, err := services.NewMigrationServiceFromConfig( - db, - consoleOutputter, - *cfg, - ) + migrationDBRepo, err := repositories.NewMigrationDBRepo(db) + if err != nil { + consoleOutputter.Error(err) + return subcommands.ExitFailure + } + + migrationFsRepo, err := repositories.NewMigrationFsRepo(&cfg.Migrations) if err != nil { consoleOutputter.Error(err) return subcommands.ExitFailure } + migrationService := services.NewMigrationService( + migrationDBRepo, + migrationFsRepo, + *cfg, + consoleOutputter, + ) + if cmd.version == "" { err = migrationService.ApplyAllMigrations() if err != nil { diff --git a/internal/services/migration.go b/internal/services/migration.go index c0d043b..bc4b9d1 100644 --- a/internal/services/migration.go +++ b/internal/services/migration.go @@ -1,7 +1,6 @@ package services import ( - "database/sql" "fmt" "sort" "strconv" @@ -36,29 +35,6 @@ func NewMigrationService( } } -func NewMigrationServiceFromConfig( - db *sql.DB, - outputter output.Outputter, - cfg configloader.Config, -) (MigrationService, error) { - migrationDBRepo, err := repositories.NewMigrationDBRepo(db) - if err != nil { - return MigrationService{}, err - } - - migrationFsRepo, err := repositories.NewMigrationFsRepo(&cfg.Migrations) - if err != nil { - return MigrationService{}, err - } - - return NewMigrationService( - migrationDBRepo, - migrationFsRepo, - cfg, - outputter, - ), nil -} - type sortOrder int const ( @@ -259,7 +235,7 @@ func (ms MigrationService) RevertMigration(migration *models.Migration) error { } if execOptions.UseTransaction { - err = ms.dbRepo.ApplyWithTx(scriptContents, migration) + err = ms.dbRepo.RevertWithTx(scriptContents, migration) } else { err = ms.dbRepo.Revert(scriptContents, migration) } |