From: dan <Dan Kennedy>
Date: Sun, 18 Apr 2021 06:03:58 +0000 (+0000)
Subject: Ensure that all records are updated by setting the OPFLAG_SAVEPOSITION flag when... 
X-Git-Tag: version-3.35.5~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9274c84f9d8c51f5149f0a916698652434c20973;p=thirdparty%2Fsqlite.git

Ensure that all records are updated by setting the OPFLAG_SAVEPOSITION flag when updating records as part of ALTER TABLE DROP COLUMN. Fix for [c88f3036a2].

FossilOrigin-Name: 11c368f20ab1806b6b2dbeb77dd70e9c190dccbe700f0a601d49e94c328ddba7
---

diff --git a/manifest b/manifest
index 04b721efbe..3c23b82f9b 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Modify\sthe\sdrop\scolumn\scode\sto\shandle\sWITHOUT\sROWID\stables\sfor\swhich\sa\ssingle\scolumn\sappears\smore\sthan\sonce\sin\sthe\sprimary\skey.
-D 2021-04-18T05:52:57.603
+C Ensure\sthat\sall\srecords\sare\supdated\sby\ssetting\sthe\sOPFLAG_SAVEPOSITION\sflag\swhen\supdating\srecords\sas\spart\sof\sALTER\sTABLE\sDROP\sCOLUMN.\sFix\sfor\s[c88f3036a2].
+D 2021-04-18T06:03:58.629
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -476,7 +476,7 @@ F spec.template 86a4a43b99ebb3e75e6b9a735d5fd293a24e90ca
 F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
 F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786
 F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
-F src/alter.c 65449b20d0d7db57d9cce85ea5081afae476a892aa0f79fe4e832e823afde98c
+F src/alter.c 68467416a491b1111d319f653efa4c32ea7dac02a75eb8d59679626fc880a62d
 F src/analyze.c 01c6c6765cb4d40b473b71d85535093730770bb186f2f473abac25f07fcdee5c
 F src/attach.c 9cbe761e464025694df8e6f6ee4d9f41432c3a255ca9443ccbb4130eeb87cf72
 F src/auth.c 08954fdc4cc2da5264ba5b75cfd90b67a6fc7d1710a02ccf917c38eadec77853
@@ -649,7 +649,7 @@ F test/alterauth.test 63442ba61ceb0c1eeb63aac1f4f5cebfa509d352276059d27106ae256b
 F test/alterauth2.test 794ac5cef251819fe364b4fe20f12f86e9c5d68070513c7fd26c17cb244c89af
 F test/altercol.test 3456f7cc4196ef8f7d82d245d6e91940eb12bc95c36c91ac4b512f6b5c9a4fa9
 F test/altercorrupt.test 584d707a80e106952d6382790c8919bcf9f0db678ed3a1c09fd98b7f9d1d3a10
-F test/alterdropcol.test fdfac0280099a5e19ae5bf29bcd49f6fe13186398d6803b070b724ea4d9c6306
+F test/alterdropcol.test 7c5199c930d3db8621672265db0cc05bfa87867bae1ee5362f3cf4eaf36c06ba
 F test/alterdropcol2.test 527fce683b200d620f560f666c44ae33e22728e990a10a48a543280dfd4b4d41
 F test/alterlegacy.test f38c6d06cda39e1f7b955bbce57f2e3ef5b7cb566d3d1234502093e228c15811
 F test/altermalloc.test 167a47de41b5c638f5f5c6efb59784002b196fff70f98d9b4ed3cd74a3fb80c9
@@ -1910,8 +1910,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 e8c7bd34d0cb8c595d58b6b24621fdd3cc02f05ac7dc59f450fa08c0e394a4b4
-Q +e0d2507021c5a04016c442f954b542c0920678737ae7c710eb8ac50d6337db1c
-R 82f7af0178827ff1bf8fa74334f52e65
+P cfa8912a94fc5cfed32ea9aac92ba97a61a6017c474ccb5e909b3f02e7b77382
+Q +354a4db5cb769c6aed386f43ee26d7e42342e92f781eef100c09751dc5b51751
+R df3f8a47b39bad347d9bc7988b9fcfb5
 U dan
-Z d2b66f9edfafd043c752a18b44cd1499
+Z 685bb58670acdf508b90c6c085fe72f0
diff --git a/manifest.uuid b/manifest.uuid
index a8b8df2d7b..d5f88ecc71 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-cfa8912a94fc5cfed32ea9aac92ba97a61a6017c474ccb5e909b3f02e7b77382
\ No newline at end of file
+11c368f20ab1806b6b2dbeb77dd70e9c190dccbe700f0a601d49e94c328ddba7
\ No newline at end of file
diff --git a/src/alter.c b/src/alter.c
index aa42d1f0f3..175f8981cf 100644
--- a/src/alter.c
+++ b/src/alter.c
@@ -1954,7 +1954,11 @@ void sqlite3AlterDropColumn(Parse *pParse, SrcList *pSrc, Token *pName){
         }else{
           regOut = reg+1+nField;
         }
-        sqlite3ExprCodeGetColumnOfTable(v, pTab, iCur, i, regOut);
+        if( i==pTab->iPKey ){
+          sqlite3VdbeAddOp2(v, OP_Null, 0, regOut);
+        }else{
+          sqlite3ExprCodeGetColumnOfTable(v, pTab, iCur, i, regOut);
+        }
         nField++;
       }
     }
@@ -1964,6 +1968,7 @@ void sqlite3AlterDropColumn(Parse *pParse, SrcList *pSrc, Token *pName){
     }else{
       sqlite3VdbeAddOp3(v, OP_Insert, iCur, regRec, reg);
     }
+    sqlite3VdbeChangeP5(v, OPFLAG_SAVEPOSITION);
 
     sqlite3VdbeAddOp2(v, OP_Next, iCur, addr+1); VdbeCoverage(v);
     sqlite3VdbeJumpHere(v, addr);
diff --git a/test/alterdropcol.test b/test/alterdropcol.test
index 947bce2ef5..a0ba95a399 100644
--- a/test/alterdropcol.test
+++ b/test/alterdropcol.test
@@ -293,4 +293,27 @@ do_execsql_test 7.3 {
   SELECT * FROM t1;
 } {1 2 4 5}
 
+foreach {tn wo} {
+  1 {}
+  2 {WITHOUT ROWID}
+} {
+  reset_db
+  do_execsql_test 9.$tn.0 "
+    CREATE TABLE t1(a INTEGER PRIMARY KEY, b, c) $wo;
+  "
+  do_execsql_test 9.$tn.1 {
+    WITH s(i) AS (
+        SELECT 1 UNION ALL SELECT i+1 FROM s WHERE i<50000
+    )
+    INSERT INTO t1(a, b, c) SELECT i, 123, 456 FROM s;
+  }
+  do_execsql_test 9.$tn.2 {
+    ALTER TABLE t1 DROP COLUMN b;
+  }
+
+  do_execsql_test 9.$tn.3 {
+    SELECT count(*), c FROM t1 GROUP BY c;
+  } {50000 456}
+}
+
 finish_test