diff --git a/db.go b/db.go index 8102e68..481b53c 100644 --- a/db.go +++ b/db.go @@ -16,6 +16,7 @@ var dbTS string //go:embed README.md var dbMD string +var defaultDB = "default" func init() { obj := map[string]any{ @@ -26,7 +27,8 @@ func init() { }, "setDefault": func(argsIn goja.FunctionCall, vm *goja.Runtime) goja.Value { args := gojs.MakeArgs(&argsIn, vm).Check(1) - conn := db.GetDB(args.Str(0), args.Logger) + defaultDB = args.Str(0) + conn := db.GetDB(defaultDB, args.Logger) args.This.ToObject(vm).Set("conn", conn) return nil }, @@ -34,7 +36,7 @@ func init() { gojs.Register("apigo.cc/gojs/db", gojs.Module{ ObjectMaker: func(vm *goja.Runtime) gojs.Map { - conn := db.GetDB("default", gojs.GetLogger(vm)) + conn := db.GetDB(defaultDB, gojs.GetLogger(vm)) dbObj := makeDBObject(conn, nil) for k, v := range obj { dbObj[k] = v @@ -169,7 +171,7 @@ func makeDBObject(conn *db.DB, tx *db.Tx) map[string]any { }, } - if conn != nil { + if tx == nil { obj["make"] = func(argsIn goja.FunctionCall, vm *goja.Runtime) goja.Value { args, conn, _, logger := initDBArgs(argsIn, vm, 1) arg0 := args.Str(0) diff --git a/go.mod b/go.mod index f1c2f63..aee76d7 100644 --- a/go.mod +++ b/go.mod @@ -3,9 +3,9 @@ module apigo.cc/gojs/db go 1.18 require ( - apigo.cc/gojs v0.0.1 + apigo.cc/gojs v0.0.4 github.com/ssgo/dao v0.1.5 - github.com/ssgo/db v1.7.9 + github.com/ssgo/db v1.7.11 github.com/ssgo/log v1.7.7 github.com/ssgo/u v1.7.9 modernc.org/sqlite v1.33.1 @@ -25,7 +25,7 @@ require ( github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/ncruces/go-strftime v0.1.9 // indirect github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect - github.com/ssgo/config v1.7.7 // indirect + github.com/ssgo/config v1.7.8 // indirect github.com/ssgo/standard v1.7.7 // indirect github.com/ssgo/tool v0.4.27 // indirect golang.org/x/sys v0.26.0 // indirect