Zero blobs, tests, documentation

driver/bradfitz_test.go

@@ -1,191 +0,0 @@
-package driver_test
-
-import (
-	"database/sql"
-	"fmt"
-	"math/rand"
-	"path/filepath"
-	"testing"
-
-	_ "github.com/ncruces/go-sqlite3/driver"
-	_ "github.com/ncruces/go-sqlite3/embed"
-)
-
-type Tester interface {
-	RunTest(*testing.T, func(params))
-}
-
-var (
-	sqlite Tester = sqliteDB{}
-)
-
-const TablePrefix = "gosqltest_"
-
-type sqliteDB struct{}
-
-type params struct {
-	dbType Tester
-	*testing.T
-	*sql.DB
-}
-
-func (t params) mustExec(sql string, args ...interface{}) sql.Result {
-	res, err := t.DB.Exec(sql, args...)
-	if err != nil {
-		t.Fatalf("Error running %q: %v", sql, err)
-	}
-	return res
-}
-
-// q converts "?" characters to $1, $2, $n on postgres, :1, :2, :n on Oracle
-func (t params) q(sql string) string {
-	return sql
-}
-
-func (sqliteDB) RunTest(t *testing.T, fn func(params)) {
-	db, err := sql.Open("sqlite3", filepath.Join(t.TempDir(), "foo.db"))
-	if err != nil {
-		t.Fatalf("foo.db open fail: %v", err)
-	}
-	fn(params{sqlite, t, db})
-	if err := db.Close(); err != nil {
-		t.Fatalf("foo.db close fail: %v", err)
-	}
-}
-
-func sqlBlobParam(t params, size int) string {
-	return fmt.Sprintf("blob[%d]", size)
-}
-
-func TestBlobs_SQLite(t *testing.T) { sqlite.RunTest(t, testBlobs) }
-
-func testBlobs(t params) {
-	var blob = []byte{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}
-	t.mustExec("create table " + TablePrefix + "foo (id integer primary key, bar " + sqlBlobParam(t, 16) + ")")
-	t.mustExec(t.q("insert into "+TablePrefix+"foo (id, bar) values(?,?)"), 0, blob)
-
-	want := fmt.Sprintf("%x", blob)
-
-	b := make([]byte, 16)
-	err := t.QueryRow(t.q("select bar from "+TablePrefix+"foo where id = ?"), 0).Scan(&b)
-	got := fmt.Sprintf("%x", b)
-	if err != nil {
-		t.Errorf("[]byte scan: %v", err)
-	} else if got != want {
-		t.Errorf("for []byte, got %q; want %q", got, want)
-	}
-
-	err = t.QueryRow(t.q("select bar from "+TablePrefix+"foo where id = ?"), 0).Scan(&got)
-	want = string(blob)
-	if err != nil {
-		t.Errorf("string scan: %v", err)
-	} else if got != want {
-		t.Errorf("for string, got %q; want %q", got, want)
-	}
-}
-
-func TestManyQueryRow_SQLite(t *testing.T) { sqlite.RunTest(t, testManyQueryRow) }
-
-func testManyQueryRow(t params) {
-	if testing.Short() {
-		t.Logf("skipping in short mode")
-		return
-	}
-	t.mustExec("create table " + TablePrefix + "foo (id integer primary key, name varchar(50))")
-	t.mustExec(t.q("insert into "+TablePrefix+"foo (id, name) values(?,?)"), 1, "bob")
-	var name string
-	for i := 0; i < 10000; i++ {
-		err := t.QueryRow(t.q("select name from "+TablePrefix+"foo where id = ?"), 1).Scan(&name)
-		if err != nil || name != "bob" {
-			t.Fatalf("on query %d: err=%v, name=%q", i, err, name)
-		}
-	}
-}
-
-func TestTxQuery_SQLite(t *testing.T) { sqlite.RunTest(t, testTxQuery) }
-
-func testTxQuery(t params) {
-	tx, err := t.Begin()
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer tx.Rollback()
-
-	_, err = t.DB.Exec("create table " + TablePrefix + "foo (id integer primary key, name varchar(50))")
-	if err != nil {
-		t.Logf("cannot drop table "+TablePrefix+"foo: %s", err)
-	}
-
-	_, err = tx.Exec(t.q("insert into "+TablePrefix+"foo (id, name) values(?,?)"), 1, "bob")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	r, err := tx.Query(t.q("select name from "+TablePrefix+"foo where id = ?"), 1)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer r.Close()
-
-	if !r.Next() {
-		if r.Err() != nil {
-			t.Fatal(err)
-		}
-		t.Fatal("expected one rows")
-	}
-
-	var name string
-	err = r.Scan(&name)
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestPreparedStmt_SQLite(t *testing.T) { sqlite.RunTest(t, testPreparedStmt) }
-
-func testPreparedStmt(t params) {
-	if testing.Short() {
-		t.Logf("skipping in short mode")
-		return
-	}
-
-	t.mustExec("CREATE TABLE " + TablePrefix + "t (count INT)")
-	sel, err := t.Prepare("SELECT count FROM " + TablePrefix + "t ORDER BY count DESC")
-	if err != nil {
-		t.Fatalf("prepare 1: %v", err)
-	}
-	ins, err := t.Prepare(t.q("INSERT INTO " + TablePrefix + "t (count) VALUES (?)"))
-	if err != nil {
-		t.Fatalf("prepare 2: %v", err)
-	}
-
-	for n := 1; n <= 3; n++ {
-		if _, err := ins.Exec(n); err != nil {
-			t.Fatalf("insert(%d) = %v", n, err)
-		}
-	}
-
-	const nRuns = 10
-	ch := make(chan bool)
-	for i := 0; i < nRuns; i++ {
-		go func() {
-			defer func() {
-				ch <- true
-			}()
-			for j := 0; j < 10; j++ {
-				count := 0
-				if err := sel.QueryRow().Scan(&count); err != nil && err != sql.ErrNoRows {
-					t.Errorf("Query: %v", err)
-					return
-				}
-				if _, err := ins.Exec(rand.Intn(100)); err != nil {
-					t.Errorf("Insert: %v", err)
-					return
-				}
-			}
-		}()
-	}
-	for i := 0; i < nRuns; i++ {
-		<-ch
-	}
-}

driver/driver.go

@@ -186,8 +186,9 @@ type stmt struct {
 
 var (
 	// Ensure these interfaces are implemented:
-	_ driver.StmtExecContext  = stmt{}
-	_ driver.StmtQueryContext = stmt{}
+	_ driver.StmtExecContext   = stmt{}
+	_ driver.StmtQueryContext  = stmt{}
+	_ driver.NamedValueChecker = stmt{}
 )
 
 func (s stmt) Close() error {
@@ -256,6 +257,8 @@ func (s stmt) QueryContext(ctx context.Context, args []driver.NamedValue) (drive
 			switch a := arg.Value.(type) {
 			case bool:
 				err = s.stmt.BindBool(id, a)
+			case int:
+				err = s.stmt.BindInt(id, a)
 			case int64:
 				err = s.stmt.BindInt64(id, a)
 			case float64:
@@ -264,6 +267,8 @@ func (s stmt) QueryContext(ctx context.Context, args []driver.NamedValue) (drive
 				err = s.stmt.BindText(id, a)
 			case []byte:
 				err = s.stmt.BindBlob(id, a)
+			case sqlite3.ZeroBlob:
+				err = s.stmt.BindZeroBlob(id, int64(a))
 			case time.Time:
 				err = s.stmt.BindText(id, a.Format(time.RFC3339Nano))
 			case nil:
@@ -280,6 +285,16 @@ func (s stmt) QueryContext(ctx context.Context, args []driver.NamedValue) (drive
 	return rows{ctx, s.stmt, s.conn}, nil
 }
 
+func (s stmt) CheckNamedValue(arg *driver.NamedValue) error {
+	switch arg.Value.(type) {
+	case bool, int, int64, float64, string, []byte,
+		sqlite3.ZeroBlob, time.Time, nil:
+		return nil
+	default:
+		return driver.ErrSkip
+	}
+}
+
 type result struct{ lastInsertId, rowsAffected int64 }
 
 func (r result) LastInsertId() (int64, error) {

driver/driver_test.go

@@ -157,7 +157,7 @@ func Test_BeginTx(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	_, err = tx1.Exec(`CREATE TABLE IF NOT EXISTS users (id INT, name VARCHAR(10))`)
+	_, err = tx1.Exec(`CREATE TABLE IF NOT EXISTS test (col)`)
 	if err == nil {
 		t.Error("want error")
 	}
@@ -310,3 +310,39 @@ func Test_QueryRow_blob_null(t *testing.T) {
 		}
 	}
 }
+
+func Test_ZeroBlob(t *testing.T) {
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+
+	db, err := sql.Open("sqlite3", ":memory:")
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer db.Close()
+
+	conn, err := db.Conn(ctx)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer conn.Close()
+
+	_, err = conn.ExecContext(ctx, `CREATE TABLE IF NOT EXISTS test (col)`)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	_, err = conn.ExecContext(ctx, `INSERT INTO test(col) VALUES(?)`, sqlite3.ZeroBlob(4))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	var got []byte
+	err = conn.QueryRowContext(ctx, `SELECT col FROM test`).Scan(&got)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if string(got) != "\x00\x00\x00\x00" {
+		t.Errorf(`got %q, want "\x00\x00\x00\x00"`, got)
+	}
+}