modernc.org/sqlite bump + port #196 in-memory-conn fix +

ncruces attribution

modernc.org/sqlite bumps; golang.org/x/{crypto,sys,text} ride along
via `go mod tidy`. github.com/google/uuid and golang.org/x/text move
from indirect to direct in go.mod since ext/uuid and ext/unicode
import them at the leaf. modernc.org/libc stays pinned to the version
the new sqlite release carries — no independent bump.

conn.go ports the upstream #196 fix that regressed under #198's
sqlite3_is_interrupted check. A new (*conn).inMemory bool is set
once at open via Xsqlite3_db_filename(c.db, "main") — empty filename
means the database lives only in this connection. (*conn).usable()
short-circuits to true for in-memory conns so database/sql doesn't
discard a cancelled-QueryContext'd handle and lose the entire
database with it. File-backed conns keep the existing behaviour: an
interrupted one is reported unusable so the pool drops it, since the
data is safe on disk. conn_inmemory_test.go pins both branches
(in-memory survives interrupt, file-backed is dropped) — a port of
modernc's TestInMemoryDBSurvivesContextCancel.

Author: ditalini

README.md

@@ -861,6 +861,11 @@ preserved under its original license:
 - [github.com/glebarez/sqlite](https://github.com/glebarez/sqlite) —
   MIT; see [LICENSE.glebarez](LICENSE.glebarez). The `gorm/` sub-package
   is ported from glebarez.
+- [github.com/ncruces/go-sqlite3](https://github.com/ncruces/go-sqlite3) —
+  MIT; see [LICENSE.ncruces](LICENSE.ncruces). Several `ext/` sub-packages
+  port loadable extensions from ncruces — re-implemented against this
+  driver's `(*Conn).RegisterFunc` / vtab helper APIs rather than copied
+  verbatim, with a credit header in each ported package's doc.
 
 ## Acknowledgements
 
@@ -870,6 +875,9 @@ preserved under its original license:
   driver whose API we mirror.
 - [glebarez/sqlite](https://github.com/glebarez/sqlite) — the gorm dialector
   this package's gorm sub-package is ported from.
+- [ncruces/go-sqlite3](https://github.com/ncruces/go-sqlite3) — Nuno Cruces's
+  CGo-free (WASM/wazero) driver, whose loadable-extension lineup several
+  `ext/` sub-packages are ported from.
 - [asg017/sqlite-vec](https://github.com/asg017/sqlite-vec) — the vector
   search extension bundled by `modernc.org/sqlite/vec` and re-exported here.
 - [zalgonoise/fts](https://github.com/zalgonoise/x/tree/master/fts) — the

conn.go

@@ -33,6 +33,15 @@ type conn struct {
 	db  uintptr // *sqlite3.Xsqlite3
 	tls *libc.TLS
 
+	// inMemory records whether the underlying database lives only in memory
+	// (DSN like ":memory:", "file::memory:", or a shared-cache memory URI).
+	// For such databases the connection IS the database, so usable() must
+	// not report it unusable just because an in-flight query was interrupted
+	// — discarding the sole handle destroys the data. Ported from
+	// modernc.org/sqlite #196 (regressed there by the #198 is_interrupted
+	// check); set once at open via sqlite3_db_filename.
+	inMemory bool
+
 	// Context handling can cause conn.Close and conn.interrupt to be invoked
 	// concurrently.
 	sync.Mutex
@@ -140,6 +149,17 @@ func newConn(dsn string) (*conn, error) {
 	}
 
 	c.db = db
+	// Cache whether this is a memory-only database (sqlite3_db_filename
+	// returns "" for any non-file-backed DB) so usable() can keep an
+	// interrupted in-memory conn in the pool instead of dropping the sole
+	// handle to its data. See the inMemory field.
+	zMain, mainErr := libc.CString("main")
+	if mainErr != nil {
+		c.Close()
+		return nil, mainErr
+	}
+	c.inMemory = libc.GoString(sqlite3.Xsqlite3_db_filename(c.tls, c.db, zMain)) == ""
+	libc.Xfree(c.tls, zMain)
 	registerConn(c)
 	if err = c.extendedResultCodes(true); err != nil {
 		c.Close()
@@ -934,7 +954,17 @@ func (c *conn) IsValid() bool {
 }
 
 func (c *conn) usable() bool {
-	return c.db != 0 && sqlite3.Xsqlite3_is_interrupted(c.tls, c.db) == 0
+	if c.db == 0 {
+		return false
+	}
+	// In-memory databases live only in this connection; discarding it
+	// because the previous query was interrupted (e.g. a cancelled
+	// QueryContext) destroys the database. Keep it usable so database/sql
+	// returns it to the pool rather than dropping it. See the inMemory field.
+	if c.inMemory {
+		return true
+	}
+	return sqlite3.Xsqlite3_is_interrupted(c.tls, c.db) == 0
 }
 
 type userDefinedFunction struct {

conn_inmemory_test.go

@@ -0,0 +1,103 @@
+package sqlite
+
+import (
+	"context"
+	"database/sql"
+	"path/filepath"
+	"testing"
+
+	sqlite3 "modernc.org/sqlite/lib"
+)
+
+// TestInMemoryConnSurvivesInterrupt is a regression test for the ported
+// modernc.org/sqlite #196 fix. An in-memory database lives only in its
+// connection, so after an interrupt (e.g. a cancelled QueryContext) the
+// conn must stay usable() — otherwise database/sql discards the sole
+// handle and the whole store is lost. File-backed connections keep the
+// #198 behaviour: an interrupted one is reported unusable so the pool
+// drops it, since its data is safe on disk.
+//
+// Ported from modernc.org/sqlite's TestInMemoryDBSurvivesContextCancel.
+func TestInMemoryConnSurvivesInterrupt(t *testing.T) {
+	t.Run("in-memory stays usable after interrupt", func(t *testing.T) {
+		db, err := sql.Open(driverName, "file::memory:?cache=shared")
+		if err != nil {
+			t.Fatal(err)
+		}
+		defer db.Close()
+		db.SetMaxOpenConns(1)
+
+		if _, err := db.Exec("CREATE TABLE t (v INT)"); err != nil {
+			t.Fatal(err)
+		}
+		if _, err := db.Exec("INSERT INTO t VALUES (1), (2), (3)"); err != nil {
+			t.Fatal(err)
+		}
+
+		raw, err := db.Conn(context.Background())
+		if err != nil {
+			t.Fatal(err)
+		}
+		_ = raw.Raw(func(dc any) error {
+			c, ok := dc.(*conn)
+			if !ok {
+				t.Fatalf("driver conn is %T, want *conn", dc)
+			}
+			if !c.inMemory {
+				t.Fatalf("conn opened with file::memory: must be marked inMemory")
+			}
+			if !c.usable() {
+				t.Fatalf("fresh in-memory conn must be usable")
+			}
+			sqlite3.Xsqlite3_interrupt(c.tls, c.db)
+			if !c.usable() {
+				t.Errorf("in-memory conn must remain usable after interrupt (#196)")
+			}
+			return nil
+		})
+		raw.Close()
+
+		// The store must survive: if the conn had been discarded, the
+		// shared in-memory DB would be gone and the table with it.
+		var n int
+		if err := db.QueryRow("SELECT count(*) FROM t").Scan(&n); err != nil {
+			t.Fatalf("table lost after interrupt: %v", err)
+		}
+		if n != 3 {
+			t.Fatalf("expected 3 rows after interrupt, got %d", n)
+		}
+	})
+
+	t.Run("file-backed still discarded on interrupt", func(t *testing.T) {
+		dir := t.TempDir()
+		db, err := sql.Open(driverName, "file:"+filepath.Join(dir, "t.db"))
+		if err != nil {
+			t.Fatal(err)
+		}
+		defer db.Close()
+		db.SetMaxOpenConns(1)
+
+		raw, err := db.Conn(context.Background())
+		if err != nil {
+			t.Fatal(err)
+		}
+		defer raw.Close()
+		_ = raw.Raw(func(dc any) error {
+			c, ok := dc.(*conn)
+			if !ok {
+				t.Fatalf("driver conn is %T, want *conn", dc)
+			}
+			if c.inMemory {
+				t.Fatalf("file-backed conn unexpectedly marked inMemory")
+			}
+			if !c.usable() {
+				t.Fatalf("fresh file-backed conn must be usable")
+			}
+			sqlite3.Xsqlite3_interrupt(c.tls, c.db)
+			if c.usable() {
+				t.Errorf("file-backed conn must be reported unusable after interrupt (#198)")
+			}
+			return nil
+		})
+	})
+}

go.mod

@@ -3,23 +3,23 @@ module github.com/go-again/sqlite
 go 1.25.0
 
 require (
-	golang.org/x/crypto v0.23.0
+	github.com/google/uuid v1.6.0
+	golang.org/x/crypto v0.52.0
+	golang.org/x/text v0.37.0
 	gorm.io/gorm v1.31.1
 	lukechampine.com/adiantum v1.1.1
 	modernc.org/libc v1.72.3
-	modernc.org/sqlite v1.50.1
+	modernc.org/sqlite v1.51.0
 )
 
 require (
 	github.com/dustin/go-humanize v1.0.1 // indirect
-	github.com/google/uuid v1.6.0 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/ncruces/go-strftime v1.0.0 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
-	golang.org/x/sys v0.42.0 // indirect
-	golang.org/x/text v0.37.0 // indirect
+	golang.org/x/sys v0.45.0 // indirect
 	modernc.org/mathutil v1.7.1 // indirect
 	modernc.org/memory v1.11.0 // indirect
 )

go.sum

@@ -14,23 +14,19 @@ github.com/ncruces/go-strftime v1.0.0 h1:HMFp8mLCTPp341M/ZnA4qaf7ZlsbTc+miZjCLOF
 github.com/ncruces/go-strftime v1.0.0/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
-golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI=
-golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
-golang.org/x/mod v0.33.0 h1:tHFzIWbBifEmbwtGz65eaWyGiGZatSrT9prnU8DbVL8=
-golang.org/x/mod v0.33.0/go.mod h1:swjeQEj+6r7fODbD2cqrnje9PnziFuw4bmLbBZFrQ5w=
+golang.org/x/crypto v0.52.0 h1:RMs7fP2rXdep0CftQlK8Uf+kibLm7qkCcradZWYz988=
+golang.org/x/crypto v0.52.0/go.mod h1:1QgfPxDqh0T2M/elOJtp9RvuR95kVjir0e6/BvEmGbc=
 golang.org/x/mod v0.35.0 h1:Ww1D637e6Pg+Zb2KrWfHQUnH2dQRLBQyAtpr/haaJeM=
+golang.org/x/mod v0.35.0/go.mod h1:+GwiRhIInF8wPm+4AoT6L0FA1QWAad3OMdTRx4tFYlU=
 golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4=
 golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo=
-golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
-golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug=
-golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4=
+golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY=
+golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
 golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc=
 golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38=
-golang.org/x/tools v0.42.0 h1:uNgphsn75Tdz5Ji2q36v/nsFSfR/9BRFvqhGBaJGd5k=
-golang.org/x/tools v0.42.0/go.mod h1:Ma6lCIwGZvHK6XtgbswSoWroEkhugApmsXyrUmBhfr0=
 golang.org/x/tools v0.44.0 h1:UP4ajHPIcuMjT1GqzDWRlalUEoY+uzoZKnhOjbIPD2c=
+golang.org/x/tools v0.44.0/go.mod h1:KA0AfVErSdxRZIsOVipbv3rQhVXTnlU6UhKxHd1seDI=
 gorm.io/gorm v1.31.1 h1:7CA8FTFz/gRfgqgpeKIBcervUn3xSyPUmr6B2WXJ7kg=
 gorm.io/gorm v1.31.1/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs=
 lukechampine.com/adiantum v1.1.1 h1:4fp6gTxWCqpEbLy40ExiYDDED3oUNWx5cTqBCtPdZqA=
@@ -57,8 +53,8 @@ modernc.org/opt v0.2.0 h1:tGyef5ApycA7FSEOMraay9SaTk5zmbx7Tu+cJs4QKZg=
 modernc.org/opt v0.2.0/go.mod h1:03fq9lsNfvkYSfxrfUhZCWPk1lm4cq4N+Bh//bEtgns=
 modernc.org/sortutil v1.2.1 h1:+xyoGf15mM3NMlPDnFqrteY07klSFxLElE2PVuWIJ7w=
 modernc.org/sortutil v1.2.1/go.mod h1:7ZI3a3REbai7gzCLcotuw9AC4VZVpYMjDzETGsSMqJE=
-modernc.org/sqlite v1.50.1 h1:l+cQvn0sd0zJJtfygGHuQJ5AjlrwXmWPw4KP3ZMwr9w=
-modernc.org/sqlite v1.50.1/go.mod h1:tcNzv5p84E0skkmJn038y+hWJbLQXQqEnQfeh5r2JLM=
+modernc.org/sqlite v1.51.0 h1:aH/MMSoayAIhozZ7uJbVTT9QO/VhzBf0J9tymmmuC/U=
+modernc.org/sqlite v1.51.0/go.mod h1:tcNzv5p84E0skkmJn038y+hWJbLQXQqEnQfeh5r2JLM=
 modernc.org/strutil v1.2.1 h1:UneZBkQA+DX2Rp35KcM69cSsNES9ly8mQWD71HKlOA0=
 modernc.org/strutil v1.2.1/go.mod h1:EHkiggD70koQxjVdSBM3JKM7k6L0FbGE5eymy9i3B9A=
 modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=