From: stephan <stephan@noemail.net>
Date: Sun, 22 May 2022 22:10:38 +0000 (+0000)
Subject: WASM: an arg handling fix for DB.exec({multi:true...}).
X-Git-Tag: version-3.39.0~117
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c21c0e2af9de95078a2358a3e090e0384e791966;p=thirdparty%2Fsqlite.git

WASM: an arg handling fix for DB.exec({multi:true...}).

FossilOrigin-Name: 0d6332f706ec5c34cc6a9ff79878f4e10a9ad81b24cc7d743b52168586285811
---

diff --git a/ext/fiddle/sqlite3-api.js b/ext/fiddle/sqlite3-api.js
index 52ea1f982c..a8a697301f 100644
--- a/ext/fiddle/sqlite3-api.js
+++ b/ext/fiddle/sqlite3-api.js
@@ -400,14 +400,14 @@
             affirmDbOpen(this);
             const arg = parseExecArgs(arguments);
             if(!arg.sql) return this;
-            else if(arg.multi){
+            else if(arg.opt.multi){
                 return this.execMulti(arg, undefined, BindTypes);
             }
             const opt = arg.opt;
             let stmt;
             try {
                 stmt = this.prepare(arg.sql);
-                if(opt.bind) stmt.bind(bind);
+                if(opt.bind) stmt.bind(opt.bind);
                 if(opt.callback){
                     while(stmt.step()){
                         stmt._isLocked = true;
diff --git a/ext/fiddle/testing1.js b/ext/fiddle/testing1.js
index b7dcfe6b00..7f024bf032 100644
--- a/ext/fiddle/testing1.js
+++ b/ext/fiddle/testing1.js
@@ -59,12 +59,14 @@ const mainTest1 = function(namespace){
             .assert(!db._statements[pId]);
 
         let list = [];
-        db.execMulti({
+        db.exec({
             sql:`CREATE TABLE t(a,b);
 INSERT INTO t(a,b) VALUES(1,2),(3,4),(?,?);`,
+            multi: true,
             saveSql: list,
             bind: [5,6]
         });
+        T.assert(2 === list.length);
         log("Exec'd SQL:", list);
         let counter = 0, colNames = [];
         db.exec("SELECT a a, b b FROM t",{
diff --git a/manifest b/manifest
index 885ccb9c86..aff1814a5b 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C WASM:\sadded\sexec(),\sexecMulti(),\sand\sseveral\sgetters.\sVarious\stouchups\sand\sfixes.
-D 2022-05-22T22:00:39.271
+C WASM:\san\sarg\shandling\sfix\sfor\sDB.exec({multi:true...}).
+D 2022-05-22T22:10:38.293
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -64,10 +64,10 @@ F ext/fiddle/fiddle-worker.js c22557b641b47fa1473d3465a4e69fe06b8b09b924955805a4
 F ext/fiddle/fiddle.html 657c6c3f860c322fba3c69fa4f7a1209e2d2ce44b4bc65a3e154e3a97c047a7c
 F ext/fiddle/fiddle.js f9c79164428e96a5909532f18a8bc8f8c8ec4f738bfc09ad3d2a532c2400f9f0
 F ext/fiddle/index.md d9c1c308d8074341bc3b11d1d39073cd77754cb3ca9aeb949f23fdd8323d81cf
-F ext/fiddle/sqlite3-api.js 6d088e075fa2910dcad2584d2a518de33c7dd5ce4d94408691c0cdb1c9c4394b
+F ext/fiddle/sqlite3-api.js bf8d382e79ad0b2131734a823a84c530f8115a4265f00dc937a4daca6b20faa9
 F ext/fiddle/testing-common.js 53284264504821314f052017b54fa75ab065dcd9cbb754cc8060930498faeee8
 F ext/fiddle/testing1.html 68cec1b1c8646a071717e5979f22e4268e6d36d96ba13ad68333351acdbcf1d1
-F ext/fiddle/testing1.js 5e46c8850f826821cb24b13a21e4dabee8dac9ce76845149dac599ab643784ab
+F ext/fiddle/testing1.js d28af2b33a9c1c47668bc74b3b7d4198012a4c62e25dd35550794fcc26be3057
 F ext/fts1/README.txt 20ac73b006a70bcfd80069bdaf59214b6cf1db5e
 F ext/fts1/ft_hash.c 3927bd880e65329bdc6f506555b228b28924921b
 F ext/fts1/ft_hash.h 06df7bba40dadd19597aa400a875dbc2fed705ea
@@ -1967,8 +1967,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 601dc3fa29c2ce2ede5a8320c79050305f3774b6d7bc759247c5021f3b74aaec
-R e2842421067cb498614f974216c18719
+P b790c91b85e9cf8eecce86ac1717e8ccd2c3b6b98a1ad6a5d64eefc94ee86f9d
+R d56953962e2ee4ada32fbd2e80f7b019
 U stephan
-Z 9b9e03e3e05307544edc47fc1b8505b5
+Z 371bcc2e2a7bddeb441dadf34f671698
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index e601bd2321..abb2f5111a 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b790c91b85e9cf8eecce86ac1717e8ccd2c3b6b98a1ad6a5d64eefc94ee86f9d
\ No newline at end of file
+0d6332f706ec5c34cc6a9ff79878f4e10a9ad81b24cc7d743b52168586285811
\ No newline at end of file