diff --git a/cmd/lure-api-server/db.go b/cmd/lure-api-server/db.go index 22deef4..31ce069 100644 --- a/cmd/lure-api-server/db.go +++ b/cmd/lure-api-server/db.go @@ -7,7 +7,6 @@ import ( "go.arsenm.dev/logger/log" "go.arsenm.dev/lure/internal/config" "go.arsenm.dev/lure/internal/db" - "modernc.org/sqlite" ) var gdb *sqlx.DB @@ -20,8 +19,6 @@ func init() { log.Fatal("Your package cache database is using the old database engine. Please remove ~/.cache/lure and then run `lure ref`.").Send() } } - - sqlite.MustRegisterScalarFunction("json_array_contains", 2, db.JsonArrayContains) gdb, err = sqlx.Open("sqlite", config.DBPath) if err != nil { diff --git a/db.go b/db.go index 89a5e63..31ce069 100644 --- a/db.go +++ b/db.go @@ -7,7 +7,6 @@ import ( "go.arsenm.dev/logger/log" "go.arsenm.dev/lure/internal/config" "go.arsenm.dev/lure/internal/db" - "modernc.org/sqlite" ) var gdb *sqlx.DB @@ -21,8 +20,6 @@ func init() { } } - sqlite.MustRegisterScalarFunction("json_array_contains", 2, db.JsonArrayContains) - gdb, err = sqlx.Open("sqlite", config.DBPath) if err != nil { log.Fatal("Error opening database").Err(err).Send() diff --git a/internal/db/db.go b/internal/db/db.go index 8a85110..8ce474e 100644 --- a/internal/db/db.go +++ b/internal/db/db.go @@ -12,6 +12,10 @@ import ( "modernc.org/sqlite" ) +func init() { + sqlite.MustRegisterScalarFunction("json_array_contains", 2, JsonArrayContains) +} + // Package is a LURE package's database representation type Package struct { Name string `sh:"name,required" db:"name"` diff --git a/internal/db/db_test.go b/internal/db/db_test.go index f795b75..fc5bf0f 100644 --- a/internal/db/db_test.go +++ b/internal/db/db_test.go @@ -7,7 +7,6 @@ import ( "github.com/jmoiron/sqlx" "go.arsenm.dev/lure/internal/db" - "modernc.org/sqlite" ) var testPkg = db.Package{ @@ -201,8 +200,6 @@ func TestDeletePkgs(t *testing.T) { } func TestJsonArrayContains(t *testing.T) { - sqlite.MustRegisterScalarFunction("json_array_contains", 2, db.JsonArrayContains) - gdb, err := getDB(t) if err != nil { t.Fatalf("Expected no error, got %s", err)