Fix a problem with renaming tables when the schema contains an invocation of a curren...

FossilOrigin-Name: bd37ce3fb8dee8d538f6afc0bfc13cdc3ebdd504e6461f0130c6ecc8af585f68

diff --git a/manifest b/manifest
index 51512e1885a172ce24410896cea54350faac30c4..fc679ee5de4a43fb762fda982e4376e68a8ca460 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Early\sdetection\sof\sa\scorrupt\sR-Tree\sin\sthe\sR-Tree\ssearch\salgorithm.
-D 2019-07-20T18:00:46.010
+C Fix\sa\sproblem\swith\srenaming\stables\swhen\sthe\sschema\scontains\san\sinvocation\sof\sa\scurrently\sunregistered\saggregate\swith\sa\sFILTER\sclause.
+D 2019-07-22T11:38:43.410
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -520,7 +520,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 df149546faab3dca0549d3c16abb07fae57126e1394f40ec7cd9129becee6b4e
+F src/resolve.c 844e5d127f2a3f3e1992b3571b0c710cdbcdccdd7e216930f3cf2e685675e4fe
 F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
 F src/select.c c4b4fe44df6bcf32b693267ae9ec68e1c25f9a29d4a17afebd287d4af2f5fb51
 F src/shell.c.in a571d51dd7605b34796e9942dce0e895156d1860383faf6aaca3c88b08fe2a43
@@ -632,7 +632,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 b20c9c42316d478817878acc9954b67b539ef444059a8acfa52ae6238b6fee29
+F test/altertab3.test 8e6db08ed61aab2ca2d2f19608ba9d4dcade669b057e581588d3aa0a6d642e27
 F test/amatch1.test b5ae7065f042b7f4c1c922933f4700add50cdb9f
 F test/analyze.test 7168c8bffa5d5cbc53c05b7e9c7fcdd24b365a1bc5046ce80c45efa3c02e6b7c
 F test/analyze3.test ff62d9029e6deb2c914490c6b00caf7fae47cc85cdc046e4a0d0a4d4b87c71d8
@@ -1837,7 +1837,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 4e34e3615ff31f4a6432033797b2e1a6604007ea0e501d714ecb362632776150
-R d8a423d78b6859d967916f59be3f03d7
-U drh
-Z df8d1caa448f0c0227a80eae9d88cd51
+P 2bf5a4c16457562dc942bcc6ec06d9b4e795ef3ea8e31550e18857bbebd08a76
+R e8003e9b2b1103083ec3c473a6e857e0
+U dan
+Z 52b0d7cc4076423a4b21fd3826ccf54b

diff --git a/manifest.uuid b/manifest.uuid
index 71f68e41c15ee61c6b032cab574b1305286266fb..0274e913840ea5078045ad9b977fef844702a6d6 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2bf5a4c16457562dc942bcc6ec06d9b4e795ef3ea8e31550e18857bbebd08a76
\ No newline at end of file
+bd37ce3fb8dee8d538f6afc0bfc13cdc3ebdd504e6461f0130c6ecc8af585f68
\ No newline at end of file

diff --git a/src/resolve.c b/src/resolve.c
index 87020486eaa9d563b639b88eefb0855a4bb9e650..be6430debd12b1fb660bb5d9f4456ab2a4cf3284 100644 (file)
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -892,7 +892,7 @@ static int resolveExprStep(Walker *pWalker, Expr *pExpr){
         }
       }
 #ifndef SQLITE_OMIT_WINDOWFUNC
-      else if( pWin ){
+      else if( ExprHasProperty(pExpr, EP_WinFunc) ){
         is_agg = 1;
       }
 #endif

diff --git a/test/altertab3.test b/test/altertab3.test
index 7db3d35ea45d1651206706224edbbe790671d9d1..8a275ebc31b2cc5f7c2df8285217a1609719a596 100644 (file)
--- a/test/altertab3.test
+++ b/test/altertab3.test
@@ -331,4 +331,19 @@ do_execsql_test 13.2 {
   ALTER TABLE t1 RENAME TO t1x;
 }
 
+#-------------------------------------------------------------------------
+reset_db
+do_execsql_test 14.1 {
+  CREATE TABLE t1(a);
+  CREATE TABLE t2(b);
+  CREATE TRIGGER AFTER INSERT ON t1 BEGIN
+    SELECT sum() FILTER (WHERE (SELECT sum() FILTER (WHERE 0)) AND a);
+  END;
+}
+
+do_catchsql_test 14.2 {
+  ALTER TABLE t1 RENAME TO t1x;
+} {1 {error in trigger AFTER: no such column: a}}
+
 finish_test
+