git.iko.soy/crush
on main help sign in
chore: pass datadir to db
2a0f007Kujtim Hoxha
cmd/root.go+2−2
compare with main
unifiedsplit
@@ -76,7 +76,7 @@ to assist developers in writing, debugging, and understanding code directly from
76 cwd = c
76 cwd = c
77 }
77 }
78
78
79− _, err := config.Init(cwd, debug)
79+ cfg, err := config.Init(cwd, debug)
80 if err != nil {
80 if err != nil {
81 return err
81 return err
82 }
82 }
@@ -86,7 +86,7 @@ to assist developers in writing, debugging, and understanding code directly from
86 defer cancel()
86 defer cancel()
87
87
88 // Connect DB, this will also run migrations
88 // Connect DB, this will also run migrations
89− conn, err := db.Connect(ctx)
89+ conn, err := db.Connect(ctx, cfg.Options.DataDirectory)
90 if err != nil {
90 if err != nil {
91 return err
91 return err
92 }
92 }
internal/db/connect.go+1−4
@@ -11,13 +11,10 @@ import (
11 _ "github.com/ncruces/go-sqlite3/driver"
11 _ "github.com/ncruces/go-sqlite3/driver"
12 _ "github.com/ncruces/go-sqlite3/embed"
12 _ "github.com/ncruces/go-sqlite3/embed"
13
13
14− "github.com/charmbracelet/crush/internal/config"
15−
16 "github.com/pressly/goose/v3"
14 "github.com/pressly/goose/v3"
17)
15)
18
16
19−func Connect(ctx context.Context) (*sql.DB, error) {
17+func Connect(ctx context.Context, dataDir string) (*sql.DB, error) {
20− dataDir := config.Get().Options.DataDirectory
21 if dataDir == "" {
18 if dataDir == "" {
22 return nil, fmt.Errorf("data.dir is not set")
19 return nil, fmt.Errorf("data.dir is not set")
23 }
20 }