Update expected test output

Broken in https://github.com/mattn/go-sqlite3/pull/1085

README.md

@@ -165,7 +165,6 @@ go build --tags "icu json1 fts5 secure_delete"
 | Allow URI Authority | sqlite_allow_uri_authority | URI filenames normally throws an error if the authority section is not either empty or "localhost".<br><br>However, if SQLite is compiled with the SQLITE_ALLOW_URI_AUTHORITY compile-time option, then the URI is converted into a Uniform Naming Convention (UNC) filename and passed down to the underlying operating system that way |
 | App Armor | sqlite_app_armor | When defined, this C-preprocessor macro activates extra code that attempts to detect misuse of the SQLite API, such as passing in NULL pointers to required parameters or using objects after they have been destroyed. <br><br>App Armor is not available under `Windows`. |
 | Disable Load Extensions | sqlite_omit_load_extension | Loading of external extensions is enabled by default.<br><br>To disable extension loading add the build tag `sqlite_omit_load_extension`. |
-| Enable Serialization with `libsqlite3` | sqlite_serialize | Serialization and deserialization of a SQLite database is available by default, unless the build tag `libsqlite3` is set.<br><br>To enable this functionality even if `libsqlite3` is set, add the build tag `sqlite_serialize`. |
 | Foreign Keys | sqlite_foreign_keys | This macro determines whether enforcement of foreign key constraints is enabled or disabled by default for new database connections.<br><br>Each database connection can always turn enforcement of foreign key constraints on and off and run-time using the foreign_keys pragma.<br><br>Enforcement of foreign key constraints is normally off by default, but if this compile-time parameter is set to 1, enforcement of foreign key constraints will be on by default | 
 | Full Auto Vacuum | sqlite_vacuum_full | Set the default auto vacuum to full |
 | Incremental Auto Vacuum | sqlite_vacuum_incr | Set the default auto vacuum to incremental |

sqlite3.go

@@ -837,9 +837,9 @@ func lastError(db *C.sqlite3) error {
 
 // Exec implements Execer.
 func (c *SQLiteConn) Exec(query string, args []driver.Value) (driver.Result, error) {
-	list := make([]driver.NamedValue, len(args))
+	list := make([]namedValue, len(args))
 	for i, v := range args {
-		list[i] = driver.NamedValue{
+		list[i] = namedValue{
 			Ordinal: i + 1,
 			Value:   v,
 		}
@@ -847,7 +847,7 @@ func (c *SQLiteConn) Exec(query string, args []driver.Value) (driver.Result, err
 	return c.exec(context.Background(), query, list)
 }
 
-func (c *SQLiteConn) exec(ctx context.Context, query string, args []driver.NamedValue) (driver.Result, error) {
+func (c *SQLiteConn) exec(ctx context.Context, query string, args []namedValue) (driver.Result, error) {
 	start := 0
 	for {
 		s, err := c.prepare(ctx, query)
@@ -856,7 +856,7 @@ func (c *SQLiteConn) exec(ctx context.Context, query string, args []driver.Named
 		}
 		var res driver.Result
 		if s.(*SQLiteStmt).s != nil {
-			stmtArgs := make([]driver.NamedValue, 0, len(args))
+			stmtArgs := make([]namedValue, 0, len(args))
 			na := s.NumInput()
 			if len(args)-start < na {
 				s.Close()
@@ -894,11 +894,17 @@ func (c *SQLiteConn) exec(ctx context.Context, query string, args []driver.Named
 	}
 }
 
+type namedValue struct {
+	Name    string
+	Ordinal int
+	Value   driver.Value
+}
+
 // Query implements Queryer.
 func (c *SQLiteConn) Query(query string, args []driver.Value) (driver.Rows, error) {
-	list := make([]driver.NamedValue, len(args))
+	list := make([]namedValue, len(args))
 	for i, v := range args {
-		list[i] = driver.NamedValue{
+		list[i] = namedValue{
 			Ordinal: i + 1,
 			Value:   v,
 		}
@@ -906,10 +912,10 @@ func (c *SQLiteConn) Query(query string, args []driver.Value) (driver.Rows, erro
 	return c.query(context.Background(), query, list)
 }
 
-func (c *SQLiteConn) query(ctx context.Context, query string, args []driver.NamedValue) (driver.Rows, error) {
+func (c *SQLiteConn) query(ctx context.Context, query string, args []namedValue) (driver.Rows, error) {
 	start := 0
 	for {
-		stmtArgs := make([]driver.NamedValue, 0, len(args))
+		stmtArgs := make([]namedValue, 0, len(args))
 		s, err := c.prepare(ctx, query)
 		if err != nil {
 			return nil, err
@@ -1906,7 +1912,7 @@ func (s *SQLiteStmt) NumInput() int {
 
 var placeHolder = []byte{0}
 
-func (s *SQLiteStmt) bind(args []driver.NamedValue) error {
+func (s *SQLiteStmt) bind(args []namedValue) error {
 	rv := C.sqlite3_reset(s.s)
 	if rv != C.SQLITE_ROW && rv != C.SQLITE_OK && rv != C.SQLITE_DONE {
 		return s.c.lastError()
@@ -1976,9 +1982,9 @@ func (s *SQLiteStmt) bind(args []driver.NamedValue) error {
 
 // Query the statement with arguments. Return records.
 func (s *SQLiteStmt) Query(args []driver.Value) (driver.Rows, error) {
-	list := make([]driver.NamedValue, len(args))
+	list := make([]namedValue, len(args))
 	for i, v := range args {
-		list[i] = driver.NamedValue{
+		list[i] = namedValue{
 			Ordinal: i + 1,
 			Value:   v,
 		}
@@ -1986,7 +1992,7 @@ func (s *SQLiteStmt) Query(args []driver.Value) (driver.Rows, error) {
 	return s.query(context.Background(), list)
 }
 
-func (s *SQLiteStmt) query(ctx context.Context, args []driver.NamedValue) (driver.Rows, error) {
+func (s *SQLiteStmt) query(ctx context.Context, args []namedValue) (driver.Rows, error) {
 	if err := s.bind(args); err != nil {
 		return nil, err
 	}
@@ -2016,9 +2022,9 @@ func (r *SQLiteResult) RowsAffected() (int64, error) {
 
 // Exec execute the statement with arguments. Return result object.
 func (s *SQLiteStmt) Exec(args []driver.Value) (driver.Result, error) {
-	list := make([]driver.NamedValue, len(args))
+	list := make([]namedValue, len(args))
 	for i, v := range args {
-		list[i] = driver.NamedValue{
+		list[i] = namedValue{
 			Ordinal: i + 1,
 			Value:   v,
 		}
@@ -2035,7 +2041,7 @@ func isInterruptErr(err error) bool {
 }
 
 // exec executes a query that doesn't return rows. Attempts to honor context timeout.
-func (s *SQLiteStmt) exec(ctx context.Context, args []driver.NamedValue) (driver.Result, error) {
+func (s *SQLiteStmt) exec(ctx context.Context, args []namedValue) (driver.Result, error) {
 	if ctx.Done() == nil {
 		return s.execSync(args)
 	}
@@ -2067,7 +2073,7 @@ func (s *SQLiteStmt) exec(ctx context.Context, args []driver.NamedValue) (driver
 	return rv.r, rv.err
 }
 
-func (s *SQLiteStmt) execSync(args []driver.NamedValue) (driver.Result, error) {
+func (s *SQLiteStmt) execSync(args []namedValue) (driver.Result, error) {
 	if err := s.bind(args); err != nil {
 		C.sqlite3_reset(s.s)
 		C.sqlite3_clear_bindings(s.s)

sqlite3_go18.go

@@ -25,12 +25,20 @@ func (c *SQLiteConn) Ping(ctx context.Context) error {
 
 // QueryContext implement QueryerContext.
 func (c *SQLiteConn) QueryContext(ctx context.Context, query string, args []driver.NamedValue) (driver.Rows, error) {
-	return c.query(ctx, query, args)
+	list := make([]namedValue, len(args))
+	for i, nv := range args {
+		list[i] = namedValue(nv)
+	}
+	return c.query(ctx, query, list)
 }
 
 // ExecContext implement ExecerContext.
 func (c *SQLiteConn) ExecContext(ctx context.Context, query string, args []driver.NamedValue) (driver.Result, error) {
-	return c.exec(ctx, query, args)
+	list := make([]namedValue, len(args))
+	for i, nv := range args {
+		list[i] = namedValue(nv)
+	}
+	return c.exec(ctx, query, list)
 }
 
 // PrepareContext implement ConnPrepareContext.
@@ -45,10 +53,18 @@ func (c *SQLiteConn) BeginTx(ctx context.Context, opts driver.TxOptions) (driver
 
 // QueryContext implement QueryerContext.
 func (s *SQLiteStmt) QueryContext(ctx context.Context, args []driver.NamedValue) (driver.Rows, error) {
-	return s.query(ctx, args)
+	list := make([]namedValue, len(args))
+	for i, nv := range args {
+		list[i] = namedValue(nv)
+	}
+	return s.query(ctx, list)
 }
 
 // ExecContext implement ExecerContext.
 func (s *SQLiteStmt) ExecContext(ctx context.Context, args []driver.NamedValue) (driver.Result, error) {
-	return s.exec(ctx, args)
+	list := make([]namedValue, len(args))
+	for i, nv := range args {
+		list[i] = namedValue(nv)
+	}
+	return s.exec(ctx, list)
 }

sqlite3_opt_serialize.go

@@ -1,82 +0,0 @@
-// +build !libsqlite3 sqlite_serialize
-
-package sqlite3
-
-/*
-#ifndef USE_LIBSQLITE3
-#include <sqlite3-binding.h>
-#else
-#include <sqlite3.h>
-#endif
-#include <stdlib.h>
-#include <stdint.h>
-*/
-import "C"
-
-import (
-	"fmt"
-	"math"
-	"reflect"
-	"unsafe"
-)
-
-// Serialize returns a byte slice that is a serialization of the database.
-//
-// See https://www.sqlite.org/c3ref/serialize.html
-func (c *SQLiteConn) Serialize(schema string) ([]byte, error) {
-	if schema == "" {
-		schema = "main"
-	}
-	var zSchema *C.char
-	zSchema = C.CString(schema)
-	defer C.free(unsafe.Pointer(zSchema))
-
-	var sz C.sqlite3_int64
-	ptr := C.sqlite3_serialize(c.db, zSchema, &sz, 0)
-	if ptr == nil {
-		return nil, fmt.Errorf("serialize failed")
-	}
-	defer C.sqlite3_free(unsafe.Pointer(ptr))
-
-	if sz > C.sqlite3_int64(math.MaxInt) {
-		return nil, fmt.Errorf("serialized database is too large (%d bytes)", sz)
-	}
-
-	cBuf := *(*[]byte)(unsafe.Pointer(&reflect.SliceHeader{
-		Data: uintptr(unsafe.Pointer(ptr)),
-		Len:  int(sz),
-		Cap:  int(sz),
-	}))
-
-	res := make([]byte, int(sz))
-	copy(res, cBuf)
-	return res, nil
-}
-
-// Deserialize causes the connection to disconnect from the current database and
-// then re-open as an in-memory database based on the contents of the byte slice.
-//
-// See https://www.sqlite.org/c3ref/deserialize.html
-func (c *SQLiteConn) Deserialize(b []byte, schema string) error {
-	if schema == "" {
-		schema = "main"
-	}
-	var zSchema *C.char
-	zSchema = C.CString(schema)
-	defer C.free(unsafe.Pointer(zSchema))
-
-	tmpBuf := (*C.uchar)(C.sqlite3_malloc64(C.sqlite3_uint64(len(b))))
-	cBuf := *(*[]byte)(unsafe.Pointer(&reflect.SliceHeader{
-		Data: uintptr(unsafe.Pointer(tmpBuf)),
-		Len:  len(b),
-		Cap:  len(b),
-	}))
-	copy(cBuf, b)
-
-	rc := C.sqlite3_deserialize(c.db, zSchema, tmpBuf, C.sqlite3_int64(len(b)),
-		C.sqlite3_int64(len(b)), C.SQLITE_DESERIALIZE_FREEONCLOSE)
-	if rc != C.SQLITE_OK {
-		return fmt.Errorf("deserialize failed with return %v", rc)
-	}
-	return nil
-}

sqlite3_opt_serialize_omit.go

@@ -1,20 +0,0 @@
-// +build libsqlite3,!sqlite_serialize
-
-package sqlite3
-
-import (
-	"errors"
-)
-
-/*
-#cgo CFLAGS: -DSQLITE_OMIT_DESERIALIZE
-*/
-import "C"
-
-func (c *SQLiteConn) Serialize(schema string) ([]byte, error) {
-	return nil, errors.New("sqlite3: Serialize requires the sqlite_serialize build tag when using the libsqlite3 build tag")
-}
-
-func (c *SQLiteConn) Deserialize(b []byte, schema string) error {
-	return errors.New("sqlite3: Deserialize requires the sqlite_serialize build tag when using the libsqlite3 build tag")
-}

sqlite3_opt_serialize_test.go

@@ -1,99 +0,0 @@
-// +build !libsqlite3 sqlite_serialize
-
-package sqlite3
-
-import (
-	"context"
-	"database/sql"
-	"os"
-	"testing"
-)
-
-func TestSerializeDeserialize(t *testing.T) {
-	// Connect to the source database.
-	srcTempFilename := TempFilename(t)
-	defer os.Remove(srcTempFilename)
-	srcDb, err := sql.Open(driverName, srcTempFilename)
-	if err != nil {
-		t.Fatal("Failed to open the source database:", err)
-	}
-	defer srcDb.Close()
-	err = srcDb.Ping()
-	if err != nil {
-		t.Fatal("Failed to connect to the source database:", err)
-	}
-
-	// Connect to the destination database.
-	destTempFilename := TempFilename(t)
-	defer os.Remove(destTempFilename)
-	destDb, err := sql.Open(driverName, destTempFilename)
-	if err != nil {
-		t.Fatal("Failed to open the destination database:", err)
-	}
-	defer destDb.Close()
-	err = destDb.Ping()
-	if err != nil {
-		t.Fatal("Failed to connect to the destination database:", err)
-	}
-
-	// Write data to source database.
-	_, err = srcDb.Exec(`CREATE TABLE foo (name string)`)
-	if err != nil {
-		t.Fatal("Failed to create table in source database:", err)
-	}
-	_, err = srcDb.Exec(`INSERT INTO foo(name) VALUES("alice")`)
-	if err != nil {
-		t.Fatal("Failed to insert data into source database", err)
-	}
-
-	// Serialize the source database
-	srcConn, err := srcDb.Conn(context.Background())
-	if err != nil {
-		t.Fatal("Failed to get connection to source database:", err)
-	}
-	defer srcConn.Close()
-
-	var serialized []byte
-	if err := srcConn.Raw(func(raw interface{}) error {
-		var err error
-		serialized, err = raw.(*SQLiteConn).Serialize("")
-		return err
-	}); err != nil {
-		t.Fatal("Failed to serialize source database:", err)
-	}
-	srcConn.Close()
-
-	// Confirm that the destination database is initially empty.
-	var destTableCount int
-	err = destDb.QueryRow("SELECT COUNT(*) FROM sqlite_master WHERE type = 'table'").Scan(&destTableCount)
-	if err != nil {
-		t.Fatal("Failed to check the destination table count:", err)
-	}
-	if destTableCount != 0 {
-		t.Fatalf("The destination database is not empty; %v table(s) found.", destTableCount)
-	}
-
-	// Deserialize to destination database
-	destConn, err := destDb.Conn(context.Background())
-	if err != nil {
-		t.Fatal("Failed to get connection to destination database:", err)
-	}
-	defer destConn.Close()
-
-	if err := destConn.Raw(func(raw interface{}) error {
-		return raw.(*SQLiteConn).Deserialize(serialized, "")
-	}); err != nil {
-		t.Fatal("Failed to deserialize source database:", err)
-	}
-	destConn.Close()
-
-	// Confirm that destination database has been loaded correctly.
-	var destRowCount int
-	err = destDb.QueryRow(`SELECT COUNT(*) FROM foo`).Scan(&destRowCount)
-	if err != nil {
-		t.Fatal("Failed to count rows in destination database table", err)
-	}
-	if destRowCount != 1 {
-		t.Fatalf("Destination table does not have the expected records")
-	}
-}