diff --git a/embed/README.md b/embed/README.md index 346a4e3..67af297 100644 --- a/embed/README.md +++ b/embed/README.md @@ -1,6 +1,6 @@ # Embeddable Wasm build of SQLite -This folder includes an embeddable Wasm build of SQLite 3.50.3 for use with +This folder includes an embeddable Wasm build of SQLite 3.50.4 for use with [`github.com/ncruces/go-sqlite3`](https://pkg.go.dev/github.com/ncruces/go-sqlite3). The following optional features are compiled in: diff --git a/embed/bcw2/bcw2.wasm b/embed/bcw2/bcw2.wasm index 40b26d8..6ab07ca 100755 Binary files a/embed/bcw2/bcw2.wasm and b/embed/bcw2/bcw2.wasm differ diff --git a/embed/init_test.go b/embed/init_test.go index b15765b..30b63f8 100644 --- a/embed/init_test.go +++ b/embed/init_test.go @@ -19,7 +19,7 @@ func Test_init(t *testing.T) { if err != nil { t.Fatal(err) } - if version != "3.50.3" { + if version != "3.50.4" { t.Error(version) } } diff --git a/embed/sqlite3.wasm b/embed/sqlite3.wasm index dac29da..f8c8f5f 100755 Binary files a/embed/sqlite3.wasm and b/embed/sqlite3.wasm differ diff --git a/sqlite3/busy_timeout.patch b/sqlite3/busy_timeout.patch index 866a499..7707b8d 100644 --- a/sqlite3/busy_timeout.patch +++ b/sqlite3/busy_timeout.patch @@ -2,7 +2,7 @@ # handle, and interrupt, sqlite3_busy_timeout. --- sqlite3.c.orig +++ sqlite3.c -@@ -184447,7 +184447,7 @@ +@@ -184474,7 +184474,7 @@ if( !sqlite3SafetyCheckOk(db) ) return SQLITE_MISUSE_BKPT; #endif if( ms>0 ){ diff --git a/sqlite3/download.sh b/sqlite3/download.sh index dc30843..b510b1f 100755 --- a/sqlite3/download.sh +++ b/sqlite3/download.sh @@ -3,7 +3,7 @@ set -euo pipefail cd -P -- "$(dirname -- "$0")" -curl -#OL "https://sqlite.org/2025/sqlite-amalgamation-3500300.zip" +curl -#OL "https://sqlite.org/2025/sqlite-amalgamation-3500400.zip" unzip -d . sqlite-amalgamation-*.zip mv sqlite-amalgamation-*/sqlite3.c . mv sqlite-amalgamation-*/sqlite3.h . @@ -19,30 +19,30 @@ rm -rf sqlite-amalgamation-* mkdir -p ext/ cd ext/ -curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.50.3/ext/misc/anycollseq.c" -curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.50.3/ext/misc/base64.c" -curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.50.3/ext/misc/decimal.c" -curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.50.3/ext/misc/ieee754.c" -curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.50.3/ext/misc/regexp.c" -curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.50.3/ext/misc/series.c" -curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.50.3/ext/misc/spellfix.c" -curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.50.3/ext/misc/uint.c" +curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.50.4/ext/misc/anycollseq.c" +curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.50.4/ext/misc/base64.c" +curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.50.4/ext/misc/decimal.c" +curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.50.4/ext/misc/ieee754.c" +curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.50.4/ext/misc/regexp.c" +curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.50.4/ext/misc/series.c" +curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.50.4/ext/misc/spellfix.c" +curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.50.4/ext/misc/uint.c" cd ~- cd ../vfs/tests/mptest/testdata/ -curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.50.3/mptest/config01.test" -curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.50.3/mptest/config02.test" -curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.50.3/mptest/crash01.test" -curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.50.3/mptest/crash02.subtest" -curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.50.3/mptest/multiwrite01.test" +curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.50.4/mptest/config01.test" +curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.50.4/mptest/config02.test" +curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.50.4/mptest/crash01.test" +curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.50.4/mptest/crash02.subtest" +curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.50.4/mptest/multiwrite01.test" cd ~- cd ../vfs/tests/mptest/wasm/ -curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.50.3/mptest/mptest.c" +curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.50.4/mptest/mptest.c" cd ~- cd ../vfs/tests/speedtest1/wasm/ -curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.50.3/test/speedtest1.c" +curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.50.4/test/speedtest1.c" cd ~- cat *.patch | patch -p0 --no-backup-if-mismatch \ No newline at end of file diff --git a/sqlite3/vfs_find.patch b/sqlite3/vfs_find.patch index ff4a4b6..ef01eea 100644 --- a/sqlite3/vfs_find.patch +++ b/sqlite3/vfs_find.patch @@ -1,7 +1,7 @@ # Remove VFS registration. Go handles it. --- sqlite3.c.orig +++ sqlite3.c -@@ -26882,7 +26882,7 @@ +@@ -26884,7 +26884,7 @@ sqlite3_free(p); return sqlite3_os_init(); } @@ -10,7 +10,7 @@ /* ** The list of all registered VFS implementations. */ -@@ -26979,7 +26979,7 @@ +@@ -26981,7 +26981,7 @@ sqlite3_mutex_leave(mutex); return SQLITE_OK; } diff --git a/util/sql3util/wasm/sql3parse_table.wasm b/util/sql3util/wasm/sql3parse_table.wasm index f7dc0cd..996541e 100755 Binary files a/util/sql3util/wasm/sql3parse_table.wasm and b/util/sql3util/wasm/sql3parse_table.wasm differ diff --git a/vfs/tests/mptest/wasm/mptest.wasm b/vfs/tests/mptest/wasm/mptest.wasm index 0c47c83..e032dd1 100644 Binary files a/vfs/tests/mptest/wasm/mptest.wasm and b/vfs/tests/mptest/wasm/mptest.wasm differ diff --git a/vfs/tests/speedtest1/wasm/speedtest1.wasm b/vfs/tests/speedtest1/wasm/speedtest1.wasm index e520e5c..55d61b0 100644 Binary files a/vfs/tests/speedtest1/wasm/speedtest1.wasm and b/vfs/tests/speedtest1/wasm/speedtest1.wasm differ