db.go

@@ -70,20 +70,6 @@ func makeDBObject(conn *db.DB, tx *db.Tx) map[string]any {
 				panic(vm.NewGoError(r.Error))
 			}
 		},
-		"querya": func(argsIn goja.FunctionCall, vm *goja.Runtime) goja.Value {
-			args, conn, tx, _ := initDBArgs(argsIn, vm, 1)
-			var r *db.QueryResult
-			if tx != nil {
-				r = tx.Query(args.Str(0), args.Array(1)...)
-			} else {
-				r = conn.Query(args.Str(0), args.Array(1)...)
-			}
-			if r.Error == nil {
-				return vm.ToValue(makeQueryResult(r, r.SliceResults()))
-			} else {
-				panic(vm.NewGoError(r.Error))
-			}
-		},
 		"query1": func(argsIn goja.FunctionCall, vm *goja.Runtime) goja.Value {
 			args, conn, tx, _ := initDBArgs(argsIn, vm, 1)
 			var r *db.QueryResult
@@ -98,28 +84,6 @@ func makeDBObject(conn *db.DB, tx *db.Tx) map[string]any {
 				panic(vm.NewGoError(r.Error))
 			}
 		},
-		"query1a": func(argsIn goja.FunctionCall, vm *goja.Runtime) goja.Value {
-			args, conn, tx, _ := initDBArgs(argsIn, vm, 1)
-			var r *db.QueryResult
-			if tx != nil {
-				r = tx.Query(args.Str(0), args.Array(1)...)
-			} else {
-				r = conn.Query(args.Str(0), args.Array(1)...)
-			}
-			if r.Error == nil {
-				a := r.SliceResults()
-				if len(a) > 0 && len(a[0]) > 0 {
-					list := make([]any, len(a))
-					for i := 0; i < len(a); i++ {
-						list[i] = a[i][0]
-					}
-					return vm.ToValue(makeQueryResult(r, list))
-				}
-				return vm.ToValue(makeQueryResult(r, nil))
-			} else {
-				panic(vm.NewGoError(r.Error))
-			}
-		},
 		"query11": func(argsIn goja.FunctionCall, vm *goja.Runtime) goja.Value {
 			args, conn, tx, _ := initDBArgs(argsIn, vm, 1)
 			var r *db.QueryResult
@@ -133,7 +97,7 @@ func makeDBObject(conn *db.DB, tx *db.Tx) map[string]any {
 				if len(a) > 0 && len(a[0]) > 0 {
 					return vm.ToValue(makeQueryResult(r, a[0][0]))
 				}
-				return vm.ToValue(makeQueryResult(r, nil))
+				return vm.ToValue(nil)
 			} else {
 				panic(vm.NewGoError(r.Error))
 			}

db.ts

@@ -7,7 +7,6 @@ export default {
     makeER,
     query,
     query1,
-    query1a,
     query11,
     exec,
     insert,
@@ -21,12 +20,10 @@ export default {
 
 function get(dbName: string): DB { return null as any }
 function setDefault(dbName: string): void { }
-function make(descFileOrContent: string): Object[] { return null as any }
+function make(descFileOrContent: string): Array<Object> { return null as any }
 function makeER(outputFile: string, descFileOrContent: string): void { }
 function query(sql: string, ...args: any): QueryResult { return null as any }
-function querya(sql: string, ...args: any): QueryResultA { return null as any }
 function query1(sql: string, ...args: any): QueryResult1 { return null as any }
-function query1a(sql: string, ...args: any): QueryResult1A { return null as any }
 function query11(sql: string, ...args: any): QueryResult11 { return null as any }
 function exec(sql: string, ...args: any): ExecResult { return null as any }
 function insert(table: string, data: Object): ExecResult { return null as any }
@@ -38,10 +35,9 @@ function begin(): Tx { return null as any }
 function makeInKeys(numKeys: number): string { return '' }
 
 interface DB {
-    make(descFileOrContent: string): Object[]
+    make(descFileOrContent: string): Array<Object>
     query(sql: string, ...args: any): QueryResult
     query1(sql: string, ...args: any): QueryResult1
-    query1a(sql: string, ...args: any): QueryResult1A
     query11(sql: string, ...args: any): QueryResult11
     exec(sql: string, ...args: any): ExecResult
     insert(table: string, data: Object): ExecResult
@@ -56,7 +52,6 @@ interface DB {
 interface Tx {
     query(sql: string, ...args: any): QueryResult
     query1(sql: string, ...args: any): QueryResult1
-    query1a(sql: string, ...args: any): QueryResult1A
     query11(sql: string, ...args: any): QueryResult11
     exec(sql: string, ...args: any): ExecResult
     insert(table: string, data: Object): ExecResult
@@ -69,37 +64,25 @@ interface Tx {
 
 interface QueryResult {
     sql: string
-    args: any[]
-    result: Object[]
-}
-
-interface QueryResultA {
-    sql: string
-    args: any[]
-    result: any[][]
+    args: Array<any>
+    result: Array<Object>
 }
 
 interface QueryResult1 {
     sql: string
-    args: any[]
+    args: Array<any>
     result: Object
 }
 
-interface QueryResult1A {
-    sql: string
-    args: any[]
-    result: any[]
-}
-
 interface QueryResult11 {
     sql: string
-    args: any[]
+    args: Array<any>
     result: any
 }
 
 interface ExecResult {
     sql: string
-    args: any[]
+    args: Array<any>
     id: number
     changes: number
 }

go.mod

@@ -2,13 +2,15 @@ module apigo.cc/gojs/db
 
 go 1.21
 
+toolchain go1.22.5
+
 require (
-	apigo.cc/gojs v0.0.12
-	github.com/ssgo/dao v0.1.7
+	apigo.cc/gojs v0.0.8
+	github.com/ssgo/dao v0.1.5
 	github.com/ssgo/db v1.7.11
 	github.com/ssgo/log v1.7.7
 	github.com/ssgo/u v1.7.13
-	modernc.org/sqlite v1.34.4
+	modernc.org/sqlite v1.34.2
 )
 
 require (
@@ -27,12 +29,13 @@ require (
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
 	github.com/ssgo/config v1.7.9 // indirect
 	github.com/ssgo/standard v1.7.7 // indirect
-	github.com/ssgo/tool v0.4.28 // indirect
+	github.com/ssgo/tool v0.4.27 // indirect
+	golang.org/x/exp v0.0.0-20231108232855-2478ac86f678 // indirect
 	golang.org/x/sys v0.28.0 // indirect
 	golang.org/x/text v0.21.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6 // indirect
-	modernc.org/libc v1.55.3 // indirect
+	modernc.org/gc/v3 v3.0.0-20241004144649-1aea3fae8852 // indirect
+	modernc.org/libc v1.61.4 // indirect
 	modernc.org/mathutil v1.6.0 // indirect
 	modernc.org/memory v1.8.0 // indirect
 	modernc.org/strutil v1.2.0 // indirect