From: dan <Dan Kennedy>
Date: Sun, 18 Apr 2021 05:52:57 +0000 (+0000)
Subject: Modify the drop column code to handle WITHOUT ROWID tables for which a single column... 
X-Git-Tag: version-3.35.5~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=56fdafb30b9b2a7135610ee1195c28aa8b8cf1c9;p=thirdparty%2Fsqlite.git

Modify the drop column code to handle WITHOUT ROWID tables for which a single column appears more than once in the primary key.

FossilOrigin-Name: cfa8912a94fc5cfed32ea9aac92ba97a61a6017c474ccb5e909b3f02e7b77382
---

diff --git a/manifest b/manifest
index 65b8ddac5b..04b721efbe 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sproblem\swith\shandling\sexpressions\slike\s"(col\sIS\sNULL\sAND\s<expr1>)\sOR\scol\s==\sNULL"\sin\sWHERE\sclauses.\sReported\sat\s[https://sqlite.org/forum/forumpost/1c4f2fdcc4].
-D 2021-04-13T18:39:32.427
+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
 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 2d631213818b654faaf08755f26e934134c4769757ae9286981401cd6b571081
+F src/alter.c 65449b20d0d7db57d9cce85ea5081afae476a892aa0f79fe4e832e823afde98c
 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 596623cb8a72d9570bfb8417b0f302810efe007873796f03c17a9e9ff28dade1
+F test/alterdropcol.test fdfac0280099a5e19ae5bf29bcd49f6fe13186398d6803b070b724ea4d9c6306
 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 5d4c65779dab868b285519b19e4cf9d451d50c6048f06f653aa701ec212df45e
-Q +40852ca8e215e51f63652a67817361b835b6fbbff7f66af50089af91007505f1
-R a373d96bf44029d511bc1cb5056d253a
-U drh
-Z 79d45f9744305292935fbcc773375095
+P e8c7bd34d0cb8c595d58b6b24621fdd3cc02f05ac7dc59f450fa08c0e394a4b4
+Q +e0d2507021c5a04016c442f954b542c0920678737ae7c710eb8ac50d6337db1c
+R 82f7af0178827ff1bf8fa74334f52e65
+U dan
+Z d2b66f9edfafd043c752a18b44cd1499
diff --git a/manifest.uuid b/manifest.uuid
index 5fa0305af7..a8b8df2d7b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e8c7bd34d0cb8c595d58b6b24621fdd3cc02f05ac7dc59f450fa08c0e394a4b4
\ No newline at end of file
+cfa8912a94fc5cfed32ea9aac92ba97a61a6017c474ccb5e909b3f02e7b77382
\ No newline at end of file
diff --git a/src/alter.c b/src/alter.c
index c0797db45e..aa42d1f0f3 100644
--- a/src/alter.c
+++ b/src/alter.c
@@ -1931,18 +1931,25 @@ void sqlite3AlterDropColumn(Parse *pParse, SrcList *pSrc, Token *pName){
     sqlite3OpenTable(pParse, iCur, iDb, pTab, OP_OpenWrite);
     addr = sqlite3VdbeAddOp1(v, OP_Rewind, iCur); VdbeCoverage(v);
     reg = ++pParse->nMem;
-    pParse->nMem += pTab->nCol;
     if( HasRowid(pTab) ){
       sqlite3VdbeAddOp2(v, OP_Rowid, iCur, reg);
+      pParse->nMem += pTab->nCol;
     }else{
       pPk = sqlite3PrimaryKeyIndex(pTab);
+      pParse->nMem += pPk->nColumn;
+      for(i=0; i<pPk->nKeyCol; i++){
+        sqlite3VdbeAddOp3(v, OP_Column, iCur, i, reg+i+1);
+      }
+      nField = pPk->nKeyCol;
     }
+    regRec = ++pParse->nMem;
     for(i=0; i<pTab->nCol; i++){
       if( i!=iCol && (pTab->aCol[i].colFlags & COLFLAG_VIRTUAL)==0 ){
         int regOut;
         if( pPk ){
           int iPos = sqlite3TableColumnToIndex(pPk, i);
           int iColPos = sqlite3TableColumnToIndex(pPk, iCol);
+          if( iPos<pPk->nKeyCol ) continue;
           regOut = reg+1+iPos-(iPos>iColPos);
         }else{
           regOut = reg+1+nField;
@@ -1951,7 +1958,6 @@ void sqlite3AlterDropColumn(Parse *pParse, SrcList *pSrc, Token *pName){
         nField++;
       }
     }
-    regRec = reg + pTab->nCol;
     sqlite3VdbeAddOp3(v, OP_MakeRecord, reg+1, nField, regRec);
     if( pPk ){
       sqlite3VdbeAddOp4Int(v, OP_IdxInsert, iCur, regRec, reg+1, pPk->nKeyCol);
diff --git a/test/alterdropcol.test b/test/alterdropcol.test
index 3cca664151..947bce2ef5 100644
--- a/test/alterdropcol.test
+++ b/test/alterdropcol.test
@@ -276,4 +276,21 @@ do_catchsql_test 6.1 {
   ALTER TABLE t2 DROP COLUMN z;
 } {1 {database disk image is malformed}}
 
+# 2021-04-06 dbsqlfuzz crash-331c5c29bb76257b198f1318eef3288f9624c8ce
+reset_db
+do_execsql_test 7.0 {
+  CREATE TABLE t1(a, b, c, PRIMARY KEY(a COLLATE nocase, a)) WITHOUT ROWID;
+  INSERT INTO t1 VALUES(1, 2, 3);
+  INSERT INTO t1 VALUES(4, 5, 6);
+}
+do_execsql_test 7.1 {
+  ALTER TABLE t1 DROP COLUMN c;                
+}
+do_execsql_test 7.2 {
+  SELECT sql FROM sqlite_schema;
+} {{CREATE TABLE t1(a, b, PRIMARY KEY(a COLLATE nocase, a)) WITHOUT ROWID}}
+do_execsql_test 7.3 {
+  SELECT * FROM t1;
+} {1 2 4 5}
+
 finish_test