From: dan <Dan Kennedy>
Date: Thu, 18 Feb 2021 12:18:10 +0000 (+0000)
Subject: Ensure that the pre-update hook is invoked for INSERT operations on WITHOUT ROWID... 
X-Git-Tag: version-3.35.0~85
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fadc0e34beb88868dab7109a833f9c1552597662;p=thirdparty%2Fsqlite.git

Ensure that the pre-update hook is invoked for INSERT operations on WITHOUT ROWID tables that use the xfer optimization.

FossilOrigin-Name: 66bbad239b4527ac8ae8b487a0c71d88b1861a8dfe1edc25109600dc447c60c4
---

diff --git a/ext/session/sessionwor.test b/ext/session/sessionwor.test
index 0f0b429d7b..7d9e5c6a89 100644
--- a/ext/session/sessionwor.test
+++ b/ext/session/sessionwor.test
@@ -69,7 +69,9 @@ foreach {tn wo} {
 } {
   reset_db
 
-  do_execsql_test 2.$tn.0 "CREATE TABLE t1(a INTEGER PRIMARY KEY, b) $wo ;"
+  do_execsql_test 2.$tn.0.1 "CREATE TABLE t1(a INTEGER PRIMARY KEY, b) $wo ;"
+  do_execsql_test 2.$tn.0.2 "CREATE TABLE t2(a INTEGER PRIMARY KEY, b) $wo ;"
+  do_execsql_test 2.$tn.0.3 "CREATE TABLE t3(a INTEGER PRIMARY KEY, b) $wo ;"
   
   do_iterator_test 1.1 t1 {
     INSERT INTO t1 VALUES(1, 'two');
@@ -94,6 +96,27 @@ foreach {tn wo} {
   } {
     {DELETE t1 0 X. {i 1 t four} {}}
   }
+
+  do_execsql_test 2.$tn.5 {
+    INSERT INTO t1 VALUES(1, 'one');
+    INSERT INTO t1 VALUES(2, 'two');
+    INSERT INTO t1 VALUES(3, 'three');
+  }
+
+  do_iterator_test 2.$tn.6 t2 {
+    INSERT INTO t2 SELECT a, b FROM t1
+  } {
+    {INSERT t2 0 X. {} {i 1 t one}} 
+    {INSERT t2 0 X. {} {i 2 t two}}
+    {INSERT t2 0 X. {} {i 3 t three}}
+  }
+  do_iterator_test 2.$tn.7 t3 {
+    INSERT INTO t3 SELECT * FROM t1
+  } {
+    {INSERT t3 0 X. {} {i 1 t one}} 
+    {INSERT t3 0 X. {} {i 2 t two}}
+    {INSERT t3 0 X. {} {i 3 t three}}
+  }
 }
 
 finish_test
diff --git a/manifest b/manifest
index fddc6b6c5f..9ccc0b72ac 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\smissing\sVdbeCoverage()\smacros\sto\ssome\sof\sthe\snew\sRETURNING\scode.
-D 2021-02-18T01:02:03.701
+C Ensure\sthat\sthe\spre-update\shook\sis\sinvoked\sfor\sINSERT\soperations\son\sWITHOUT\sROWID\stables\sthat\suse\sthe\sxfer\soptimization.
+D 2021-02-18T12:18:10.995
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -453,7 +453,7 @@ F ext/session/sessioninvert.test 04075517a9497a80d39c495ba6b44f3982c7371129b89e2
 F ext/session/sessionmem.test f2a735db84a3e9e19f571033b725b0b2daf847f3f28b1da55a0c1a4e74f1de09
 F ext/session/sessionrebase.test ccfa716b23bd1d3b03217ee58cfd90c78d4b99f53e6a9a2f05e82363b9142810
 F ext/session/sessionstat1.test 218d351cf9fcd6648f125a26b607b140310160184723c2666091b54450a68fb5
-F ext/session/sessionwor.test 67b5ab91d4f93ce65ff1f58240ac5ddf73f8670facc1ffa49cef56293d52818d
+F ext/session/sessionwor.test 6fd9a2256442cebde5b2284936ae9e0d54bde692d0f5fd009ecef8511f4cf3fc
 F ext/session/sqlite3session.c 1d0553077b55ffcfa69963c354e9bad3bace6ce79bbe7368e650c6ae1e106314
 F ext/session/sqlite3session.h f53c99731882bf59c7362855cdeba176ce1fe8eeba089e38a8cce0172f8473aa
 F ext/session/test_session.c 93ca965112d2b4d9d669c9c0be6b1e52942a268796050a145612df1eee175ce0
@@ -502,7 +502,7 @@ F src/hash.c 8d7dda241d0ebdafb6ffdeda3149a412d7df75102cecfc1021c98d6219823b19
 F src/hash.h 9d56a9079d523b648774c1784b74b89bd93fac7b365210157482e4319a468f38
 F src/hwtime.h cb1d7e3e1ed94b7aa6fde95ae2c2daccc3df826be26fc9ed7fd90d1750ae6144
 F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
-F src/insert.c aad00bdc7946606ddef5377b28f25b455d9953ca320881c95498dee42efae8f5
+F src/insert.c 225c8776218d56f63d218579d753b528347f2138d828438de88cbde976da6d5e
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 8c9c8cd2bd8eecdb06d9b6e89de7e9e65bae45cc8fc33609cc74023a5c296067
 F src/main.c 1c5de7b3fabcdf05f4fe563aab5d81d175b89c67a8678a12ba86629356afa356
@@ -1057,7 +1057,7 @@ F test/genesis.tcl 1e2e2e8e5cc4058549a154ff1892fe5c9de19f98
 F test/having.test a89236dd8d55aa50c4805f82ac9daf64d477a44d712d8209c118978d0ca21ec9
 F test/hexlit.test 4a6a5f46e3c65c4bf1fa06f5dd5a9507a5627751
 F test/hidden.test 23c1393a79e846d68fd902d72c85d5e5dcf98711
-F test/hook.test e97382e68e4379838e888756d653afd159f5f14780315ff97b70360d3d8485bc
+F test/hook.test bd7ea2e35951291705106295324a91b3bb455081c783e0f681ff4bc68468b8d2
 F test/hook2.test b9ff3b8c6519fb67f33192f1afe86e7782ee4ac8
 F test/icu.test 716a6b89fbabe5cc63e0cd4c260befb08fd7b9d761f04d43669233292f0753b1
 F test/ieee754.test b0945d12be7d255f3dfa18e2511b17ca37e0edd2b803231c52d05b86c04ab26e
@@ -1900,7 +1900,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 1aafb94d4e3f28a8322e5e43be737d84b1a09f0063408f4a466a6071fa95b39b
-R 014c63d56957b1a4cbfecbd6b659f75e
-U drh
-Z 0284a99401abab438415cb1d9101e226
+P 53a5390909822b3aef8c5f522144bc2e86cc31318b2d3e310a064ae7202b4a15
+R 781eea4e5f846e02b7fa70a51cb3a0ee
+U dan
+Z 800c1b7cf896beb329dcd482f50ca3c5
diff --git a/manifest.uuid b/manifest.uuid
index 02782b2eb6..7e8eb74db1 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-53a5390909822b3aef8c5f522144bc2e86cc31318b2d3e310a064ae7202b4a15
\ No newline at end of file
+66bbad239b4527ac8ae8b487a0c71d88b1861a8dfe1edc25109600dc447c60c4
\ No newline at end of file
diff --git a/src/insert.c b/src/insert.c
index 3469ee1ea0..c7db81a4d4 100644
--- a/src/insert.c
+++ b/src/insert.c
@@ -2407,6 +2407,31 @@ void sqlite3SetMakeRecordP5(Vdbe *v, Table *pTab){
 }
 #endif
 
+/*
+** Table pTab is a WITHOUT ROWID table that is being written to. The cursor
+** number is iCur, and register regData contains the new record for the
+** PK index. This function adds code to invoke the pre-update hook,
+** if one is registered.
+*/
+#ifdef SQLITE_ENABLE_PREUPDATE_HOOK
+static void codeWithoutRowidPreupdate(
+  Parse *pParse,                  /* Parse context */
+  Table *pTab,                    /* Table being updated */
+  int iCur,                       /* Cursor number for table */
+  int regData                     /* Data containing new record */
+){
+  Vdbe *v = pParse->pVdbe;
+  int r = sqlite3GetTempReg(pParse);
+  assert( !HasRowid(pTab) );
+  sqlite3VdbeAddOp2(v, OP_Integer, 0, r);
+  sqlite3VdbeAddOp4(v, OP_Insert, iCur, regData, r, (char*)pTab, P4_TABLE);
+  sqlite3VdbeChangeP5(v, OPFLAG_ISNOOP);
+  sqlite3ReleaseTempReg(pParse, r);
+}
+#else
+# define codeWithoutRowidPreupdate(a,b,c,d)
+#endif
+
 /*
 ** This routine generates code to finish the INSERT or UPDATE operation
 ** that was started by a prior call to sqlite3GenerateConstraintChecks.
@@ -2455,17 +2480,9 @@ void sqlite3CompleteInsertion(
       assert( pParse->nested==0 );
       pik_flags |= OPFLAG_NCHANGE;
       pik_flags |= (update_flags & OPFLAG_SAVEPOSITION);
-#ifdef SQLITE_ENABLE_PREUPDATE_HOOK
       if( update_flags==0 ){
-        int r = sqlite3GetTempReg(pParse);
-        sqlite3VdbeAddOp2(v, OP_Integer, 0, r);
-        sqlite3VdbeAddOp4(v, OP_Insert, 
-            iIdxCur+i, aRegIdx[i], r, (char*)pTab, P4_TABLE
-        );
-        sqlite3VdbeChangeP5(v, OPFLAG_ISNOOP);
-        sqlite3ReleaseTempReg(pParse, r);
+        codeWithoutRowidPreupdate(pParse, pTab, iIdxCur+i, aRegIdx[i]);
       }
-#endif
     }
     sqlite3VdbeAddOp4Int(v, OP_IdxInsert, iIdxCur+i, aRegIdx[i],
                          aRegIdx[i]+1,
@@ -2938,14 +2955,11 @@ static int xferOptimization(
       insFlags = OPFLAG_NCHANGE|OPFLAG_LASTROWID|OPFLAG_APPEND|OPFLAG_PREFORMAT;
     }
 #ifdef SQLITE_ENABLE_PREUPDATE_HOOK
-    if( db->xPreUpdateCallback ){
-      sqlite3VdbeAddOp3(v, OP_RowData, iSrc, regData, 1);
-      insFlags &= ~OPFLAG_PREFORMAT;
-    }else
+    sqlite3VdbeAddOp3(v, OP_RowData, iSrc, regData, 1);
+    insFlags &= ~OPFLAG_PREFORMAT;
+#else
+    sqlite3VdbeAddOp3(v, OP_RowCell, iDest, iSrc, regRowid);
 #endif
-    {
-      sqlite3VdbeAddOp3(v, OP_RowCell, iDest, iSrc, regRowid);
-    }
     sqlite3VdbeAddOp4(v, OP_Insert, iDest, regData, regRowid,
         (char*)pDest, P4_TABLE);
     sqlite3VdbeChangeP5(v, insFlags);
@@ -2986,20 +3000,28 @@ static int xferOptimization(
       ** might change the definition of a collation sequence and then run
       ** a VACUUM command. In that case keys may not be written in strictly
       ** sorted order.  */
-      for(i=0; i<pSrcIdx->nColumn; i++){
-        const char *zColl = pSrcIdx->azColl[i];
-        if( sqlite3_stricmp(sqlite3StrBINARY, zColl) ) break;
-      }
-      if( i==pSrcIdx->nColumn ){
-        idxInsFlags = OPFLAG_USESEEKRESULT|OPFLAG_PREFORMAT;
-        sqlite3VdbeAddOp1(v, OP_SeekEnd, iDest);
-        sqlite3VdbeAddOp2(v, OP_RowCell, iDest, iSrc);
+#ifdef SQLITE_ENABLE_PREUPDATE_HOOK
+      if( (HasRowid(pDest) || !IsPrimaryKeyIndex(pDestIdx)) )
+#endif
+      {
+        for(i=0; i<pSrcIdx->nColumn; i++){
+          const char *zColl = pSrcIdx->azColl[i];
+          if( sqlite3_stricmp(sqlite3StrBINARY, zColl) ) break;
+        }
+        if( i==pSrcIdx->nColumn ){
+          idxInsFlags = OPFLAG_USESEEKRESULT|OPFLAG_PREFORMAT;
+          sqlite3VdbeAddOp1(v, OP_SeekEnd, iDest);
+          sqlite3VdbeAddOp2(v, OP_RowCell, iDest, iSrc);
+        }
       }
     }else if( !HasRowid(pSrc) && pDestIdx->idxType==SQLITE_IDXTYPE_PRIMARYKEY ){
       idxInsFlags |= OPFLAG_NCHANGE;
     }
     if( idxInsFlags!=(OPFLAG_USESEEKRESULT|OPFLAG_PREFORMAT) ){
       sqlite3VdbeAddOp3(v, OP_RowData, iSrc, regData, 1);
+      if( !HasRowid(pDest) && IsPrimaryKeyIndex(pDestIdx) ){
+        codeWithoutRowidPreupdate(pParse, pDest, iDest, regData);
+      }
     }
     sqlite3VdbeAddOp2(v, OP_IdxInsert, iDest, regData);
     sqlite3VdbeChangeP5(v, idxInsFlags|OPFLAG_APPEND);
diff --git a/test/hook.test b/test/hook.test
index d137e9056f..5d6a354572 100644
--- a/test/hook.test
+++ b/test/hook.test
@@ -956,5 +956,47 @@ ifcapable analyze {
   }]
 }
 
+#-------------------------------------------------------------------------
+# Test that the pre-update hook is fired for INSERT statements that use
+# the xfer optimization on without rowid tables.
+#
+reset_db
+do_execsql_test 12.1 {
+  CREATE TABLE t1(a INTEGER PRIMARY KEY, b);
+  CREATE TABLE t2(a INTEGER PRIMARY KEY, b) WITHOUT ROWID;
+
+  INSERT INTO t1 VALUES(1, 2);
+  INSERT INTO t1 VALUES(3, 4);
+  INSERT INTO t2 VALUES(5, 6);
+  INSERT INTO t2 VALUES(7, 8);
+
+  CREATE TABLE t3 (a INTEGER PRIMARY KEY, b) WITHOUT ROWID;
+}
+
+db preupdate hook preupdate_cb
+db update_hook update_cb
+
+proc preupdate_cb {args} { lappend ::res "preupdate" $args }
+proc update_cb {args} { lappend ::res "update" $args }
+
+#set ::res [list]
+#do_test 11.2 {
+#  execsql VACUUM
+#  set ::res
+#} {}
+
+do_test 11.3 {
+  set ::res [list]
+  execsql { INSERT INTO t3 SELECT a, b FROM t2 }
+  set ::res
+} {preupdate {INSERT main t3 0 0} preupdate {INSERT main t3 0 0}}
+
+do_test 11.4 {
+  execsql { DELETE FROM t3 }
+  set ::res [list]
+  execsql { INSERT INTO t3 SELECT * FROM t2 }
+  set ::res
+} {preupdate {INSERT main t3 0 0} preupdate {INSERT main t3 0 0}}
 
 finish_test
+