aboutsummaryrefslogtreecommitdiffstats
path: root/internal/commands
diff options
context:
space:
mode:
authorEugene Triguba <eugenetriguba@gmail.com>2024-03-02 11:07:30 -0500
committerGitHub <noreply@github.com>2024-03-02 11:07:30 -0500
commit571bc9bf2efa841b29bf036f4d307664bfbe155d (patch)
tree41fb3a459db99d1f0ec2ed2e00d4ca580a5d0c46 /internal/commands
parentUpdate readme (diff)
parentRemove Latest() from migration fs repo in favor of using List on service (diff)
downloadcli-571bc9bf2efa841b29bf036f4d307664bfbe155d.zip
Merge pull request #1 from eugenetriguba/0.3.0
Diffstat (limited to 'internal/commands')
-rw-r--r--internal/commands/down.go14
-rw-r--r--internal/commands/new.go19
-rw-r--r--internal/commands/status.go22
-rw-r--r--internal/commands/up.go14
-rw-r--r--internal/commands/version.go2
5 files changed, 41 insertions, 30 deletions
diff --git a/internal/commands/down.go b/internal/commands/down.go
index 262e229..116d9ce 100644
--- a/internal/commands/down.go
+++ b/internal/commands/down.go
@@ -3,6 +3,7 @@ package commands
import (
"context"
"flag"
+ "fmt"
"github.com/eugenetriguba/bolt/internal/configloader"
"github.com/eugenetriguba/bolt/internal/output"
@@ -49,7 +50,7 @@ func (cmd *DownCmd) Execute(
cfg, err := configloader.NewConfig()
if err != nil {
- consoleOutputter.Error(err.Error())
+ consoleOutputter.Error(fmt.Errorf("unable to retrieve configuration: %w", err))
return subcommands.ExitFailure
}
@@ -58,39 +59,40 @@ func (cmd *DownCmd) Execute(
storage.DBConnectionString(&cfg.Connection),
)
if err != nil {
- consoleOutputter.Error(err.Error())
+ 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.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
}
migrationService := services.NewMigrationService(
migrationDBRepo,
migrationFsRepo,
+ *cfg,
consoleOutputter,
)
if cmd.version == "" {
err = migrationService.RevertAllMigrations()
if err != nil {
- consoleOutputter.Error(err.Error())
+ 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.Error())
+ 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 a4eeff4..96ddd98 100644
--- a/internal/commands/new.go
+++ b/internal/commands/new.go
@@ -3,10 +3,9 @@ package commands
import (
"context"
"flag"
- "time"
+ "fmt"
"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"
@@ -50,30 +49,28 @@ func (cmd *NewCmd) Execute(
cfg, err := configloader.NewConfig()
if err != nil {
- consoleOutputter.Error(err.Error())
+ 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.Error())
+ 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.Error())
- return subcommands.ExitFailure
- }
- migration := models.NewMigration(time.Now(), cmd.message)
- err = migrationService.CreateMigration(migration)
+ _, err = migrationService.CreateMigration(cmd.message)
if err != nil {
- consoleOutputter.Error(err.Error())
+ 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 a58d587..76f7427 100644
--- a/internal/commands/status.go
+++ b/internal/commands/status.go
@@ -3,6 +3,7 @@ package commands
import (
"context"
"flag"
+ "fmt"
"github.com/eugenetriguba/bolt/internal/configloader"
"github.com/eugenetriguba/bolt/internal/output"
@@ -39,7 +40,7 @@ func (m *StatusCmd) Execute(
cfg, err := configloader.NewConfig()
if err != nil {
- consoleOutputter.Error(err.Error())
+ consoleOutputter.Error(fmt.Errorf("unable to retrieve configuration: %w", err))
return subcommands.ExitFailure
}
@@ -48,31 +49,33 @@ func (m *StatusCmd) Execute(
storage.DBConnectionString(&cfg.Connection),
)
if err != nil {
- consoleOutputter.Error(err.Error())
+ 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.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
}
migrationService := services.NewMigrationService(
migrationDBRepo,
migrationFsRepo,
+ *cfg,
consoleOutputter,
)
+
migrations, err := migrationService.ListMigrations(services.SortOrderAsc)
if err != nil {
- consoleOutputter.Error(err.Error())
+ consoleOutputter.Error(fmt.Errorf("unable to list migrations: %w", err))
return subcommands.ExitFailure
}
@@ -95,6 +98,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 ba74299..330864f 100644
--- a/internal/commands/up.go
+++ b/internal/commands/up.go
@@ -3,6 +3,7 @@ package commands
import (
"context"
"flag"
+ "fmt"
"github.com/eugenetriguba/bolt/internal/configloader"
"github.com/eugenetriguba/bolt/internal/output"
@@ -49,7 +50,7 @@ func (cmd *UpCmd) Execute(
cfg, err := configloader.NewConfig()
if err != nil {
- consoleOutputter.Error(err.Error())
+ consoleOutputter.Error(fmt.Errorf("unable to retrieve configuration: %w", err))
return subcommands.ExitFailure
}
@@ -58,39 +59,40 @@ func (cmd *UpCmd) Execute(
storage.DBConnectionString(&cfg.Connection),
)
if err != nil {
- consoleOutputter.Error(err.Error())
+ 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.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
}
migrationService := services.NewMigrationService(
migrationDBRepo,
migrationFsRepo,
+ *cfg,
consoleOutputter,
)
if cmd.version == "" {
err = migrationService.ApplyAllMigrations()
if err != nil {
- consoleOutputter.Error(err.Error())
+ 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.Error())
+ consoleOutputter.Error(fmt.Errorf("unable to apply migrations up to %s: %w", cmd.version, 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
}