aboutsummaryrefslogtreecommitdiffstats
path: root/internal/commands
diff options
context:
space:
mode:
authorEugene Triguba <eugenetriguba@gmail.com>2024-01-06 11:15:53 -0500
committerEugene Triguba <eugenetriguba@gmail.com>2024-01-06 11:15:53 -0500
commit3d66d23b7f1f8d496711f01a164ac1d7717527ca (patch)
treeb4ce8a4deda41c57b1ab13ac4e89bfb9e6978cf0 /internal/commands
parentAdd to changelog (diff)
downloadcli-3d66d23b7f1f8d496711f01a164ac1d7717527ca.zip
Add database integration tests
Diffstat (limited to 'internal/commands')
-rw-r--r--internal/commands/create.go12
-rw-r--r--internal/commands/list.go11
-rw-r--r--internal/commands/migrate.go11
3 files changed, 22 insertions, 12 deletions
diff --git a/internal/commands/create.go b/internal/commands/create.go
index 169bc4d..de71fd7 100644
--- a/internal/commands/create.go
+++ b/internal/commands/create.go
@@ -7,9 +7,9 @@ import (
"os"
"github.com/eugenetriguba/bolt/internal/configloader"
- "github.com/eugenetriguba/bolt/internal/db"
"github.com/eugenetriguba/bolt/internal/models"
"github.com/eugenetriguba/bolt/internal/repositories"
+ "github.com/eugenetriguba/bolt/internal/storage"
"github.com/eugenetriguba/bolt/internal/util"
"github.com/google/subcommands"
)
@@ -42,19 +42,23 @@ func (cmd *CreateCmd) Execute(
f *flag.FlagSet,
_ ...interface{},
) subcommands.ExitStatus {
- conn, err := db.Connect()
+ cfg, err := configloader.NewConfig()
if err != nil {
fmt.Fprintln(os.Stderr, err)
return subcommands.ExitFailure
}
- cfg, err := configloader.NewConfig()
+ 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()
- migrationRepo, err := repositories.NewMigrationRepo(conn, cfg)
+ migrationRepo, err := repositories.NewMigrationRepo(db, cfg)
if err != nil {
fmt.Fprintln(os.Stderr, err)
return subcommands.ExitFailure
diff --git a/internal/commands/list.go b/internal/commands/list.go
index 36600c9..0f03712 100644
--- a/internal/commands/list.go
+++ b/internal/commands/list.go
@@ -7,8 +7,8 @@ import (
"os"
"github.com/eugenetriguba/bolt/internal/configloader"
- "github.com/eugenetriguba/bolt/internal/db"
"github.com/eugenetriguba/bolt/internal/repositories"
+ "github.com/eugenetriguba/bolt/internal/storage"
"github.com/google/subcommands"
)
@@ -25,18 +25,21 @@ func (*ListCmd) Usage() string {
func (m *ListCmd) SetFlags(f *flag.FlagSet) {}
func (m *ListCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{}) subcommands.ExitStatus {
- db, err := db.Connect()
+ cfg, err := configloader.NewConfig()
if err != nil {
fmt.Fprintln(os.Stderr, err)
return subcommands.ExitFailure
}
- defer db.Close()
- cfg, err := configloader.NewConfig()
+ 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()
migrationRepo, err := repositories.NewMigrationRepo(db, cfg)
if err != nil {
diff --git a/internal/commands/migrate.go b/internal/commands/migrate.go
index f3e4cbd..df1377a 100644
--- a/internal/commands/migrate.go
+++ b/internal/commands/migrate.go
@@ -7,8 +7,8 @@ import (
"os"
"github.com/eugenetriguba/bolt/internal/configloader"
- "github.com/eugenetriguba/bolt/internal/db"
"github.com/eugenetriguba/bolt/internal/repositories"
+ "github.com/eugenetriguba/bolt/internal/storage"
"github.com/google/subcommands"
)
@@ -25,18 +25,21 @@ func (*MigrateCmd) Usage() string {
func (m *MigrateCmd) SetFlags(f *flag.FlagSet) {}
func (m *MigrateCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{}) subcommands.ExitStatus {
- db, err := db.Connect()
+ cfg, err := configloader.NewConfig()
if err != nil {
fmt.Fprintln(os.Stderr, err)
return subcommands.ExitFailure
}
- defer db.Close()
- cfg, err := configloader.NewConfig()
+ 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()
migrationRepo, err := repositories.NewMigrationRepo(db, cfg)
if err != nil {