diff --git a/embed/README.md b/embed/README.md index a40f65e..725313d 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.42.0 for use with +This folder includes an embeddable WASM build of SQLite 3.43.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/sqlite3.wasm b/embed/sqlite3.wasm index 020d130..2e33917 100755 Binary files a/embed/sqlite3.wasm and b/embed/sqlite3.wasm differ diff --git a/sqlite3/download.sh b/sqlite3/download.sh index 01435c7..ce9a374 100755 --- a/sqlite3/download.sh +++ b/sqlite3/download.sh @@ -3,33 +3,33 @@ set -euo pipefail cd -P -- "$(dirname -- "$0")" -curl -#OL "https://sqlite.org/2023/sqlite-amalgamation-3420000.zip" +curl -#OL "https://sqlite.org/2023/sqlite-amalgamation-3430000.zip" unzip -d . sqlite-amalgamation-*.zip mv sqlite-amalgamation-*/sqlite3* . rm -rf sqlite-amalgamation-* -cat *.patch | patch +cat *.patch | patch --posix mkdir -p ext/ cd ext/ -curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.42.0/ext/misc/decimal.c" -curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.42.0/ext/misc/uint.c" -curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.42.0/ext/misc/uuid.c" -curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.42.0/ext/misc/base64.c" -curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.42.0/ext/misc/regexp.c" -curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.42.0/ext/misc/series.c" -curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.42.0/ext/misc/anycollseq.c" +curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.43.0/ext/misc/decimal.c" +curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.43.0/ext/misc/uint.c" +curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.43.0/ext/misc/uuid.c" +curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.43.0/ext/misc/base64.c" +curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.43.0/ext/misc/regexp.c" +curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.43.0/ext/misc/series.c" +curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.43.0/ext/misc/anycollseq.c" cd ~- cd ../vfs/tests/mptest/testdata/ -curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.42.0/mptest/mptest.c" -curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.42.0/mptest/config01.test" -curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.42.0/mptest/config02.test" -curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.42.0/mptest/crash01.test" -curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.42.0/mptest/crash02.subtest" -curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.42.0/mptest/multiwrite01.test" +curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.43.0/mptest/mptest.c" +curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.43.0/mptest/config01.test" +curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.43.0/mptest/config02.test" +curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.43.0/mptest/crash01.test" +curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.43.0/mptest/crash02.subtest" +curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.43.0/mptest/multiwrite01.test" cd ~- cd ../vfs/tests/speedtest1/testdata/ -curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.42.0/test/speedtest1.c" +curl -#OL "https://github.com/sqlite/sqlite/raw/version-3.43.0/test/speedtest1.c" cd ~- \ No newline at end of file diff --git a/sqlite3/open_memory.patch b/sqlite3/open_memory.patch deleted file mode 100644 index 892ebe4..0000000 --- a/sqlite3/open_memory.patch +++ /dev/null @@ -1,26 +0,0 @@ -# Allow the VFS to force memory journal mode -# regardless of SQLITE_OMIT_DESERIALIZE. ---- sqlite3.c.orig -+++ sqlite3.c -@@ -60425,11 +60425,7 @@ - int rc = SQLITE_OK; /* Return code */ - int tempFile = 0; /* True for temp files (incl. in-memory files) */ - int memDb = 0; /* True if this is an in-memory file */ --#ifndef SQLITE_OMIT_DESERIALIZE - int memJM = 0; /* Memory journal mode */ --#else --# define memJM 0 --#endif - int readOnly = 0; /* True if this is a read-only file */ - int journalFileSize; /* Bytes to allocate for each journal fd */ - char *zPathname = 0; /* Full path to database file */ -@@ -60628,9 +60624,7 @@ - int fout = 0; /* VFS flags returned by xOpen() */ - rc = sqlite3OsOpen(pVfs, pPager->zFilename, pPager->fd, vfsFlags, &fout); - assert( !memDb ); --#ifndef SQLITE_OMIT_DESERIALIZE - pPager->memVfs = memJM = (fout&SQLITE_OPEN_MEMORY)!=0; --#endif - readOnly = (fout&SQLITE_OPEN_READONLY)!=0; - - /* If the file was successfully opened for read/write access,