From: stephan Date: Wed, 24 Jun 2026 09:32:55 +0000 (+0000) Subject: Add vtab to the list of supported omit-api=X options and teach tester1 to gracefully... X-Git-Url: http://git.ipfire.org/index.cgi?a=commitdiff_plain;h=24ccbf7068476092e1c1a320e248db9f2123fedc;p=thirdparty%2Fsqlite.git Add vtab to the list of supported omit-api=X options and teach tester1 to gracefully handle that. FossilOrigin-Name: e4a350e6846f35c4b7b1501d702f4d8337cbf285df8c37416e8db5a7dba5b6f0 --- diff --git a/ext/wasm/GNUmakefile b/ext/wasm/GNUmakefile index b86a4e8cbe..cc88a5e4e8 100644 --- a/ext/wasm/GNUmakefile +++ b/ext/wasm/GNUmakefile @@ -591,10 +591,13 @@ DISTCLEAN_FILES += $(bin.c-pp) ifeq (0,$(MAKING_CLEAN)) # omit-api="feature names..." disables various featuresw by name. - # Recognized names are: kvvfs oo1 opfs opfs-sahpool opfs-wl. The name - # OPFS is shorthand for all of the OPFS VFSes. For-nodejs builds - # filter out OPFS from within the OPFS-using files so OPFS is implied - # for those builds. + # Recognized names are: + # + # kvvfs oo1 opfs opfs-sahpool opfs-wl vtab + # + # The name OPFS is shorthand for all of the OPFS VFSes. For-nodejs + # builds filter out OPFS from within the OPFS-using files so OPFS is + # implied for those builds. D.omit = ifneq (,$(omit-api)) # Translate omit-api="X Y" into -Domit-X... diff --git a/ext/wasm/tester1.c-pp.js b/ext/wasm/tester1.c-pp.js index fff6b34e00..1959778e10 100644 --- a/ext/wasm/tester1.c-pp.js +++ b/ext/wasm/tester1.c-pp.js @@ -2568,7 +2568,7 @@ globalThis.sqlite3InitModule = sqlite3InitModule; //////////////////////////////////////////////////////////////////////// .t({ name: 'virtual table #1: eponymous w/ manual exception handling', - predicate: (sqlite3)=>(!!sqlite3.capi.sqlite3_vtab || "Missing vtab support"), + predicate: (sqlite3)=>(!!sqlite3.vtab || "Missing vtab support"), test: function(sqlite3){ const VT = sqlite3.vtab; const tmplCols = Object.assign(Object.create(null),{ @@ -2777,7 +2777,7 @@ globalThis.sqlite3InitModule = sqlite3InitModule; //////////////////////////////////////////////////////////////////////// .t({ name: 'virtual table #2: non-eponymous w/ automated exception wrapping', - predicate: (sqlite3)=>!!sqlite3.capi.sqlite3_vtab || "Missing vtab support", + predicate: (sqlite3)=>!!sqlite3.vtab || "Missing vtab support", test: function(sqlite3){ const VT = sqlite3.vtab; const tmplCols = Object.assign(Object.create(null),{ diff --git a/manifest b/manifest index 19d535958d..f329f80c9a 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Have\sthe\snpm\starget\sforward\sthe\somit-api\sflag\sto\sits\ssub-make.\sDoc\stypo\sfixes. -D 2026-06-24T09:19:01.412 +C Add\svtab\sto\sthe\slist\sof\ssupported\somit-api=X\soptions\sand\steach\stester1\sto\sgracefully\shandle\sthat. +D 2026-06-24T09:32:55.569 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -577,7 +577,7 @@ F ext/session/sessionwor.test 6fd9a2256442cebde5b2284936ae9e0d54bde692d0f5fd009e F ext/session/sqlite3session.c ce9f2ce2cc6b17f46854788e47016ba9be1b59ca4037728b6c025397b98edb12 F ext/session/sqlite3session.h ca7c4422c1514a95056cc8d333217df6b1829d39058126b1de85d10cd62d7a9c F ext/session/test_session.c d3275da24b8d362e3c2b393c00d5248f75f1cd474dadf29d8c4683f75cb52e6d -F ext/wasm/GNUmakefile 7c84775186ed233b22bb425460f1edab2348ac763ade91ea7dedcea28d4b1269 +F ext/wasm/GNUmakefile b99469147698d6255a925bee0249945ce17c6bf19aa88913671c7425fe781e5c F ext/wasm/README-dist.txt f01081a850ce38a56706af6b481e3a7878e24e42b314cfcd4b129f0f8427066a F ext/wasm/README.md 2e87804e12c98f1d194b7a06162a88441d33bb443efcfe00dc6565a780d2f259 F ext/wasm/SQLTester/GNUmakefile e0794f676d55819951bbfae45cc5e8d7818dc460492dc317ce7f0d2eca15caff @@ -649,7 +649,7 @@ F ext/wasm/test-opfs-vfs.html 1f2d672f3f3fce810dfd48a8d56914aba22e45c6834e262555 F ext/wasm/test-opfs-vfs.js 1618670e466f424aa289859fe0ec8ded223e42e9e69b5c851f809baaaca1a00c F ext/wasm/tester1-worker.c-pp.html 7171022e7f4da8f46e5f50ea81dd6ce840b9235c47653a5deeb3764ccc2fe472 F ext/wasm/tester1.c-pp.html bd927ccf51ddd65e924660a0487add99e1b044afe03950e49d87ccf44efdddb6 -F ext/wasm/tester1.c-pp.js 996e0b0cd2d8fa1c69898b9ac4c3621cc8413154e3bf8f2c4804bc099c9a5abd +F ext/wasm/tester1.c-pp.js e9bf289ad5360f73e4e58c1c262c62afd04eb3144a2b0e88dacf7528369702e2 F ext/wasm/tests/opfs/concurrency/index.html 706eab6308343c04ac2360aba6001af4ffaf46d8f33a0ccd02c64d93e3216a43 F ext/wasm/tests/opfs/concurrency/test.js 6919778fceaac1b7cc78caf41d796f545d2c4433b31188aa9689f05b5ad28828 F ext/wasm/tests/opfs/concurrency/worker.js 704d82c5e287e47f612349e027765943a58ad967dcf178fb5a1c3a8eaafb09af @@ -2208,8 +2208,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c -P 2603c855795fc9466522b1e10433efd5e30975e68ee891680f27f06f3189390b -R f4816b03d7d2cbe2a630c4fadfd135a8 +P c65153b28f8a7fcf5eec96032b4f030e6f698ed7d5c1ab479462b4e36ab89c55 +R ab66a66f5837b6e280dbf5e19213306c U stephan -Z 4b095048ba2e3bcbbe3f43f2dadfa0f6 +Z 03cb1fbd950d22192ccad5a52980f4f4 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 79dd647b6b..e2e0a3a958 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -c65153b28f8a7fcf5eec96032b4f030e6f698ed7d5c1ab479462b4e36ab89c55 +e4a350e6846f35c4b7b1501d702f4d8337cbf285df8c37416e8db5a7dba5b6f0