diff --git a/embed/README.md b/embed/README.md index ca5108c..59329a9 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.48.0 for use with +This folder includes an embeddable Wasm build of SQLite 3.49.0 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 217caf1..20cb5f8 100755 Binary files a/embed/bcw2/bcw2.wasm and b/embed/bcw2/bcw2.wasm differ diff --git a/embed/bcw2/bcw2_test.go b/embed/bcw2/bcw2_test.go index 0bc8cfb..7a494f6 100644 --- a/embed/bcw2/bcw2_test.go +++ b/embed/bcw2/bcw2_test.go @@ -53,7 +53,7 @@ func Test_bcw2(t *testing.T) { if err != nil { t.Fatal(err) } - if version != "3.48.0" { + if version != "3.49.0" { t.Error(version) } } diff --git a/embed/bcw2/build.sh b/embed/bcw2/build.sh index 947d894..49bf433 100755 --- a/embed/bcw2/build.sh +++ b/embed/bcw2/build.sh @@ -13,8 +13,8 @@ mkdir -p build/ext/ cp "$ROOT"/sqlite3/*.[ch] build/ cp "$ROOT"/sqlite3/*.patch build/ -# https://sqlite.org/src/info/fab341c829554573 -curl -# https://sqlite.org/src/tarball/sqlite.tar.gz?r=fab341c8 | tar xz +# https://sqlite.org/src/info/cc3ce784b0feea2f +curl -# https://sqlite.org/src/tarball/sqlite.tar.gz?r=cc3ce784 | tar xz cd sqlite if [[ "$OSTYPE" == "msys" || "$OSTYPE" == "cygwin" ]]; then diff --git a/embed/init_test.go b/embed/init_test.go index 3a9e9b2..3bc424d 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.48.0" { + if version != "3.49.0" { t.Error(version) } } diff --git a/embed/sqlite3.wasm b/embed/sqlite3.wasm index 1d27455..e61dc93 100755 Binary files a/embed/sqlite3.wasm and b/embed/sqlite3.wasm differ diff --git a/sqlite3/base64.patch b/sqlite3/base64.patch deleted file mode 100644 index 78adeb3..0000000 --- a/sqlite3/base64.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ext/base64.c.orig -+++ ext/base64.c -@@ -198,7 +198,7 @@ - deliberate_fall_through; /* FALLTHRU */ - case 1: - pOut[0] = (qv>>16) & 0xff; -- deliberate_fall_through; /* FALLTHRU */ -+ break; /* FALLTHRU */ - } - pOut += nbo; - } diff --git a/sqlite3/download.sh b/sqlite3/download.sh index 2f18238..bf5c05f 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-3480000.zip" +curl -#OL "https://sqlite.org/2025/sqlite-amalgamation-3490000.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.48.0/ext/misc/anycollseq.c" -curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.48.0/ext/misc/base64.c" -curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.48.0/ext/misc/decimal.c" -curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.48.0/ext/misc/ieee754.c" -curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.48.0/ext/misc/regexp.c" -curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.48.0/ext/misc/series.c" -curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.48.0/ext/misc/spellfix.c" -curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.48.0/ext/misc/uint.c" +curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.49.0/ext/misc/anycollseq.c" +curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.49.0/ext/misc/base64.c" +curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.49.0/ext/misc/decimal.c" +curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.49.0/ext/misc/ieee754.c" +curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.49.0/ext/misc/regexp.c" +curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.49.0/ext/misc/series.c" +curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.49.0/ext/misc/spellfix.c" +curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.49.0/ext/misc/uint.c" cd ~- cd ../vfs/tests/mptest/testdata/ -curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.48.0/mptest/config01.test" -curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.48.0/mptest/config02.test" -curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.48.0/mptest/crash01.test" -curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.48.0/mptest/crash02.subtest" -curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.48.0/mptest/multiwrite01.test" +curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.49.0/mptest/config01.test" +curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.49.0/mptest/config02.test" +curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.49.0/mptest/crash01.test" +curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.49.0/mptest/crash02.subtest" +curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.49.0/mptest/multiwrite01.test" cd ~- cd ../vfs/tests/mptest/wasm/ -curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.48.0/mptest/mptest.c" +curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.49.0/mptest/mptest.c" cd ~- cd ../vfs/tests/speedtest1/wasm/ -curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.48.0/test/speedtest1.c" +curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.49.0/test/speedtest1.c" cd ~- cat *.patch | patch -p0 --no-backup-if-mismatch \ No newline at end of file diff --git a/vfs/tests/mptest/wasm/mptest.wasm b/vfs/tests/mptest/wasm/mptest.wasm index b373965..47da33d 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 3245a60..cd08a3f 100644 Binary files a/vfs/tests/speedtest1/wasm/speedtest1.wasm and b/vfs/tests/speedtest1/wasm/speedtest1.wasm differ