From d74442ad9b3ed72a401533a65fed6f5a4d0989aa Mon Sep 17 00:00:00 2001 From: Claude Date: Tue, 21 Apr 2026 15:42:05 +0000 Subject: [PATCH] Downgrade github.com/ncruces/go-sqlite3 to v0.32.0 v0.33 of ncruces/go-sqlite3 replaced its embedded wasm runtime with a pure-Go translation provided by the new github.com/ncruces/go-sqlite3-wasm module. That module exposes an Xenv interface that v0.33.3's wrap.go fails to satisfy (missing Xstrtol), so any downstream build pulling these versions together fails to compile. Pin back to v0.32.0, which ships its wasm runtime via the github.com/ncruces/go-sqlite3/embed subpackage, and restore the blank imports that wire the embedded binary into sqlite3.Binary at init time. Fixes #4399 --- go.mod | 3 +-- go.sum | 6 ++---- internal/cmd/vet_sqlite.go | 1 + internal/engine/sqlite/analyzer/analyze.go | 1 + internal/sqltest/sqlite.go | 1 + internal/x/expander/expander_test.go | 1 + 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 6b496e9ca0..9c6d3e9981 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( github.com/jackc/pgx/v5 v5.9.2 github.com/jinzhu/inflection v1.0.0 github.com/lib/pq v1.12.3 - github.com/ncruces/go-sqlite3 v0.33.3 + github.com/ncruces/go-sqlite3 v0.32.0 github.com/pganalyze/pg_query_go/v6 v6.2.2 github.com/pingcap/tidb/pkg/parser v0.0.0-20260418072757-ce92298d1124 github.com/riza-io/grpc-go v0.2.0 @@ -39,7 +39,6 @@ require ( github.com/jackc/pgpassfile v1.0.0 // indirect github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect github.com/jackc/puddle/v2 v2.2.2 // indirect - github.com/ncruces/go-sqlite3-wasm v1.1.1-0.20260409221933-87e4b35a38d0 // indirect github.com/ncruces/julianday v1.0.0 // indirect github.com/pingcap/errors v0.11.5-0.20250523034308-74f78ae071ee // indirect github.com/pingcap/failpoint v0.0.0-20240528011301-b51a646c7c86 // indirect diff --git a/go.sum b/go.sum index 89cd769738..8ef7d2b66c 100644 --- a/go.sum +++ b/go.sum @@ -51,10 +51,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/lib/pq v1.12.3 h1:tTWxr2YLKwIvK90ZXEw8GP7UFHtcbTtty8zsI+YjrfQ= github.com/lib/pq v1.12.3/go.mod h1:/p+8NSbOcwzAEI7wiMXFlgydTwcgTr3OSKMsD2BitpA= -github.com/ncruces/go-sqlite3 v0.33.3 h1:6jCR3KuGvJSEwhaQrkHDGeIe2qCQ6nOUDNsPz7ZIotw= -github.com/ncruces/go-sqlite3 v0.33.3/go.mod h1:t2Osfw0wcKzJTgv2EvrkTtVLqlbKTA5Yvwb2ypAlBcY= -github.com/ncruces/go-sqlite3-wasm v1.1.1-0.20260409221933-87e4b35a38d0 h1:ymE9H30x1AyW5VfMNkJC9teuI2W1jjMsQS7kc6zl6Tg= -github.com/ncruces/go-sqlite3-wasm v1.1.1-0.20260409221933-87e4b35a38d0/go.mod h1:/H3+JykPsfSlvKbOxNSx9kKwm3ecqQGzyCs1e9KkNsU= +github.com/ncruces/go-sqlite3 v0.32.0 h1:hNBUXp88LrfQCsuyXLqWTbTUG35sUuktDsqhhgHvU20= +github.com/ncruces/go-sqlite3 v0.32.0/go.mod h1:MIWTK60ONDl0oVY073zYvJP21C3Dly6P9bxVpgkLwdQ= github.com/ncruces/julianday v1.0.0 h1:fH0OKwa7NWvniGQtxdJRxAgkBMolni2BjDHaWTxqt7M= github.com/ncruces/julianday v1.0.0/go.mod h1:Dusn2KvZrrovOMJuOt0TNXL6tB7U2E8kvza5fFc9G7g= github.com/pganalyze/pg_query_go/v6 v6.2.2 h1:O0L6zMC226R82RF3X5n0Ki6HjytDsoAzuzp4ATVAHNo= diff --git a/internal/cmd/vet_sqlite.go b/internal/cmd/vet_sqlite.go index 7b3e39afe5..e1f8c7f9a8 100644 --- a/internal/cmd/vet_sqlite.go +++ b/internal/cmd/vet_sqlite.go @@ -2,4 +2,5 @@ package cmd import ( _ "github.com/ncruces/go-sqlite3/driver" + _ "github.com/ncruces/go-sqlite3/embed" ) diff --git a/internal/engine/sqlite/analyzer/analyze.go b/internal/engine/sqlite/analyzer/analyze.go index 3909afdaf5..3af9f99a30 100644 --- a/internal/engine/sqlite/analyzer/analyze.go +++ b/internal/engine/sqlite/analyzer/analyze.go @@ -7,6 +7,7 @@ import ( "sync" "github.com/ncruces/go-sqlite3" + _ "github.com/ncruces/go-sqlite3/embed" core "github.com/sqlc-dev/sqlc/internal/analysis" "github.com/sqlc-dev/sqlc/internal/config" diff --git a/internal/sqltest/sqlite.go b/internal/sqltest/sqlite.go index a3e5db2611..3ad04bb78d 100644 --- a/internal/sqltest/sqlite.go +++ b/internal/sqltest/sqlite.go @@ -7,6 +7,7 @@ import ( "testing" _ "github.com/ncruces/go-sqlite3/driver" + _ "github.com/ncruces/go-sqlite3/embed" "github.com/sqlc-dev/sqlc/internal/sql/sqlpath" ) diff --git a/internal/x/expander/expander_test.go b/internal/x/expander/expander_test.go index 98cf22981b..52d62c6b5e 100644 --- a/internal/x/expander/expander_test.go +++ b/internal/x/expander/expander_test.go @@ -11,6 +11,7 @@ import ( "github.com/go-sql-driver/mysql" "github.com/jackc/pgx/v5/pgxpool" "github.com/ncruces/go-sqlite3" + _ "github.com/ncruces/go-sqlite3/embed" "github.com/sqlc-dev/sqlc/internal/engine/dolphin" "github.com/sqlc-dev/sqlc/internal/engine/postgresql"