From: stephan <stephan@noemail.net>
Date: Sun, 25 Dec 2022 17:12:24 +0000 (+0000)
Subject: Add tests confirming that JS sqlite3_exec()'s SQL argument participates in the 'strin... 
X-Git-Tag: version-3.41.0~184
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7a5544b958e04f8cf99e27353aa3982b28728a5e;p=thirdparty%2Fsqlite.git

Add tests confirming that JS sqlite3_exec()'s SQL argument participates in the 'string:flexible' type conversion.

FossilOrigin-Name: 926d0c61a391c601adc2804d3fdaa8b667ae2abd565939cddfa12d5151b098f8
---

diff --git a/ext/wasm/tester1.c-pp.js b/ext/wasm/tester1.c-pp.js
index a9b29729b8..c7fa893954 100644
--- a/ext/wasm/tester1.c-pp.js
+++ b/ext/wasm/tester1.c-pp.js
@@ -1923,7 +1923,10 @@ self.sqlite3InitModule = sqlite3InitModule;
       });
       try {
         T.assert(wasm.isPtr(pCb));
-        rc = capi.sqlite3_exec(db, "select a, a*2 from foo.bar", pCb, 0, 0);
+        rc = capi.sqlite3_exec(
+          db, new TextEncoder('utf-8').encode("select a, a*2 from foo.bar"),
+          pCb, 0, 0
+        );
         T.assert(0===rc)
           .assert(3===rowCount)
           .assert(2===colCount);
@@ -1933,7 +1936,7 @@ self.sqlite3InitModule = sqlite3InitModule;
 
       // Demonstrate that an OOM result does not propagate through sqlite3_exec()...
       rc = capi.sqlite3_exec(
-        db, "select a, a*2 from foo.bar", function(aVals, aNames){
+        db, ["select a,"," a*2 from foo.bar"], (aVals, aNames)=>{
           sqlite3.WasmAllocError.toss("just testing");
         }, 0, 0
       );
diff --git a/manifest b/manifest
index 2ccb290a22..827df733d6 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Replace\sthe\s"manual"\simplementation\sof\ssqlite3.capi.sqlite3_exec()\swith\sa\sbriefer\s"automated"\sone\svia\sthe\s[7f9ace1b11a67]\sfeature\saddition.\sMinor\scode-adjacent\sinternal\scleanups.
-D 2022-12-25T17:09:34.880
+C Add\stests\sconfirming\sthat\sJS\ssqlite3_exec()'s\sSQL\sargument\sparticipates\sin\sthe\s'string:flexible'\stype\sconversion.
+D 2022-12-25T17:12:24.209
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -555,7 +555,7 @@ F ext/wasm/test-opfs-vfs.html 1f2d672f3f3fce810dfd48a8d56914aba22e45c6834e262555
 F ext/wasm/test-opfs-vfs.js f09266873e1a34d9bdb6d3981ec8c9e382f31f215c9fd2f9016d2394b8ae9b7b
 F ext/wasm/tester1-worker.html d43f3c131d88f10d00aff3e328fed13c858d674ea2ff1ff90225506137f85aa9
 F ext/wasm/tester1.c-pp.html d34bef3d48e5cbc1c7c06882ad240fec49bf88f5f65696cc2c72c416933aa406
-F ext/wasm/tester1.c-pp.js 47190277040a6163716c02d11930dc4f028d44a6fcdacb10303010f239ce0a6c
+F ext/wasm/tester1.c-pp.js 1396611f11d75fc124ffb7600dc05d3ad7cc25885c4a8f842b9291ea9e0b8abd
 F ext/wasm/tests/opfs/concurrency/index.html 86d8ac435074d1e7007b91105f4897f368c165e8cecb6a9aa3d81f5cf5dcbe70
 F ext/wasm/tests/opfs/concurrency/test.js a98016113eaf71e81ddbf71655aa29b0fed9a8b79a3cdd3620d1658eb1cc9a5d
 F ext/wasm/tests/opfs/concurrency/worker.js 0a8c1a3e6ebb38aabbee24f122693f1fb29d599948915c76906681bb7da1d3d2
@@ -2067,8 +2067,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 8e3d4f6294037396e388ec21abb18bf0201a6bec6ff004730cc5d11b705a6d2b
-R 2df92a51136615b2a37539ac7dcbebf7
+P 4888957baf18c6763f959fbba998a74156ff656368779107f502b926e9e9d949
+R cfaf4d7e6ebced21987511a642eb3cd6
 U stephan
-Z 9719f2c37cbd201ac24a565e7ff0d05e
+Z c6e0af2cef9d9cd33fe188241216b8ea
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 4a9e2d7bae..47997d8d14 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4888957baf18c6763f959fbba998a74156ff656368779107f502b926e9e9d949
\ No newline at end of file
+926d0c61a391c601adc2804d3fdaa8b667ae2abd565939cddfa12d5151b098f8
\ No newline at end of file