diff --git a/embed/README.md b/embed/README.md index 378d8f1..c7a7ca2 100644 --- a/embed/README.md +++ b/embed/README.md @@ -5,7 +5,7 @@ This folder includes an embeddable WASM build of SQLite 3.45.1 for use with The following optional features are compiled in: - [math functions](https://sqlite.org/lang_mathfunc.html) -- [FTS3/4](https://sqlite.org/fts3.html)/[5](https://sqlite.org/fts5.html) +- [FTS5](https://sqlite.org/fts5.html) - [JSON](https://sqlite.org/json1.html) - [R*Tree](https://sqlite.org/rtree.html) - [GeoPoly](https://sqlite.org/geopoly.html) diff --git a/embed/sqlite3.wasm b/embed/sqlite3.wasm index f62206b..b37f111 100755 Binary files a/embed/sqlite3.wasm and b/embed/sqlite3.wasm differ diff --git a/sqlite3/download.sh b/sqlite3/download.sh index c0d0a88..221d072 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/2024/sqlite-amalgamation-3450100.zip" +curl -#OL "https://sqlite.org/2024/sqlite-amalgamation-3450200.zip" unzip -d . sqlite-amalgamation-*.zip mv sqlite-amalgamation-*/sqlite3* . rm -rf sqlite-amalgamation-* @@ -12,25 +12,25 @@ cat *.patch | patch --no-backup-if-mismatch mkdir -p ext/ cd ext/ -curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.45.1/ext/misc/anycollseq.c" -curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.45.1/ext/misc/base64.c" -curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.45.1/ext/misc/decimal.c" -curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.45.1/ext/misc/ieee754.c" -curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.45.1/ext/misc/regexp.c" -curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.45.1/ext/misc/series.c" -curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.45.1/ext/misc/uint.c" -curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.45.1/ext/misc/uuid.c" +curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.45.2/ext/misc/anycollseq.c" +curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.45.2/ext/misc/base64.c" +curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.45.2/ext/misc/decimal.c" +curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.45.2/ext/misc/ieee754.c" +curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.45.2/ext/misc/regexp.c" +curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.45.2/ext/misc/series.c" +curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.45.2/ext/misc/uint.c" +curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.45.2/ext/misc/uuid.c" cd ~- cd ../vfs/tests/mptest/testdata/ -curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.45.1/mptest/mptest.c" -curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.45.1/mptest/config01.test" -curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.45.1/mptest/config02.test" -curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.45.1/mptest/crash01.test" -curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.45.1/mptest/crash02.subtest" -curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.45.1/mptest/multiwrite01.test" +curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.45.2/mptest/mptest.c" +curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.45.2/mptest/config01.test" +curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.45.2/mptest/config02.test" +curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.45.2/mptest/crash01.test" +curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.45.2/mptest/crash02.subtest" +curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.45.2/mptest/multiwrite01.test" cd ~- cd ../vfs/tests/speedtest1/testdata/ -curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.45.1/test/speedtest1.c" +curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.45.2/test/speedtest1.c" cd ~- \ No newline at end of file diff --git a/sqlite3/sqlite_cfg.h b/sqlite3/sqlite_cfg.h index 28c02aa..2966275 100644 --- a/sqlite3/sqlite_cfg.h +++ b/sqlite3/sqlite_cfg.h @@ -37,6 +37,7 @@ #define SQLITE_DEFAULT_WAL_SYNCHRONOUS 1 #define SQLITE_LIKE_DOESNT_MATCH_BLOBS #define SQLITE_MAX_EXPR_DEPTH 0 +#define SQLITE_STRICT_SUBTYPE 1 #define SQLITE_USE_ALLOCA #define SQLITE_OMIT_DEPRECATED #define SQLITE_OMIT_SHARED_CACHE @@ -68,18 +69,12 @@ #define SQLITE_ENABLE_MATH_FUNCTIONS 1 #define SQLITE_ENABLE_JSON1 1 -#define SQLITE_ENABLE_FTS3 1 -#define SQLITE_ENABLE_FTS3_PARENTHESIS 1 -#define SQLITE_ENABLE_FTS4 1 #define SQLITE_ENABLE_FTS5 1 #define SQLITE_ENABLE_RTREE 1 #define SQLITE_ENABLE_GEOPOLY 1 #define SQLITE_SOUNDEX - -// Session Extension -// #define SQLITE_ENABLE_SESSION -// #define SQLITE_ENABLE_PREUPDATE_HOOK +#define SQLITE_UNTESTABLE // Implemented in vfs.c. int localtime_s(struct tm *const pTm, time_t const *const pTime); \ No newline at end of file diff --git a/vfs/tests/mptest/testdata/mptest.wasm.bz2 b/vfs/tests/mptest/testdata/mptest.wasm.bz2 index c253ab1..c233e58 100644 --- a/vfs/tests/mptest/testdata/mptest.wasm.bz2 +++ b/vfs/tests/mptest/testdata/mptest.wasm.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fdc3e454e5bf2aeace56e7cb82eb11a7664b86bd71ba993b79a746223651475b -size 520200 +oid sha256:b5f4778b49a6b99a1be11db5cb07e3c5b52f91a932a97e33c895f52c6f54bf57 +size 469149 diff --git a/vfs/tests/speedtest1/testdata/speedtest1.wasm.bz2 b/vfs/tests/speedtest1/testdata/speedtest1.wasm.bz2 index 240f264..154992b 100644 --- a/vfs/tests/speedtest1/testdata/speedtest1.wasm.bz2 +++ b/vfs/tests/speedtest1/testdata/speedtest1.wasm.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8cda3bf051ea1a20a1f82365781283256e12919f0287ea27b86613bb6296e643 -size 534838 +oid sha256:06882576fdea2c8e164dd2d97dce394dc825dca3cee30c9efc9601b84de92865 +size 483191