From db7de4b31b1836abed822077840665639f0d66da Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Fri, 19 Jan 2024 23:27:27 -0500 Subject: Add ability to use sequential or timestamp-based versions --- internal/commands/new.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'internal/commands') diff --git a/internal/commands/new.go b/internal/commands/new.go index a4eeff4..0c44248 100644 --- a/internal/commands/new.go +++ b/internal/commands/new.go @@ -3,10 +3,8 @@ package commands import ( "context" "flag" - "time" "github.com/eugenetriguba/bolt/internal/configloader" - "github.com/eugenetriguba/bolt/internal/models" "github.com/eugenetriguba/bolt/internal/output" "github.com/eugenetriguba/bolt/internal/repositories" "github.com/eugenetriguba/bolt/internal/services" @@ -70,8 +68,7 @@ func (cmd *NewCmd) Execute( return subcommands.ExitFailure } - migration := models.NewMigration(time.Now(), cmd.message) - err = migrationService.CreateMigration(migration) + err = migrationService.CreateMigration(cfg.Migrations.VersionStyle, cmd.message) if err != nil { consoleOutputter.Error(err.Error()) return subcommands.ExitFailure -- cgit v1.2.3 From df5dce753523e0e1eca7de91d272ff16c9c0d79c Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Sun, 25 Feb 2024 15:48:14 -0500 Subject: Change Error in console outputter to accept error --- internal/commands/status.go | 10 +++++----- internal/commands/up.go | 12 ++++++------ internal/commands/version.go | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) (limited to 'internal/commands') diff --git a/internal/commands/status.go b/internal/commands/status.go index a58d587..85f3824 100644 --- a/internal/commands/status.go +++ b/internal/commands/status.go @@ -39,7 +39,7 @@ func (m *StatusCmd) Execute( cfg, err := configloader.NewConfig() if err != nil { - consoleOutputter.Error(err.Error()) + consoleOutputter.Error(err) return subcommands.ExitFailure } @@ -48,20 +48,20 @@ func (m *StatusCmd) Execute( storage.DBConnectionString(&cfg.Connection), ) if err != nil { - consoleOutputter.Error(err.Error()) + consoleOutputter.Error(err) return subcommands.ExitFailure } defer db.Close() migrationDBRepo, err := repositories.NewMigrationDBRepo(db) if err != nil { - consoleOutputter.Error(err.Error()) + consoleOutputter.Error(err) return subcommands.ExitFailure } migrationFsRepo, err := repositories.NewMigrationFsRepo(&cfg.Migrations) if err != nil { - consoleOutputter.Error(err.Error()) + consoleOutputter.Error(err) return subcommands.ExitFailure } @@ -72,7 +72,7 @@ func (m *StatusCmd) Execute( ) migrations, err := migrationService.ListMigrations(services.SortOrderAsc) if err != nil { - consoleOutputter.Error(err.Error()) + consoleOutputter.Error(err) return subcommands.ExitFailure } diff --git a/internal/commands/up.go b/internal/commands/up.go index ba74299..5cbc262 100644 --- a/internal/commands/up.go +++ b/internal/commands/up.go @@ -49,7 +49,7 @@ func (cmd *UpCmd) Execute( cfg, err := configloader.NewConfig() if err != nil { - consoleOutputter.Error(err.Error()) + consoleOutputter.Error(err) return subcommands.ExitFailure } @@ -58,20 +58,20 @@ func (cmd *UpCmd) Execute( storage.DBConnectionString(&cfg.Connection), ) if err != nil { - consoleOutputter.Error(err.Error()) + consoleOutputter.Error(err) return subcommands.ExitFailure } defer db.Close() migrationDBRepo, err := repositories.NewMigrationDBRepo(db) if err != nil { - consoleOutputter.Error(err.Error()) + consoleOutputter.Error(err) return subcommands.ExitFailure } migrationFsRepo, err := repositories.NewMigrationFsRepo(&cfg.Migrations) if err != nil { - consoleOutputter.Error(err.Error()) + consoleOutputter.Error(err) return subcommands.ExitFailure } @@ -84,13 +84,13 @@ func (cmd *UpCmd) Execute( if cmd.version == "" { err = migrationService.ApplyAllMigrations() if err != nil { - consoleOutputter.Error(err.Error()) + consoleOutputter.Error(err) return subcommands.ExitFailure } } else { err = migrationService.ApplyUpToVersion(cmd.version) if err != nil { - consoleOutputter.Error(err.Error()) + consoleOutputter.Error(err) return subcommands.ExitFailure } } diff --git a/internal/commands/version.go b/internal/commands/version.go index 36891a2..c9101d0 100644 --- a/internal/commands/version.go +++ b/internal/commands/version.go @@ -34,7 +34,7 @@ func (cmd *VersionCmd) Execute( consoleOutputter := output.NewConsoleOutputter() err := consoleOutputter.Output("bolt v0.2.1") if err != nil { - consoleOutputter.Error(err.Error()) + consoleOutputter.Error(err) return subcommands.ExitFailure } -- cgit v1.2.3 From b5f52806f29c9debb2248542d7dc6901da76fdc3 Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Sun, 25 Feb 2024 15:49:49 -0500 Subject: Fix files that weren't saved and pushed up --- internal/commands/down.go | 12 ++++++------ internal/commands/new.go | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'internal/commands') diff --git a/internal/commands/down.go b/internal/commands/down.go index 262e229..2b98011 100644 --- a/internal/commands/down.go +++ b/internal/commands/down.go @@ -49,7 +49,7 @@ func (cmd *DownCmd) Execute( cfg, err := configloader.NewConfig() if err != nil { - consoleOutputter.Error(err.Error()) + consoleOutputter.Error(err) return subcommands.ExitFailure } @@ -58,20 +58,20 @@ func (cmd *DownCmd) Execute( storage.DBConnectionString(&cfg.Connection), ) if err != nil { - consoleOutputter.Error(err.Error()) + consoleOutputter.Error(err) return subcommands.ExitFailure } defer db.Close() migrationDBRepo, err := repositories.NewMigrationDBRepo(db) if err != nil { - consoleOutputter.Error(err.Error()) + consoleOutputter.Error(err) return subcommands.ExitFailure } migrationFsRepo, err := repositories.NewMigrationFsRepo(&cfg.Migrations) if err != nil { - consoleOutputter.Error(err.Error()) + consoleOutputter.Error(err) return subcommands.ExitFailure } @@ -84,13 +84,13 @@ func (cmd *DownCmd) Execute( if cmd.version == "" { err = migrationService.RevertAllMigrations() if err != nil { - consoleOutputter.Error(err.Error()) + consoleOutputter.Error(err) return subcommands.ExitFailure } } else { err = migrationService.RevertDownToVersion(cmd.version) if err != nil { - consoleOutputter.Error(err.Error()) + consoleOutputter.Error(err) return subcommands.ExitFailure } } diff --git a/internal/commands/new.go b/internal/commands/new.go index 0c44248..7298dad 100644 --- a/internal/commands/new.go +++ b/internal/commands/new.go @@ -48,13 +48,13 @@ func (cmd *NewCmd) Execute( cfg, err := configloader.NewConfig() if err != nil { - consoleOutputter.Error(err.Error()) + consoleOutputter.Error(err) return subcommands.ExitFailure } migrationFsRepo, err := repositories.NewMigrationFsRepo(&cfg.Migrations) if err != nil { - consoleOutputter.Error(err.Error()) + consoleOutputter.Error(err) return subcommands.ExitFailure } @@ -64,13 +64,13 @@ func (cmd *NewCmd) Execute( consoleOutputter, ) if err != nil { - consoleOutputter.Error(err.Error()) + consoleOutputter.Error(err) return subcommands.ExitFailure } err = migrationService.CreateMigration(cfg.Migrations.VersionStyle, cmd.message) if err != nil { - consoleOutputter.Error(err.Error()) + consoleOutputter.Error(err) return subcommands.ExitFailure } -- cgit v1.2.3 From bf1d3b3e1fc42132678b244e479839416a03a6ce Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Thu, 29 Feb 2024 19:53:20 -0500 Subject: Add service tests --- internal/commands/down.go | 28 ++++++++++------------------ internal/commands/new.go | 16 ++++++++-------- internal/commands/status.go | 34 +++++++++++++++++----------------- internal/commands/up.go | 28 ++++++++++------------------ 4 files changed, 45 insertions(+), 61 deletions(-) (limited to 'internal/commands') diff --git a/internal/commands/down.go b/internal/commands/down.go index 2b98011..8e88fc7 100644 --- a/internal/commands/down.go +++ b/internal/commands/down.go @@ -3,10 +3,10 @@ package commands import ( "context" "flag" + "fmt" "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" @@ -49,7 +49,7 @@ func (cmd *DownCmd) Execute( cfg, err := configloader.NewConfig() if err != nil { - consoleOutputter.Error(err) + consoleOutputter.Error(fmt.Errorf("unable to retrieve configuration: %w", err)) return subcommands.ExitFailure } @@ -58,39 +58,31 @@ func (cmd *DownCmd) Execute( storage.DBConnectionString(&cfg.Connection), ) if err != nil { - consoleOutputter.Error(err) + consoleOutputter.Error(fmt.Errorf("unable to connect to database: %w", err)) return subcommands.ExitFailure } defer db.Close() - migrationDBRepo, err := repositories.NewMigrationDBRepo(db) - if err != nil { - consoleOutputter.Error(err) - return subcommands.ExitFailure - } - - migrationFsRepo, err := repositories.NewMigrationFsRepo(&cfg.Migrations) + migrationService, err := services.NewMigrationServiceFromConfig( + db, + consoleOutputter, + *cfg, + ) if err != nil { consoleOutputter.Error(err) return subcommands.ExitFailure } - migrationService := services.NewMigrationService( - migrationDBRepo, - migrationFsRepo, - consoleOutputter, - ) - if cmd.version == "" { err = migrationService.RevertAllMigrations() if err != nil { - consoleOutputter.Error(err) + consoleOutputter.Error(fmt.Errorf("unable to revert all migrations: %w", err)) return subcommands.ExitFailure } } else { err = migrationService.RevertDownToVersion(cmd.version) if err != nil { - consoleOutputter.Error(err) + consoleOutputter.Error(fmt.Errorf("unable to revert migrations down to %s: %w", cmd.version, err)) return subcommands.ExitFailure } } diff --git a/internal/commands/new.go b/internal/commands/new.go index 7298dad..96ddd98 100644 --- a/internal/commands/new.go +++ b/internal/commands/new.go @@ -3,6 +3,7 @@ package commands import ( "context" "flag" + "fmt" "github.com/eugenetriguba/bolt/internal/configloader" "github.com/eugenetriguba/bolt/internal/output" @@ -48,29 +49,28 @@ func (cmd *NewCmd) Execute( cfg, err := configloader.NewConfig() if err != nil { - consoleOutputter.Error(err) + consoleOutputter.Error(fmt.Errorf("unable to retrieve configuration: %w", err)) return subcommands.ExitFailure } migrationFsRepo, err := repositories.NewMigrationFsRepo(&cfg.Migrations) if err != nil { - consoleOutputter.Error(err) + consoleOutputter.Error( + fmt.Errorf("unable to setup local migrations directory: %w", err), + ) return subcommands.ExitFailure } migrationService := services.NewMigrationService( nil, migrationFsRepo, + *cfg, consoleOutputter, ) - if err != nil { - consoleOutputter.Error(err) - return subcommands.ExitFailure - } - err = migrationService.CreateMigration(cfg.Migrations.VersionStyle, cmd.message) + _, err = migrationService.CreateMigration(cmd.message) if err != nil { - consoleOutputter.Error(err) + consoleOutputter.Error(fmt.Errorf("unable to create new migration: %w", err)) return subcommands.ExitFailure } diff --git a/internal/commands/status.go b/internal/commands/status.go index 85f3824..eaf4332 100644 --- a/internal/commands/status.go +++ b/internal/commands/status.go @@ -3,10 +3,10 @@ package commands import ( "context" "flag" + "fmt" "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" @@ -39,7 +39,7 @@ func (m *StatusCmd) Execute( cfg, err := configloader.NewConfig() if err != nil { - consoleOutputter.Error(err) + consoleOutputter.Error(fmt.Errorf("unable to retrieve configuration: %w", err)) return subcommands.ExitFailure } @@ -48,31 +48,24 @@ func (m *StatusCmd) Execute( storage.DBConnectionString(&cfg.Connection), ) if err != nil { - consoleOutputter.Error(err) + consoleOutputter.Error(fmt.Errorf("unable to connect to database: %w", err)) return subcommands.ExitFailure } defer db.Close() - migrationDBRepo, err := repositories.NewMigrationDBRepo(db) - if err != nil { - consoleOutputter.Error(err) - return subcommands.ExitFailure - } - - migrationFsRepo, err := repositories.NewMigrationFsRepo(&cfg.Migrations) + migrationService, err := services.NewMigrationServiceFromConfig( + db, + consoleOutputter, + *cfg, + ) if err != nil { consoleOutputter.Error(err) return subcommands.ExitFailure } - migrationService := services.NewMigrationService( - migrationDBRepo, - migrationFsRepo, - consoleOutputter, - ) migrations, err := migrationService.ListMigrations(services.SortOrderAsc) if err != nil { - consoleOutputter.Error(err) + consoleOutputter.Error(fmt.Errorf("unable to list migrations: %w", err)) return subcommands.ExitFailure } @@ -95,6 +88,13 @@ func (m *StatusCmd) Execute( rows[i] = []string{migration.Version, migration.Message, applied} } - consoleOutputter.Table(headers, rows) + err = consoleOutputter.Table(headers, rows) + if err != nil { + consoleOutputter.Error( + fmt.Errorf("unable to output migrations as table: %w", err), + ) + return subcommands.ExitFailure + } + return subcommands.ExitSuccess } diff --git a/internal/commands/up.go b/internal/commands/up.go index 5cbc262..e10386a 100644 --- a/internal/commands/up.go +++ b/internal/commands/up.go @@ -3,10 +3,10 @@ package commands import ( "context" "flag" + "fmt" "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" @@ -49,7 +49,7 @@ func (cmd *UpCmd) Execute( cfg, err := configloader.NewConfig() if err != nil { - consoleOutputter.Error(err) + consoleOutputter.Error(fmt.Errorf("unable to retrieve configuration: %w", err)) return subcommands.ExitFailure } @@ -58,39 +58,31 @@ func (cmd *UpCmd) Execute( storage.DBConnectionString(&cfg.Connection), ) if err != nil { - consoleOutputter.Error(err) + consoleOutputter.Error(fmt.Errorf("unable to connect to database: %w", err)) return subcommands.ExitFailure } defer db.Close() - migrationDBRepo, err := repositories.NewMigrationDBRepo(db) - if err != nil { - consoleOutputter.Error(err) - return subcommands.ExitFailure - } - - migrationFsRepo, err := repositories.NewMigrationFsRepo(&cfg.Migrations) + migrationService, err := services.NewMigrationServiceFromConfig( + db, + consoleOutputter, + *cfg, + ) if err != nil { consoleOutputter.Error(err) return subcommands.ExitFailure } - migrationService := services.NewMigrationService( - migrationDBRepo, - migrationFsRepo, - consoleOutputter, - ) - if cmd.version == "" { err = migrationService.ApplyAllMigrations() if err != nil { - consoleOutputter.Error(err) + consoleOutputter.Error(fmt.Errorf("unable to apply all migrations: %w", err)) return subcommands.ExitFailure } } else { err = migrationService.ApplyUpToVersion(cmd.version) if err != nil { - consoleOutputter.Error(err) + consoleOutputter.Error(fmt.Errorf("unable to apply migrations up to %s: %w", cmd.version, err)) return subcommands.ExitFailure } } -- cgit v1.2.3 From 75a1bfa521ef1e10514330b984f46b84e1cef926 Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Sat, 2 Mar 2024 08:31:26 -0500 Subject: Remove NewMigrationServiceFromConfig --- internal/commands/down.go | 20 +++++++++++++++----- internal/commands/status.go | 20 +++++++++++++++----- internal/commands/up.go | 20 +++++++++++++++----- 3 files changed, 45 insertions(+), 15 deletions(-) (limited to 'internal/commands') 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 { -- cgit v1.2.3