aboutsummaryrefslogtreecommitdiffstats
path: root/internal/commands
diff options
context:
space:
mode:
Diffstat (limited to 'internal/commands')
-rw-r--r--internal/commands/down.go (renamed from internal/commands/downgrade.go)42
-rw-r--r--internal/commands/list.go74
-rw-r--r--internal/commands/new.go (renamed from internal/commands/create.go)42
-rw-r--r--internal/commands/status.go100
-rw-r--r--internal/commands/up.go (renamed from internal/commands/migrate.go)41
5 files changed, 177 insertions, 122 deletions
diff --git a/internal/commands/downgrade.go b/internal/commands/down.go
index f953286..0a9ca99 100644
--- a/internal/commands/downgrade.go
+++ b/internal/commands/down.go
@@ -3,37 +3,43 @@ package commands
import (
"context"
"flag"
- "fmt"
- "os"
"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"
)
-type DowngradeCmd struct{}
+type DownCmd struct{}
-func (*DowngradeCmd) Name() string { return "downgrade" }
+func (*DownCmd) Name() string {
+ return "down"
+}
+
+func (*DownCmd) Synopsis() string {
+ return "downgrade migrations against the database"
+}
-func (*DowngradeCmd) Synopsis() string { return "Downgrade all migrations against the database." }
-func (*DowngradeCmd) Usage() string {
- return `downgrade:
- Downgrade all migrations against the database.
+func (*DownCmd) Usage() string {
+ return `down:
+ Downgrade migrations against the database.
`
}
-func (m *DowngradeCmd) SetFlags(f *flag.FlagSet) {}
+func (m *DownCmd) SetFlags(f *flag.FlagSet) {}
-func (m *DowngradeCmd) Execute(
+func (m *DownCmd) Execute(
_ context.Context,
f *flag.FlagSet,
_ ...interface{},
) subcommands.ExitStatus {
+ consoleOutputter := output.ConsoleOutputter{}
+
cfg, err := configloader.NewConfig()
if err != nil {
- fmt.Fprintln(os.Stderr, err)
+ consoleOutputter.Error(err.Error())
return subcommands.ExitFailure
}
@@ -42,27 +48,31 @@ func (m *DowngradeCmd) Execute(
storage.DBConnectionString(&cfg.Connection),
)
if err != nil {
- fmt.Fprintln(os.Stderr, err)
+ consoleOutputter.Error(err.Error())
return subcommands.ExitFailure
}
defer db.Close()
migrationDBRepo, err := repositories.NewMigrationDBRepo(db)
if err != nil {
- fmt.Fprintln(os.Stderr, err)
+ consoleOutputter.Error(err.Error())
return subcommands.ExitFailure
}
migrationFsRepo, err := repositories.NewMigrationFsRepo(cfg.MigrationsDir)
if err != nil {
- fmt.Fprintln(os.Stderr, err)
+ consoleOutputter.Error(err.Error())
return subcommands.ExitFailure
}
- migrationService := services.NewMigrationService(migrationDBRepo, migrationFsRepo)
+ migrationService := services.NewMigrationService(
+ migrationDBRepo,
+ migrationFsRepo,
+ consoleOutputter,
+ )
err = migrationService.RevertAllMigrations()
if err != nil {
- fmt.Fprintln(os.Stderr, err)
+ consoleOutputter.Error(err.Error())
return subcommands.ExitFailure
}
diff --git a/internal/commands/list.go b/internal/commands/list.go
deleted file mode 100644
index 8224820..0000000
--- a/internal/commands/list.go
+++ /dev/null
@@ -1,74 +0,0 @@
-package commands
-
-import (
- "context"
- "flag"
- "fmt"
- "os"
-
- "github.com/eugenetriguba/bolt/internal/configloader"
- "github.com/eugenetriguba/bolt/internal/repositories"
- "github.com/eugenetriguba/bolt/internal/services"
- "github.com/eugenetriguba/bolt/internal/storage"
- "github.com/google/subcommands"
-)
-
-type ListCmd struct{}
-
-func (*ListCmd) Name() string { return "list" }
-
-func (*ListCmd) Synopsis() string { return "List the database migrations and their statuses." }
-func (*ListCmd) Usage() string {
- return `list:
- List the database migrations and their statuses.
- `
-}
-
-func (m *ListCmd) SetFlags(f *flag.FlagSet) {}
-
-func (m *ListCmd) Execute(
- _ context.Context,
- f *flag.FlagSet,
- _ ...interface{},
-) subcommands.ExitStatus {
- cfg, err := configloader.NewConfig()
- if err != nil {
- fmt.Fprintln(os.Stderr, err)
- return subcommands.ExitFailure
- }
-
- db, err := storage.DBConnect(
- cfg.Connection.Driver,
- storage.DBConnectionString(&cfg.Connection),
- )
- if err != nil {
- fmt.Fprintln(os.Stderr, err)
- return subcommands.ExitFailure
- }
- defer db.Close()
-
- migrationDBRepo, err := repositories.NewMigrationDBRepo(db)
- if err != nil {
- fmt.Fprintln(os.Stderr, err)
- return subcommands.ExitFailure
- }
-
- migrationFsRepo, err := repositories.NewMigrationFsRepo(cfg.MigrationsDir)
- if err != nil {
- fmt.Fprintln(os.Stderr, err)
- return subcommands.ExitFailure
- }
-
- migrationService := services.NewMigrationService(migrationDBRepo, migrationFsRepo)
- migrations, err := migrationService.ListMigrations(services.SortOrderAsc)
- if err != nil {
- fmt.Fprintln(os.Stderr, err)
- return subcommands.ExitFailure
- }
-
- for _, migration := range migrations {
- fmt.Println(migration)
- }
-
- return subcommands.ExitSuccess
-}
diff --git a/internal/commands/create.go b/internal/commands/new.go
index 57f4c69..be1f49c 100644
--- a/internal/commands/create.go
+++ b/internal/commands/new.go
@@ -3,67 +3,77 @@ package commands
import (
"context"
"flag"
- "fmt"
- "os"
"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"
"github.com/google/subcommands"
)
-type CreateCmd struct {
+type NewCmd struct {
message string
}
-func (*CreateCmd) Name() string { return "create" }
-func (*CreateCmd) Synopsis() string {
- return "Create a new database migration."
+func (*NewCmd) Name() string {
+ return "new"
}
-func (*CreateCmd) Usage() string {
- return `create [-message]:
- Create a new database migration.
+
+func (*NewCmd) Synopsis() string {
+ return "create a new database migration"
+}
+
+func (*NewCmd) Usage() string {
+ return `create [-message|-m]:
+ Create a new database migration
`
}
-func (cmd *CreateCmd) SetFlags(f *flag.FlagSet) {
+func (cmd *NewCmd) SetFlags(f *flag.FlagSet) {
f.StringVar(
&cmd.message,
"message",
"autogenerated",
"Message to use for the migration",
)
+ f.StringVar(&cmd.message, "m", cmd.message, "alias for -message")
}
-func (cmd *CreateCmd) Execute(
+func (cmd *NewCmd) Execute(
_ context.Context,
f *flag.FlagSet,
_ ...interface{},
) subcommands.ExitStatus {
+ consoleOutputter := output.ConsoleOutputter{}
+
cfg, err := configloader.NewConfig()
if err != nil {
- fmt.Fprintln(os.Stderr, err)
+ consoleOutputter.Error(err.Error())
return subcommands.ExitFailure
}
migrationFsRepo, err := repositories.NewMigrationFsRepo(cfg.MigrationsDir)
if err != nil {
- fmt.Fprintln(os.Stderr, err)
+ consoleOutputter.Error(err.Error())
return subcommands.ExitFailure
}
- migrationService := services.NewMigrationService(nil, migrationFsRepo)
+ migrationService := services.NewMigrationService(
+ nil,
+ migrationFsRepo,
+ consoleOutputter,
+ )
if err != nil {
- fmt.Fprintln(os.Stderr, err)
+ consoleOutputter.Error(err.Error())
return subcommands.ExitFailure
}
migration := models.NewMigration(time.Now(), cmd.message)
err = migrationService.CreateMigration(migration)
if err != nil {
- fmt.Fprintln(os.Stderr, err)
+ consoleOutputter.Error(err.Error())
return subcommands.ExitFailure
}
diff --git a/internal/commands/status.go b/internal/commands/status.go
new file mode 100644
index 0000000..c20abd3
--- /dev/null
+++ b/internal/commands/status.go
@@ -0,0 +1,100 @@
+package commands
+
+import (
+ "context"
+ "flag"
+
+ "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"
+)
+
+type StatusCmd struct{}
+
+func (*StatusCmd) Name() string {
+ return "status"
+}
+
+func (*StatusCmd) Synopsis() string {
+ return "list the database migrations and their statuses"
+}
+
+func (*StatusCmd) Usage() string {
+ return `status:
+ List the database migrations and their statuses
+ `
+}
+
+func (m *StatusCmd) SetFlags(f *flag.FlagSet) {}
+
+func (m *StatusCmd) Execute(
+ _ context.Context,
+ f *flag.FlagSet,
+ _ ...interface{},
+) subcommands.ExitStatus {
+ consoleOutputter := output.ConsoleOutputter{}
+
+ cfg, err := configloader.NewConfig()
+ if err != nil {
+ consoleOutputter.Error(err.Error())
+ return subcommands.ExitFailure
+ }
+
+ db, err := storage.DBConnect(
+ cfg.Connection.Driver,
+ storage.DBConnectionString(&cfg.Connection),
+ )
+ if err != nil {
+ consoleOutputter.Error(err.Error())
+ return subcommands.ExitFailure
+ }
+ defer db.Close()
+
+ migrationDBRepo, err := repositories.NewMigrationDBRepo(db)
+ if err != nil {
+ consoleOutputter.Error(err.Error())
+ return subcommands.ExitFailure
+ }
+
+ migrationFsRepo, err := repositories.NewMigrationFsRepo(cfg.MigrationsDir)
+ if err != nil {
+ consoleOutputter.Error(err.Error())
+ return subcommands.ExitFailure
+ }
+
+ migrationService := services.NewMigrationService(
+ migrationDBRepo,
+ migrationFsRepo,
+ consoleOutputter,
+ )
+ migrations, err := migrationService.ListMigrations(services.SortOrderAsc)
+ if err != nil {
+ consoleOutputter.Error(err.Error())
+ return subcommands.ExitFailure
+ }
+
+ if len(migrations) == 0 {
+ consoleOutputter.Output(
+ "No migrations have been created.\n" +
+ "Run 'bolt create' to create your first migration.",
+ )
+ return subcommands.ExitSuccess
+ }
+
+ headers := []string{"Version", "Message", "Applied"}
+ rows := make([][]string, len(migrations))
+ for i, migration := range migrations {
+ applied := ""
+ if migration.Applied {
+ applied = "X"
+ }
+
+ rows[i] = []string{migration.Version, migration.Message, applied}
+ }
+
+ consoleOutputter.Table(headers, rows)
+ return subcommands.ExitSuccess
+}
diff --git a/internal/commands/migrate.go b/internal/commands/up.go
index 8c86291..c207a83 100644
--- a/internal/commands/migrate.go
+++ b/internal/commands/up.go
@@ -3,37 +3,42 @@ package commands
import (
"context"
"flag"
- "fmt"
- "os"
"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"
)
-type UpgradeCmd struct{}
+type UpCmd struct{}
-func (*UpgradeCmd) Name() string { return "upgrade" }
+func (*UpCmd) Name() string {
+ return "up"
+}
+
+func (*UpCmd) Synopsis() string {
+ return "apply migrations against the database"
+}
-func (*UpgradeCmd) Synopsis() string { return "Upgrade the database to the latest migration." }
-func (*UpgradeCmd) Usage() string {
- return `upgrade:
- Upgrade the database to the latest migration.
+func (*UpCmd) Usage() string {
+ return `up:
+ Apply migrations against the database
`
}
-func (m *UpgradeCmd) SetFlags(f *flag.FlagSet) {}
+func (m *UpCmd) SetFlags(f *flag.FlagSet) {}
-func (m *UpgradeCmd) Execute(
+func (m *UpCmd) Execute(
_ context.Context,
f *flag.FlagSet,
_ ...interface{},
) subcommands.ExitStatus {
+ consoleOutputter := output.ConsoleOutputter{}
cfg, err := configloader.NewConfig()
if err != nil {
- fmt.Fprintln(os.Stderr, err)
+ consoleOutputter.Error(err.Error())
return subcommands.ExitFailure
}
@@ -42,27 +47,31 @@ func (m *UpgradeCmd) Execute(
storage.DBConnectionString(&cfg.Connection),
)
if err != nil {
- fmt.Fprintln(os.Stderr, err)
+ consoleOutputter.Error(err.Error())
return subcommands.ExitFailure
}
defer db.Close()
migrationDBRepo, err := repositories.NewMigrationDBRepo(db)
if err != nil {
- fmt.Fprintln(os.Stderr, err)
+ consoleOutputter.Error(err.Error())
return subcommands.ExitFailure
}
migrationFsRepo, err := repositories.NewMigrationFsRepo(cfg.MigrationsDir)
if err != nil {
- fmt.Fprintln(os.Stderr, err)
+ consoleOutputter.Error(err.Error())
return subcommands.ExitFailure
}
- migrationService := services.NewMigrationService(migrationDBRepo, migrationFsRepo)
+ migrationService := services.NewMigrationService(
+ migrationDBRepo,
+ migrationFsRepo,
+ consoleOutputter,
+ )
err = migrationService.ApplyAllMigrations()
if err != nil {
- fmt.Fprintln(os.Stderr, err)
+ consoleOutputter.Error(err.Error())
return subcommands.ExitFailure
}