From 6796d46c3a2736edc88418f6de515c76e29f4aa9 Mon Sep 17 00:00:00 2001 From: Yasuhiro Matsumoto Date: Thu, 3 Nov 2016 23:05:34 +0900 Subject: implement go18 Pinger --- sqlite3_test.go | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'sqlite3_test.go') diff --git a/sqlite3_test.go b/sqlite3_test.go index cf826dd..fc5c99c 100644 --- a/sqlite3_test.go +++ b/sqlite3_test.go @@ -1315,6 +1315,22 @@ func TestDeclTypes(t *testing.T) { } } +func TestPinger(t *testing.T) { + db, err := sql.Open("sqlite3", ":memory:") + if err != nil { + t.Fatal(err) + } + err = db.Ping() + if err != nil { + t.Fatal(err) + } + db.Close() + err = db.Ping() + if err == nil { + t.Fatal("Should be closed") + } +} + var customFunctionOnce sync.Once func BenchmarkCustomFunctions(b *testing.B) { -- cgit v1.2.3 From b23526fb3ce3365cb83fcb1f46ac278d70d8f934 Mon Sep 17 00:00:00 2001 From: Yasuhiro Matsumoto Date: Fri, 4 Nov 2016 15:00:29 +0900 Subject: support named params --- sqlite3.go | 48 ++++++++++++++++++++---------------------------- sqlite3_go18.go | 16 ++++++++++++++++ sqlite3_test.go | 6 +++--- 3 files changed, 39 insertions(+), 31 deletions(-) (limited to 'sqlite3_test.go') diff --git a/sqlite3.go b/sqlite3.go index 5087fad..3b80eeb 100644 --- a/sqlite3.go +++ b/sqlite3.go @@ -172,8 +172,6 @@ type SQLiteTx struct { type SQLiteStmt struct { c *SQLiteConn s *C.sqlite3_stmt - nv int - nn []string t string closed bool cls bool @@ -420,6 +418,7 @@ func (c *SQLiteConn) Exec(query string, args []driver.Value) (driver.Result, err } func (c *SQLiteConn) exec(ctx context.Context, query string, args []namedValue) (driver.Result, error) { + start := 0 for { s, err := c.Prepare(query) if err != nil { @@ -431,12 +430,16 @@ func (c *SQLiteConn) exec(ctx context.Context, query string, args []namedValue) if len(args) < na { return nil, fmt.Errorf("Not enough args to execute query. Expected %d, got %d.", na, len(args)) } + for i := 0; i < na; i++ { + args[i].Ordinal -= start + } res, err = s.(*SQLiteStmt).exec(ctx, args[:na]) if err != nil && err != driver.ErrSkip { s.Close() return nil, err } args = args[na:] + start += na } tail := s.(*SQLiteStmt).t s.Close() @@ -466,6 +469,7 @@ func (c *SQLiteConn) Query(query string, args []driver.Value) (driver.Rows, erro } func (c *SQLiteConn) query(ctx context.Context, query string, args []namedValue) (driver.Rows, error) { + start := 0 for { s, err := c.Prepare(query) if err != nil { @@ -476,12 +480,16 @@ func (c *SQLiteConn) query(ctx context.Context, query string, args []namedValue) if len(args) < na { return nil, fmt.Errorf("Not enough args to execute query. Expected %d, got %d.", na, len(args)) } + for i := 0; i < na; i++ { + args[i].Ordinal -= start + } rows, err := s.(*SQLiteStmt).query(ctx, args[:na]) if err != nil && err != driver.ErrSkip { s.Close() return nil, err } args = args[na:] + start += na tail := s.(*SQLiteStmt).t if tail == "" { return rows, nil @@ -648,15 +656,7 @@ func (c *SQLiteConn) Prepare(query string) (driver.Stmt, error) { if tail != nil && *tail != '\000' { t = strings.TrimSpace(C.GoString(tail)) } - nv := int(C.sqlite3_bind_parameter_count(s)) - var nn []string - for i := 0; i < nv; i++ { - pn := C.GoString(C.sqlite3_bind_parameter_name(s, C.int(i+1))) - if len(pn) > 1 && pn[0] == '$' && 48 <= pn[1] && pn[1] <= 57 { - nn = append(nn, C.GoString(C.sqlite3_bind_parameter_name(s, C.int(i+1)))) - } - } - ss := &SQLiteStmt{c: c, s: s, nv: nv, nn: nn, t: t} + ss := &SQLiteStmt{c: c, s: s, t: t} runtime.SetFinalizer(ss, (*SQLiteStmt).Close) return ss, nil } @@ -680,7 +680,7 @@ func (s *SQLiteStmt) Close() error { // Return a number of parameters. func (s *SQLiteStmt) NumInput() int { - return s.nv + return int(C.sqlite3_bind_parameter_count(s.s)) } type bindArg struct { @@ -694,25 +694,17 @@ func (s *SQLiteStmt) bind(args []namedValue) error { return s.c.lastError() } - var vargs []bindArg - narg := len(args) - vargs = make([]bindArg, narg) - if len(s.nn) > 0 { - for i, v := range s.nn { - if pi, err := strconv.Atoi(v[1:]); err == nil { - vargs[i] = bindArg{pi, args[i].Value} - } - } - } else { - for i, v := range args { - vargs[i] = bindArg{i + 1, v.Value} + for i, v := range args { + if v.Name != "" { + cname := C.CString(v.Name) + args[i].Ordinal = int(C.sqlite3_bind_parameter_index(s.s, cname)) + C.free(unsafe.Pointer(cname)) } } - for _, varg := range vargs { - n := C.int(varg.n) - v := varg.v - switch v := v.(type) { + for _, arg := range args { + n := C.int(arg.Ordinal) + switch v := arg.Value.(type) { case nil: rv = C.sqlite3_bind_null(s.s, n) case string: diff --git a/sqlite3_go18.go b/sqlite3_go18.go index 1ee4c6a..3993490 100644 --- a/sqlite3_go18.go +++ b/sqlite3_go18.go @@ -23,6 +23,14 @@ func (c *SQLiteConn) QueryContext(ctx context.Context, query string, args []driv return c.query(ctx, query, list) } +func (c *SQLiteConn) ExecContext(ctx context.Context, query string, args []driver.NamedValue) (driver.Result, error) { + list := make([]namedValue, len(args)) + for i, nv := range args { + list[i] = namedValue(nv) + } + return c.exec(ctx, query, list) +} + func (s *SQLiteStmt) QueryContext(ctx context.Context, args []driver.NamedValue) (driver.Rows, error) { list := make([]namedValue, len(args)) for i, nv := range args { @@ -30,3 +38,11 @@ func (s *SQLiteStmt) QueryContext(ctx context.Context, args []driver.NamedValue) } return s.query(ctx, list) } + +func (s *SQLiteStmt) ExecContext(ctx context.Context, args []driver.NamedValue) (driver.Result, error) { + list := make([]namedValue, len(args)) + for i, nv := range args { + list[i] = namedValue(nv) + } + return s.exec(ctx, list) +} diff --git a/sqlite3_test.go b/sqlite3_test.go index fc5c99c..b126bbd 100644 --- a/sqlite3_test.go +++ b/sqlite3_test.go @@ -993,7 +993,7 @@ func TestVersion(t *testing.T) { } } -func TestNumberNamedParams(t *testing.T) { +func TestNamedParams(t *testing.T) { tempFilename := TempFilename(t) defer os.Remove(tempFilename) db, err := sql.Open("sqlite3", tempFilename) @@ -1009,12 +1009,12 @@ func TestNumberNamedParams(t *testing.T) { t.Error("Failed to call db.Query:", err) } - _, err = db.Exec(`insert into foo(id, name, extra) values($1, $2, $2)`, 1, "foo") + _, err = db.Exec(`insert into foo(id, name, extra) values(:id, :name, :name)`, sql.Param(":name", "foo"), sql.Param(":id", 1)) if err != nil { t.Error("Failed to call db.Exec:", err) } - row := db.QueryRow(`select id, extra from foo where id = $1 and extra = $2`, 1, "foo") + row := db.QueryRow(`select id, extra from foo where id = :id and extra = :extra`, sql.Param(":id", 1), sql.Param(":extra", "foo")) if row == nil { t.Error("Failed to call db.QueryRow") } -- cgit v1.2.3 From 57eaf4c0709539478ef65348d27518327283c840 Mon Sep 17 00:00:00 2001 From: Yasuhiro Matsumoto Date: Fri, 4 Nov 2016 15:17:21 +0900 Subject: separate test --- sqlite3_go18_test.go | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ sqlite3_test.go | 36 ------------------------------------ 2 files changed, 49 insertions(+), 36 deletions(-) create mode 100644 sqlite3_go18_test.go (limited to 'sqlite3_test.go') diff --git a/sqlite3_go18_test.go b/sqlite3_go18_test.go new file mode 100644 index 0000000..bc8aa4e --- /dev/null +++ b/sqlite3_go18_test.go @@ -0,0 +1,49 @@ +// Copyright (C) 2014 Yasuhiro Matsumoto . +// +// Use of this source code is governed by an MIT-style +// license that can be found in the LICENSE file. +// +build go1.8 + +package sqlite3 + +import ( + "database/sql" + "os" + "testing" +) + +func TestNamedParams(t *testing.T) { + tempFilename := TempFilename(t) + defer os.Remove(tempFilename) + db, err := sql.Open("sqlite3", tempFilename) + if err != nil { + t.Fatal("Failed to open database:", err) + } + defer db.Close() + + _, err = db.Exec(` + create table foo (id integer, name text, extra text); + `) + if err != nil { + t.Error("Failed to call db.Query:", err) + } + + _, err = db.Exec(`insert into foo(id, name, extra) values(:id, :name, :name)`, sql.Param(":name", "foo"), sql.Param(":id", 1)) + if err != nil { + t.Error("Failed to call db.Exec:", err) + } + + row := db.QueryRow(`select id, extra from foo where id = :id and extra = :extra`, sql.Param(":id", 1), sql.Param(":extra", "foo")) + if row == nil { + t.Error("Failed to call db.QueryRow") + } + var id int + var extra string + err = row.Scan(&id, &extra) + if err != nil { + t.Error("Failed to db.Scan:", err) + } + if id != 1 || extra != "foo" { + t.Error("Failed to db.QueryRow: not matched results") + } +} diff --git a/sqlite3_test.go b/sqlite3_test.go index b126bbd..e578404 100644 --- a/sqlite3_test.go +++ b/sqlite3_test.go @@ -993,42 +993,6 @@ func TestVersion(t *testing.T) { } } -func TestNamedParams(t *testing.T) { - tempFilename := TempFilename(t) - defer os.Remove(tempFilename) - db, err := sql.Open("sqlite3", tempFilename) - if err != nil { - t.Fatal("Failed to open database:", err) - } - defer db.Close() - - _, err = db.Exec(` - create table foo (id integer, name text, extra text); - `) - if err != nil { - t.Error("Failed to call db.Query:", err) - } - - _, err = db.Exec(`insert into foo(id, name, extra) values(:id, :name, :name)`, sql.Param(":name", "foo"), sql.Param(":id", 1)) - if err != nil { - t.Error("Failed to call db.Exec:", err) - } - - row := db.QueryRow(`select id, extra from foo where id = :id and extra = :extra`, sql.Param(":id", 1), sql.Param(":extra", "foo")) - if row == nil { - t.Error("Failed to call db.QueryRow") - } - var id int - var extra string - err = row.Scan(&id, &extra) - if err != nil { - t.Error("Failed to db.Scan:", err) - } - if id != 1 || extra != "foo" { - t.Error("Failed to db.QueryRow: not matched results") - } -} - func TestStringContainingZero(t *testing.T) { tempFilename := TempFilename(t) defer os.Remove(tempFilename) -- cgit v1.2.3 From 15491aeb9ce9ce0ec580011e1bbc3d83c6be4953 Mon Sep 17 00:00:00 2001 From: Yasuhiro Matsumoto Date: Sun, 6 Nov 2016 13:16:38 +0900 Subject: go vet && golint --- sqlite3_go18.go | 7 ++++++- sqlite3_go18_test.go | 1 + sqlite3_test.go | 42 +++++++++++++++++++++--------------------- sqlite3_type.go | 3 +++ 4 files changed, 31 insertions(+), 22 deletions(-) (limited to 'sqlite3_test.go') diff --git a/sqlite3_go18.go b/sqlite3_go18.go index 9ad7baf..ec2c3a8 100644 --- a/sqlite3_go18.go +++ b/sqlite3_go18.go @@ -1,3 +1,8 @@ +// Copyright (C) 2014 Yasuhiro Matsumoto . +// +// Use of this source code is governed by an MIT-style +// license that can be found in the LICENSE file. + // +build go1.8 package sqlite3 @@ -6,7 +11,7 @@ import ( "database/sql/driver" "errors" - "golang.org/x/net/context" + "context" ) // Ping implement Pinger. diff --git a/sqlite3_go18_test.go b/sqlite3_go18_test.go index bc8aa4e..54e6604 100644 --- a/sqlite3_go18_test.go +++ b/sqlite3_go18_test.go @@ -2,6 +2,7 @@ // // Use of this source code is governed by an MIT-style // license that can be found in the LICENSE file. + // +build go1.8 package sqlite3 diff --git a/sqlite3_test.go b/sqlite3_test.go index e578404..eb9d18e 100644 --- a/sqlite3_test.go +++ b/sqlite3_test.go @@ -207,12 +207,12 @@ func TestUpdate(t *testing.T) { if err != nil { t.Fatal("Failed to update record:", err) } - lastId, err := res.LastInsertId() + lastID, err := res.LastInsertId() if err != nil { t.Fatal("Failed to get LastInsertId:", err) } - if expected != lastId { - t.Errorf("Expected %q for last Id, but %q:", expected, lastId) + if expected != lastID { + t.Errorf("Expected %q for last Id, but %q:", expected, lastID) } affected, _ = res.RowsAffected() if err != nil { @@ -272,12 +272,12 @@ func TestDelete(t *testing.T) { if err != nil { t.Fatal("Failed to delete record:", err) } - lastId, err := res.LastInsertId() + lastID, err := res.LastInsertId() if err != nil { t.Fatal("Failed to get LastInsertId:", err) } - if expected != lastId { - t.Errorf("Expected %q for last Id, but %q:", expected, lastId) + if expected != lastID { + t.Errorf("Expected %q for last Id, but %q:", expected, lastID) } affected, err = res.RowsAffected() if err != nil { @@ -1070,12 +1070,12 @@ func TestDateTimeNow(t *testing.T) { } func TestFunctionRegistration(t *testing.T) { - addi_8_16_32 := func(a int8, b int16) int32 { return int32(a) + int32(b) } - addi_64 := func(a, b int64) int64 { return a + b } - addu_8_16_32 := func(a uint8, b uint16) uint32 { return uint32(a) + uint32(b) } - addu_64 := func(a, b uint64) uint64 { return a + b } + addi8_16_32 := func(a int8, b int16) int32 { return int32(a) + int32(b) } + addi64 := func(a, b int64) int64 { return a + b } + addu8_16_32 := func(a uint8, b uint16) uint32 { return uint32(a) + uint32(b) } + addu64 := func(a, b uint64) uint64 { return a + b } addiu := func(a int, b uint) int64 { return int64(a) + int64(b) } - addf_32_64 := func(a float32, b float64) float64 { return float64(a) + b } + addf32_64 := func(a float32, b float64) float64 { return float64(a) + b } not := func(a bool) bool { return !a } regex := func(re, s string) (bool, error) { return regexp.MatchString(re, s) @@ -1107,22 +1107,22 @@ func TestFunctionRegistration(t *testing.T) { sql.Register("sqlite3_FunctionRegistration", &SQLiteDriver{ ConnectHook: func(conn *SQLiteConn) error { - if err := conn.RegisterFunc("addi_8_16_32", addi_8_16_32, true); err != nil { + if err := conn.RegisterFunc("addi8_16_32", addi8_16_32, true); err != nil { return err } - if err := conn.RegisterFunc("addi_64", addi_64, true); err != nil { + if err := conn.RegisterFunc("addi64", addi64, true); err != nil { return err } - if err := conn.RegisterFunc("addu_8_16_32", addu_8_16_32, true); err != nil { + if err := conn.RegisterFunc("addu8_16_32", addu8_16_32, true); err != nil { return err } - if err := conn.RegisterFunc("addu_64", addu_64, true); err != nil { + if err := conn.RegisterFunc("addu64", addu64, true); err != nil { return err } if err := conn.RegisterFunc("addiu", addiu, true); err != nil { return err } - if err := conn.RegisterFunc("addf_32_64", addf_32_64, true); err != nil { + if err := conn.RegisterFunc("addf32_64", addf32_64, true); err != nil { return err } if err := conn.RegisterFunc("not", not, true); err != nil { @@ -1153,12 +1153,12 @@ func TestFunctionRegistration(t *testing.T) { query string expected interface{} }{ - {"SELECT addi_8_16_32(1,2)", int32(3)}, - {"SELECT addi_64(1,2)", int64(3)}, - {"SELECT addu_8_16_32(1,2)", uint32(3)}, - {"SELECT addu_64(1,2)", uint64(3)}, + {"SELECT addi8_16_32(1,2)", int32(3)}, + {"SELECT addi64(1,2)", int64(3)}, + {"SELECT addu8_16_32(1,2)", uint32(3)}, + {"SELECT addu64(1,2)", uint64(3)}, {"SELECT addiu(1,2)", int64(3)}, - {"SELECT addf_32_64(1.5,1.5)", float64(3)}, + {"SELECT addf32_64(1.5,1.5)", float64(3)}, {"SELECT not(1)", false}, {"SELECT not(0)", true}, {`SELECT regex("^foo.*", "foobar")`, true}, diff --git a/sqlite3_type.go b/sqlite3_type.go index 748bc42..200d071 100644 --- a/sqlite3_type.go +++ b/sqlite3_type.go @@ -13,6 +13,7 @@ import ( "time" ) +// ColumnTypeDatabaseTypeName implement RowsColumnTypeDatabaseTypeName. func (rc *SQLiteRows) ColumnTypeDatabaseTypeName(i int) string { return C.GoString(C.sqlite3_column_decltype(rc.s.s, C.int(i))) } @@ -27,10 +28,12 @@ func (rc *SQLiteRows) ColumnTypePrecisionScale(index int) (precision, scale int6 } */ +// ColumnTypeNullable implement RowsColumnTypeNullable. func (rc *SQLiteRows) ColumnTypeNullable(i int) (nullable, ok bool) { return true, true } +// ColumnTypeScanType implement RowsColumnTypeScanType. func (rc *SQLiteRows) ColumnTypeScanType(i int) reflect.Type { switch C.sqlite3_column_type(rc.s.s, C.int(i)) { case C.SQLITE_INTEGER: -- cgit v1.2.3