From: dan <dan@noemail.net>
Date: Sat, 11 Aug 2018 17:34:38 +0000 (+0000)
Subject: Fix a bug causing all ALTER TABLE RENAME COLUMN commands to fail if ANALYZE
X-Git-Tag: version-3.25.0~39^2~45
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=872165f26009e252d888f7bf0680b4f7b7e358ae;p=thirdparty%2Fsqlite.git

Fix a bug causing all ALTER TABLE RENAME COLUMN commands to fail if ANALYZE
had been run on the database. Also prevent the user from renaming the columns
of system tables.

FossilOrigin-Name: ca644a2877c26561f8fb3b3feb74a070cd46621acb105577f04bc936c9b72a95
---

diff --git a/manifest b/manifest
index a38bd80be1..4619fc2238 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Reload\sthe\sentire\sschema\safter\srenaming\sa\scolumn\sin\sorder\sto\sensure\sthat\sthe\nschema\sfor\sany\stables\sfor\swhich\sparent\skey\sdefinitions\swere\schanged\sare\nreloaded.
-D 2018-08-11T13:40:20.594
+C Fix\sa\sbug\scausing\sall\sALTER\sTABLE\sRENAME\sCOLUMN\scommands\sto\sfail\sif\sANALYZE\nhad\sbeen\srun\son\sthe\sdatabase.\sAlso\sprevent\sthe\suser\sfrom\srenaming\sthe\scolumns\nof\ssystem\stables.
+D 2018-08-11T17:34:38.795
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 0a3a6c81e6fcb969ff9106e882f0a08547014ba463cb6beca4c4efaecc924ee6
@@ -432,7 +432,7 @@ F spec.template 86a4a43b99ebb3e75e6b9a735d5fd293a24e90ca
 F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
 F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786
 F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
-F src/alter.c 3a3e29b33b1d7caf0caf12b01a3bc9623b23b67396061164eb4b4177858733c4
+F src/alter.c 26ddd5989ed4af89d49f6b6b8e9456b8a9c73af11f0212321873800fe70fdaae
 F src/analyze.c 3dc6b98cf007b005af89df165c966baaa48e8124f38c87b4d2b276fe7f0b9eb9
 F src/attach.c 4bd5b92633671d3e8ce431153ebb1893b50335818423b5373f3f27969f79769a
 F src/auth.c 32a5bbe3b755169ab6c66311c5225a3cd4f75a46c041f7fb117e0cbb68055114
@@ -599,7 +599,7 @@ F test/alter.test b820ab9dcf85f8e3a65bc8326accb2f0c7be64ef
 F test/alter2.test 7ea05c7d92ac99349a802ef7ada17294dd647060
 F test/alter3.test 4d79934d812eaeacc6f22781a080f8cfe012fdc3
 F test/alter4.test b6d7b86860111864f6cddb54af313f5862dda23b
-F test/altercol.test 3b45ec5478a23aaa26ac94addbcedf4338d6183faaf9be9dd7fa5a5891278877
+F test/altercol.test 4ff44e94b1eb385f14d1e9b8783232fbcb3ca283aed677834e415e148505bc21
 F test/altermalloc.test e81ac9657ed25c6c5bb09bebfa5a047cd8e4acfc
 F test/amatch1.test b5ae7065f042b7f4c1c922933f4700add50cdb9f
 F test/analyze.test b3a9c67d00e1df7588a5b7be9a0292899f94fe8cac1f94a017277474ca2e59df
@@ -1755,7 +1755,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 2dec9ea4ab1779d00bb22add0aa9a8536661d8abc9f4c2fb8628e04d4cd84326
-R 6a4eab2189f9611c28dbe52d0e4d02e0
+P f4497b0136e9fcb1121a834c86f84eeaf8f1e7d3157d409484e086bcef3487f1
+R b87d244c1780c981f7a5147b861524e9
 U dan
-Z c3787a5cd36d50b5c65d4eeaaffbb50e
+Z adde180225143b072a288c833a037d1c
diff --git a/manifest.uuid b/manifest.uuid
index 698595a1f1..7e4401b3a0 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f4497b0136e9fcb1121a834c86f84eeaf8f1e7d3157d409484e086bcef3487f1
\ No newline at end of file
+ca644a2877c26561f8fb3b3feb74a070cd46621acb105577f04bc936c9b72a95
\ No newline at end of file
diff --git a/src/alter.c b/src/alter.c
index 6bf2d4c0c6..7cf47b38a6 100644
--- a/src/alter.c
+++ b/src/alter.c
@@ -806,6 +806,8 @@ void sqlite3AlterRenameColumn(
 
   pTab = sqlite3LocateTableItem(pParse, 0, &pSrc->a[0]);
   if( !pTab ) goto exit_rename_column;
+  if( SQLITE_OK!=isSystemTable(pParse, pTab->zName) ) goto exit_rename_column;
+  
   iSchema = sqlite3SchemaToIndex(db, pTab->pSchema);
   assert( iSchema>=0 );
   zDb = db->aDb[iSchema].zDbSName;
@@ -823,17 +825,17 @@ void sqlite3AlterRenameColumn(
   zNew = sqlite3NameFromToken(db, pNew);
   if( !zNew ) goto exit_rename_column;
 
-
   sqlite3NestedParse(pParse, 
       "UPDATE \"%w\".%s SET "
       "sql = sqlite_rename_column(sql, %d, %Q, %Q, %Q) "
-      "WHERE type = 'table' OR (type='index' AND tbl_name = %Q AND sql!='')",
+      "WHERE name NOT LIKE 'sqlite_%%' AND ("
+      "   type = 'table' OR (type='index' AND tbl_name = %Q)"
+      ")",
       zDb, MASTER_NAME, iCol, zNew, pTab->zName, zOld, pTab->zName
   );
 
   /* Drop and reload the database schema. */
-  if( db->mallocFailed==0 ){
-    assert( pParse->pVdbe );
+  if( pParse->pVdbe ){
     sqlite3ChangeCookie(pParse, iSchema);
     sqlite3VdbeAddParseSchemaOp(pParse->pVdbe, iSchema, 0);
   }
diff --git a/test/altercol.test b/test/altercol.test
index 3a6b279afc..98b001a867 100644
--- a/test/altercol.test
+++ b/test/altercol.test
@@ -165,5 +165,23 @@ do_execsql_test 4.4 {
   {CREATE TABLE c2(a, b, FOREIGN KEY (a, b) REFERENCES p1)}
 }
 
+#-------------------------------------------------------------------------
+
+do_execsql_test 5.0 {
+  CREATE TABLE t5(a, b, c);
+  CREATE INDEX t5a ON t5(a);
+  INSERT INTO t5 VALUES(1, 2, 3), (4, 5, 6);
+  ANALYZE;
+}
+
+do_execsql_test 5.1 {
+  ALTER TABLE t5 RENAME b TO big;
+  SELECT big FROM t5;
+} {2 5}
+
+do_catchsql_test 6.1 {
+  ALTER TABLE sqlite_stat1 RENAME tbl TO thetable;
+} {1 {table sqlite_stat1 may not be altered}}
+
 finish_test