From: stephan <stephan@noemail.net>
Date: Fri, 19 May 2023 18:26:47 +0000 (+0000)
Subject: Extend detection of the INSERT...RETURNING locking case to the DB.selectValue(s)... 
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eeec597f9b92ba01bbe6013aa2906e183de564a3;p=thirdparty%2Fsqlite.git

Extend detection of the INSERT...RETURNING locking case to the DB.selectValue(s)/selectArray/selectObject() family of functions. Add tests for INSERT/UPDATE...RETURNING with those functions.

FossilOrigin-Name: 58be212d56d7601e270eb11c77c8371db7507a0a19d4febf1d6c0cd87c0b1016
---

diff --git a/ext/wasm/api/sqlite3-api-oo1.js b/ext/wasm/api/sqlite3-api-oo1.js
index 4da629a6bc..bff08e3e5e 100644
--- a/ext/wasm/api/sqlite3-api-oo1.js
+++ b/ext/wasm/api/sqlite3-api-oo1.js
@@ -478,7 +478,9 @@ globalThis.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
   const __selectFirstRow = (db, sql, bind, ...getArgs)=>{
     const stmt = db.prepare(sql);
     try {
-      return stmt.bind(bind).step() ? stmt.get(...getArgs) : undefined;
+      const rc = stmt.bind(bind).step() ? stmt.get(...getArgs) : undefined;
+      stmt.reset(/*for INSERT...RETURNING locking case*/);
+      return rc;
     }finally{
       stmt.finalize();
     }
@@ -1133,6 +1135,7 @@ globalThis.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
       try {
         stmt.bind(bind);
         while(stmt.step()) rc.push(stmt.get(0,asType));
+        stmt.reset(/*for INSERT...RETURNING locking case*/);
       }finally{
         stmt.finalize();
       }
@@ -1686,7 +1689,9 @@ globalThis.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
     */
     stepFinalize: function(){
       try{
-        return this.step();
+        const rc = this.step();
+        this.reset(/*for INSERT...RETURNING locking case*/);
+        return rc;
       }finally{
         try{this.finalize()}
         catch(e){/*ignored*/}
diff --git a/ext/wasm/tester1.c-pp.js b/ext/wasm/tester1.c-pp.js
index fc86b7f657..0dd2c836f8 100644
--- a/ext/wasm/tester1.c-pp.js
+++ b/ext/wasm/tester1.c-pp.js
@@ -1353,7 +1353,7 @@ self.sqlite3InitModule = sqlite3InitModule;
         T.assert(3n===db.changes(false,true));
       }
       rc = db.exec({
-        sql: "INSERT INTO t values('blob',X'6869') RETURNING 13",
+        sql: "INSERT INTO t(a,b) values('blob',X'6869') RETURNING 13",
         rowMode: 0
       });
       T.assert(Array.isArray(rc))
@@ -1628,7 +1628,19 @@ self.sqlite3InitModule = sqlite3InitModule;
         .assert(3===rc[1].a)
         .assert(4===rc[1].b);
     })
-
+  ////////////////////////////////////////////////////////////////////////
+    .t('selectArray/Object/Values() via INSERT/UPDATE...RETURNING', function(sqlite3){
+      let rc = this.db.selectObject("INSERT INTO t(a,b) VALUES(83,84) RETURNING a as AA");
+      T.assert(83===rc.AA);
+      rc = this.db.selectArray("UPDATE T set a=85 WHERE a=83 RETURNING b as BB");
+      T.assert(Array.isArray(rc)).assert(84===rc[0]);
+      //log("select * from t:",this.db.selectObjects("select * from t order by a"));
+      rc = this.db.selectValues("UPDATE T set a=a*1 RETURNING a");
+      T.assert(Array.isArray(rc))
+        .assert(5 === rc.length)
+        .assert('number'===typeof rc[0])
+        .assert(rc[0]|0 === rc[0] /* is small integer */);
+    })
   ////////////////////////////////////////////////////////////////////////
     .t({
       name: 'sqlite3_js_db_export()',
diff --git a/manifest b/manifest
index e8ea4b40d3..71de64ad8b 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C oo1.Stmt.finalize()\sno\slonger\sthrows,\sbut\sinstead\sreturns\sthe\ssame\sas\sthe\sC\sAPI.\soo1.DB.exec()\snow\striggers\sthe\sINSERT...RETURNING\slocking\sfailure\sas\san\sexception\svia\sreset()\sinstead\sof\sfinalize().\sSome\scode-adjacent\sinternal\sAPI\srenaming\sfor\sclarity's\ssake.
-D 2023-05-19T17:52:24.569
+C Extend\sdetection\sof\sthe\sINSERT...RETURNING\slocking\scase\sto\sthe\sDB.selectValue(s)/selectArray/selectObject()\sfamily\sof\sfunctions.\sAdd\stests\sfor\sINSERT/UPDATE...RETURNING\swith\sthose\sfunctions.
+D 2023-05-19T18:26:47.289
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -494,7 +494,7 @@ F ext/wasm/api/post-js-header.js 47b6b281f39ad59fa6e8b658308cd98ea292c286a68407b
 F ext/wasm/api/pre-js.c-pp.js ad906703f7429590f2fbf5e6498513bf727a1a4f0ebfa057afb08161d7511219
 F ext/wasm/api/sqlite3-api-cleanup.js cc21e3486da748463e02bbe51e2464c6ac136587cdfd5aa00cd0b5385f6ca808
 F ext/wasm/api/sqlite3-api-glue.js f1b2dcb944de5138bb5bd9a1559d2e76a4f3ec25260963d709e8237476688803
-F ext/wasm/api/sqlite3-api-oo1.js c6a258fce7d833d48220d7e4a18512fa16f79e501e4fd371e280cdab842cd4c0
+F ext/wasm/api/sqlite3-api-oo1.js d40f38ad5fe94844b618358651e7671e086c2c01835429686cc560c67dc52d92
 F ext/wasm/api/sqlite3-api-prologue.js 17f4ec398ba34c5c666fea8e8c4eb82064a35b302f2f2eb355283cd8d3f68ed5
 F ext/wasm/api/sqlite3-api-worker1.js 40a5b1813fcbe789f23ae196c833432c8c83e7054d660194ddfc51eab1c5b9bf
 F ext/wasm/api/sqlite3-license-version-header.js 0c807a421f0187e778dc1078f10d2994b915123c1223fe752b60afdcd1263f89
@@ -546,7 +546,7 @@ F ext/wasm/test-opfs-vfs.html 1f2d672f3f3fce810dfd48a8d56914aba22e45c6834e262555
 F ext/wasm/test-opfs-vfs.js f09266873e1a34d9bdb6d3981ec8c9e382f31f215c9fd2f9016d2394b8ae9b7b
 F ext/wasm/tester1-worker.html ebc4b820a128963afce328ecf63ab200bd923309eb939f4110510ab449e9814c
 F ext/wasm/tester1.c-pp.html 1c1bc78b858af2019e663b1a31e76657b73dc24bede28ca92fbe917c3a972af2
-F ext/wasm/tester1.c-pp.js 6722037cdafb25ad0415f4561bd216427b36a45ff9f51096c370e374725ba3a9
+F ext/wasm/tester1.c-pp.js 0c2df45b3bd2f193b862c491f6cc440d2a6f6bd1237d0c2d1f3272ea185f02b8
 F ext/wasm/tests/opfs/concurrency/index.html 0802373d57034d51835ff6041cda438c7a982deea6079efd98098d3e42fbcbc1
 F ext/wasm/tests/opfs/concurrency/test.js a98016113eaf71e81ddbf71655aa29b0fed9a8b79a3cdd3620d1658eb1cc9a5d
 F ext/wasm/tests/opfs/concurrency/worker.js 0a8c1a3e6ebb38aabbee24f122693f1fb29d599948915c76906681bb7da1d3d2
@@ -2070,9 +2070,9 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P db36a9ef5958cd761ca5bde697cc7cd83328dcc24d818023b813f6f860052754
-Q +4ee6b3aa531b980acea4c4b58ee256e765c5105100468928def3d4c9825fa9bc
-R 6ebf125e5dc2c49dd5a49418de89c8ad
+P 15f105c78268fb68a4713da444452f5d7b038019b21024302beebb6b26ff2244
+Q +3181c50540df0eff6cb5db79bb477c469bb7b73b0692260ba600db200fcef4ac
+R 255aefb056e6f5fa89c80babe2fa8ea0
 U stephan
-Z 945dcd8e12e5cd02ef0bc8b720828276
+Z 16b2d82f739f5c9e4447cdf3cf087aaf
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index cf97a20913..dd39de0c78 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-15f105c78268fb68a4713da444452f5d7b038019b21024302beebb6b26ff2244
\ No newline at end of file
+58be212d56d7601e270eb11c77c8371db7507a0a19d4febf1d6c0cd87c0b1016
\ No newline at end of file