diff --git a/db/internal/database/database.go b/db/internal/database/database.go index b9bb7cd..aabc197 100644 --- a/db/internal/database/database.go +++ b/db/internal/database/database.go @@ -37,8 +37,6 @@ func Exec() error { case "migrate": err := runMigrations(url) if err != nil { - fmt.Printf("[error] %v\n", err) - return err } diff --git a/db/internal/database/database_test.go b/db/internal/database/database_test.go index 11d20a9..3ea271b 100644 --- a/db/internal/database/database_test.go +++ b/db/internal/database/database_test.go @@ -20,7 +20,7 @@ func TestMigrate(t *testing.T) { { name: "No migrations folder", url: "file::memory:?cache=shared", - output: "[error] error running migrations: error walking migrations directory: lstat internal/migrations: no such file or directory\n", + output: "[error] error walking migrations directory: lstat internal/migrations: no such file or directory\n", migrationFolder: false, }, @@ -169,7 +169,7 @@ func TestReset(t *testing.T) { { name: "No migrations folder", url: "test.db", - output: "[error] error running migrations: error walking migrations directory: lstat internal/migrations: no such file or directory\n", + output: "[error] error walking migrations directory: lstat internal/migrations: no such file or directory\n", migrationFolder: false, }, diff --git a/db/internal/database/migration.go b/db/internal/database/migration.go index cf8e8a2..91342d2 100644 --- a/db/internal/database/migration.go +++ b/db/internal/database/migration.go @@ -43,7 +43,7 @@ func newMigration(name string) error { // Destination file name fileName = filepath.Join(migrationFolder, fileName) - err = os.MkdirAll(filepath.Dir(fileName), 0700) + err = os.MkdirAll(filepath.Dir(fileName), 0o700) if err != nil { return fmt.Errorf("error creating migrations folder: %w", err) } @@ -78,7 +78,7 @@ func runMigrations(url string) error { err = db.RunMigrationsDir(migrationFolder, conn) if err != nil { - return fmt.Errorf("error running migrations: %w", err) + return fmt.Errorf("%w", err) } return nil diff --git a/db/main.go b/db/main.go index 399ee24..2abafa1 100644 --- a/db/main.go +++ b/db/main.go @@ -10,7 +10,8 @@ import ( func main() { err := database.Exec() if err != nil { - fmt.Printf("[error] %v\n", err) + fmt.Printf("%v\n", err) + fmt.Println("❌ Operation failed.") // Exit with error code 1 to signal failure // on requested operation. diff --git a/go.mod b/go.mod index f4d4c67..3d6ea34 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/lib/pq v1.10.9 github.com/mattn/go-sqlite3 v1.14.24 github.com/spf13/pflag v1.0.6 - go.leapkit.dev/core v0.1.10 + go.leapkit.dev/core v0.1.11 ) require golang.org/x/sys v0.21.0 // indirect diff --git a/go.sum b/go.sum index 8ef6e4e..d8f5930 100644 --- a/go.sum +++ b/go.sum @@ -8,5 +8,7 @@ github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o= github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= go.leapkit.dev/core v0.1.10 h1:x8oNbC3CYvrXdEt7uR3RlHTKVG4mVOSBYjEDuphgWDY= go.leapkit.dev/core v0.1.10/go.mod h1:nRT9gt5MX7YVstBvURVgjyp+5LE76kEemZiAiyZqfSU= +go.leapkit.dev/core v0.1.11 h1:0RU1wB0T6mhTFHAVWKRGMXNl0S8Af/sCEaNevXZv/AY= +go.leapkit.dev/core v0.1.11/go.mod h1:nRT9gt5MX7YVstBvURVgjyp+5LE76kEemZiAiyZqfSU= golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=