Move json_array_contains sql function registration to internal/db
This commit is contained in:
parent
852e98088b
commit
a750f4630e
|
@ -7,7 +7,6 @@ import (
|
||||||
"go.arsenm.dev/logger/log"
|
"go.arsenm.dev/logger/log"
|
||||||
"go.arsenm.dev/lure/internal/config"
|
"go.arsenm.dev/lure/internal/config"
|
||||||
"go.arsenm.dev/lure/internal/db"
|
"go.arsenm.dev/lure/internal/db"
|
||||||
"modernc.org/sqlite"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
var gdb *sqlx.DB
|
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()
|
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)
|
gdb, err = sqlx.Open("sqlite", config.DBPath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
3
db.go
3
db.go
|
@ -7,7 +7,6 @@ import (
|
||||||
"go.arsenm.dev/logger/log"
|
"go.arsenm.dev/logger/log"
|
||||||
"go.arsenm.dev/lure/internal/config"
|
"go.arsenm.dev/lure/internal/config"
|
||||||
"go.arsenm.dev/lure/internal/db"
|
"go.arsenm.dev/lure/internal/db"
|
||||||
"modernc.org/sqlite"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
var gdb *sqlx.DB
|
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)
|
gdb, err = sqlx.Open("sqlite", config.DBPath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatal("Error opening database").Err(err).Send()
|
log.Fatal("Error opening database").Err(err).Send()
|
||||||
|
|
|
@ -12,6 +12,10 @@ import (
|
||||||
"modernc.org/sqlite"
|
"modernc.org/sqlite"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
func init() {
|
||||||
|
sqlite.MustRegisterScalarFunction("json_array_contains", 2, JsonArrayContains)
|
||||||
|
}
|
||||||
|
|
||||||
// Package is a LURE package's database representation
|
// Package is a LURE package's database representation
|
||||||
type Package struct {
|
type Package struct {
|
||||||
Name string `sh:"name,required" db:"name"`
|
Name string `sh:"name,required" db:"name"`
|
||||||
|
|
|
@ -7,7 +7,6 @@ import (
|
||||||
|
|
||||||
"github.com/jmoiron/sqlx"
|
"github.com/jmoiron/sqlx"
|
||||||
"go.arsenm.dev/lure/internal/db"
|
"go.arsenm.dev/lure/internal/db"
|
||||||
"modernc.org/sqlite"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
var testPkg = db.Package{
|
var testPkg = db.Package{
|
||||||
|
@ -201,8 +200,6 @@ func TestDeletePkgs(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestJsonArrayContains(t *testing.T) {
|
func TestJsonArrayContains(t *testing.T) {
|
||||||
sqlite.MustRegisterScalarFunction("json_array_contains", 2, db.JsonArrayContains)
|
|
||||||
|
|
||||||
gdb, err := getDB(t)
|
gdb, err := getDB(t)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("Expected no error, got %s", err)
|
t.Fatalf("Expected no error, got %s", err)
|
||||||
|
|
Loading…
Reference in New Issue