Fix a problem in ALTER TABLE triggered by views or triggers that include the construc...

FossilOrigin-Name: 8168021f9ab5fb8b4888257963c9ec68fd1dfeedaf6bba4b8e07438001d0be0f

diff --git a/manifest b/manifest
index 0bde09436150449425738f98871c1c528acc2a5e..a7f5ce451b8c91d8c4cf841a76c75145c183923e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\s"releasetest_data.tcl"\sso\sthat\sit\sis\sa\sstandalone\sscript\sthat\sgenerates\ssh\sor\sbatch\sscripts\sto\srun\seach\stcl\stest\srun\sat\srelease\stime.\sUpdate\swapptest.tcl\sto\suse\sit.
-D 2019-07-31T21:08:55.220
+C Fix\sa\sproblem\sin\sALTER\sTABLE\striggered\sby\sviews\sor\striggers\sthat\sinclude\sthe\sconstruction\s"ORDER\sBY\strue"\sor\s"ORDER\sBY\sfalse".
+D 2019-08-01T10:58:46.890
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -521,7 +521,7 @@ F src/pragma.h 4a9fabff14db4487a734dfeeb4be984ce662bfdccfae16145b9c732327735e13
 F src/prepare.c 1fdf68a8add154bd1de978dde5a4819478e2576d5701b93db2c65d78c3daf1c8
 F src/printf.c 9be6945837c839ba57837b4bc3af349eba630920fa5532aa518816defe42a7d4
 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
-F src/resolve.c edf29463177e9fa9dad5346e9adf482f24db9f180c693d0ba993e25dc797f6b7
+F src/resolve.c 6d57cfcb728fe1513fcbfb2bbd4192838b8cfe094616f72c7a54be55a550cc84
 F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
 F src/select.c 1b8b5afee76e7d662b34c61705a638f7a6a20d5109515ca973c12343c84fb2d6
 F src/shell.c.in 9c203a8c643fd638ab67a911e1fad1f51138c13a4d0ea3cedf7526fba5de60f2
@@ -633,7 +633,7 @@ F test/altermalloc.test 167a47de41b5c638f5f5c6efb59784002b196fff70f98d9b4ed3cd74
 F test/altermalloc2.test fa7b1c1139ea39b8dec407cf1feb032ca8e0076bd429574969b619175ad0174b
 F test/altertab.test b6901287474841cffbd8f90b098d3bd7d8445868b42caeb01b27034698f7245f
 F test/altertab2.test 8883693952f6d7fb5f754dbf1d694ed780aa883027bef04cb1fb99a3b88c9272
-F test/altertab3.test 8e6db08ed61aab2ca2d2f19608ba9d4dcade669b057e581588d3aa0a6d642e27
+F test/altertab3.test 0f1e2801afb0b1b0b723ec016dda140aa5dc0d2d48846d5eead003fcd72828e8
 F test/amatch1.test b5ae7065f042b7f4c1c922933f4700add50cdb9f
 F test/analyze.test 7168c8bffa5d5cbc53c05b7e9c7fcdd24b365a1bc5046ce80c45efa3c02e6b7c
 F test/analyze3.test ff62d9029e6deb2c914490c6b00caf7fae47cc85cdc046e4a0d0a4d4b87c71d8
@@ -1838,8 +1838,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 6e92d71c24c6039e7116f02fc5f39b2b87efcd3674ea828077c03d760bf49c45
-R 8d98008b874d874a1ef71d33d67987f5
-T +closed f0b7d3b9a08a17081f312215bcb6cb778e02a9bb2de4b359b9e7aecff23d258b
+P 559c2dd6724b2fc238760863d4be7132b591457e72ca5758fdd4002fbf7df4bc
+R 52d29a8e2c101f64ed5a3491f70b6fac
 U dan
-Z 27d723c03ce07f3864426e28004404f2
+Z e08aba3f0c29a2bffdcb1f40ba9072b4

diff --git a/manifest.uuid b/manifest.uuid
index 779006ab8f9d1a1059a55f2c0c0234671a2f48e7..0aa7e04cfb94ab249fced29a730189086ddefd21 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-559c2dd6724b2fc238760863d4be7132b591457e72ca5758fdd4002fbf7df4bc
\ No newline at end of file
+8168021f9ab5fb8b4888257963c9ec68fd1dfeedaf6bba4b8e07438001d0be0f
\ No newline at end of file

diff --git a/src/resolve.c b/src/resolve.c
index 672f1356d834912618bf5a46620b3e50df96c4bb..9e4099372f9dabac2bf1d639d059c076c6628e31 100644 (file)
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -1278,7 +1278,7 @@ int sqlite3ResolveOrderGroupBy(
   ExprList *pEList;
   struct ExprList_item *pItem;
 
-  if( pOrderBy==0 || pParse->db->mallocFailed ) return 0;
+  if( pOrderBy==0 || pParse->db->mallocFailed || IN_RENAME_OBJECT ) return 0;
   if( pOrderBy->nExpr>db->aLimit[SQLITE_LIMIT_COLUMN] ){
     sqlite3ErrorMsg(pParse, "too many terms in %s BY clause", zType);
     return 1;

diff --git a/test/altertab3.test b/test/altertab3.test
index 8a275ebc31b2cc5f7c2df8285217a1609719a596..b17e9c08365889f8dfcf3e0b3d4a63297ef48a6a 100644 (file)
--- a/test/altertab3.test
+++ b/test/altertab3.test
@@ -345,5 +345,23 @@ do_catchsql_test 14.2 {
   ALTER TABLE t1 RENAME TO t1x;
 } {1 {error in trigger AFTER: no such column: a}}
 
+#-------------------------------------------------------------------------
+reset_db
+
+do_execsql_test 16.1 {
+  CREATE TABLE t1(x);
+  CREATE TRIGGER AFTER INSERT ON t1 BEGIN
+    SELECT (WITH t2 AS (WITH t3 AS (SELECT true)
+          SELECT * FROM t3 ORDER BY true COLLATE nocase)
+        SELECT 11);
+
+    WITH t4 AS (SELECT * FROM t1) SELECT 33;
+  END;
+}
+
+do_execsql_test 16.2 {
+  ALTER TABLE t1 RENAME TO t1x;
+}
+
 finish_test