From 2a0f007d41faccd3f31b3375e2f18f1d384a75f8 Mon Sep 17 00:00:00 2001 From: Kujtim Hoxha Date: Sat, 5 Jul 2025 17:29:16 +0200 Subject: [PATCH] chore: pass datadir to db --- cmd/root.go | 4 ++-- internal/db/connect.go | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/cmd/root.go b/cmd/root.go index c28c2399f6269801b640a5c018788c358da5685c..3c1ccf6825c54c20c7ed41c8fba97508ff5c15e0 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -76,7 +76,7 @@ to assist developers in writing, debugging, and understanding code directly from cwd = c } - _, err := config.Init(cwd, debug) + cfg, err := config.Init(cwd, debug) if err != nil { return err } @@ -86,7 +86,7 @@ to assist developers in writing, debugging, and understanding code directly from defer cancel() // Connect DB, this will also run migrations - conn, err := db.Connect(ctx) + conn, err := db.Connect(ctx, cfg.Options.DataDirectory) if err != nil { return err } diff --git a/internal/db/connect.go b/internal/db/connect.go index 1830d64af4558e7690b00415af073073aff70398..b135351c226e5a1207e81f033e3e1a34b1d3d7e1 100644 --- a/internal/db/connect.go +++ b/internal/db/connect.go @@ -11,13 +11,10 @@ import ( _ "github.com/ncruces/go-sqlite3/driver" _ "github.com/ncruces/go-sqlite3/embed" - "github.com/charmbracelet/crush/internal/config" - "github.com/pressly/goose/v3" ) -func Connect(ctx context.Context) (*sql.DB, error) { - dataDir := config.Get().Options.DataDirectory +func Connect(ctx context.Context, dataDir string) (*sql.DB, error) { if dataDir == "" { return nil, fmt.Errorf("data.dir is not set") }