lure
/
lure
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases 13 Activity

Move json_array_contains sql function registration to internal/db

This commit is contained in:
Elara 2022-12-27 11:14:04 -08:00
parent 852e98088b
commit a750f4630e
4 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/lure-api-server/db.go
View File

@ -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 {

3
db.go
View File

@ -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()

4
internal/db/db.go
View File

@ -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"`

3
internal/db/db_test.go
View File

@ -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)