Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions db/internal/database/database.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@ func Exec() error {
case "migrate":
err := runMigrations(url)
if err != nil {
fmt.Printf("[error] %v\n", err)

return err
}

Expand Down
4 changes: 2 additions & 2 deletions db/internal/database/database_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},

Expand Down Expand Up @@ -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,
},

Expand Down
4 changes: 2 additions & 2 deletions db/internal/database/migration.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion db/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 2 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Loading