When determining if an aggregate within a sub-query should be processed as part of...

FossilOrigin-Name: 1ffc045d2bbeeda9c13a3a3585538ff6434fc852b0ae6679d3c8b9f606bf92e6

diff --git a/manifest b/manifest
index 9f9d3377cc61c041ab72ed92ad2637c1897dfb72..37b0cb1b86dafc471d3f540efcc5d3a046057544 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Ensure\sthat\sthe\sPager.changeCountDone\sflag\sis\scleared\swhenever\sdropping\nthe\swrite\slock,\seven\swhen\stransitioning\sfrom\sEXCLUSIVE\slocking\smode\sinto\nNORMAL\slocking\smode\swhile\sin\sWAL\smode.\s\sTicket\s[fb3b3024ea238d5c].
-D 2019-12-27T01:50:46.455
+C When\sdetermining\sif\san\saggregate\swithin\sa\ssub-query\sshould\sbe\sprocessed\sas\spart\sof\sthe\ssub-query\sor\san\souter\squery,\sconsider\sany\sFILTER\sclause\sin\sthe\ssame\sway\sas\sthe\sarguments\sto\sthe\saggregate.
+D 2019-12-27T08:57:08.228
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -480,7 +480,7 @@ F src/date.c e1d8ac7102f3f283e63e13867acb0efa33861cf34f0faf4cdbaf9fa7a1eb7041
 F src/dbpage.c 135eb3b5e74f9ef74bde5cec2571192c90c86984fa534c88bf4a055076fa19b7
 F src/dbstat.c 6c407e549406c10fde9ac3987f6d734459205239ad370369bc5fcd683084a4fa
 F src/delete.c a5c59b9c0251cf7682bc52af0d64f09b1aefc6781a63592c8f1136f7b73c66e4
-F src/expr.c 3a27de3630d2dec266423505f1ad38484096df4b6d80cf5c90076340d6b2b810
+F src/expr.c a01bfcf51be41214319d30abfcdc2a1b4fd0291b5e2a4deeb1f509cc06d59c2c
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 92a248ec0fa4ed8ab60c98d9b188ce173aaf218f32e7737ba77deb2a684f9847
 F src/func.c ed33e38cd642058182a31a3f518f2e34f4bbe53aa483335705c153c4d3e50b12
@@ -862,7 +862,7 @@ F test/extraquick.test cb254400bd42bfb777ff675356aabf3287978f79
 F test/fallocate.test 37a62e396a68eeede8f8d2ecf23573a80faceb630788d314d0a073d862616717
 F test/filectrl.test 6e871c2d35dead1d9a88e176e8d2ca094fec6bb3
 F test/filefmt.test f393e80c4b8d493b7a7f8f3809a8425bbf4292af1f5140f01cb1427798a2bbd4
-F test/filter1.test fe7fcfeff48ca399fbc9577f55b60c8be8ccfdffc5e3b4ace21dc3c3e59f0f6a
+F test/filter1.test 8a6f047a000ef391db2ca17b6beecc0006f4e0f9ca8bbe272b2443c7316e66b1
 F test/filter2.tcl 44e525497ce07382915f01bd29ffd0fa49dab3adb87253b5e5103ba8f93393e8
 F test/filter2.test 485cf95d1f6d6ceee5632201ca52a71868599836f430cdee42e5f7f14666e30a
 F test/filterfault.test c08fb491d698e8df6c122c98f7db1c65ffcfcad2c1ab0e07fa8a5be1b34eaa8b
@@ -1714,7 +1714,7 @@ F test/win32heap.test 10fd891266bd00af68671e702317726375e5407561d859be1aa04696f2
 F test/win32lock.test fbf107c91d8f5512be5a5b87c4c42ab9fdd54972
 F test/win32longpath.test 169c75a3b2e43481f4a62122510210c67b08f26d
 F test/win32nolock.test ac4f08811a562e45a5755e661f45ca85892bdbbc
-F test/window1.test 7968f1baa13e4f4399a65a21ae9c324a073c28c684adcda2ddf1ea25741d1faa
+F test/window1.test 7619f715b551abce33397bfb4e50bcb7fc1f49824c0433aacd53e678a1f0153d
 F test/window2.tcl 114b217d4ffff891142023cc5f3131b0dae3ad149ac4b45a6ed9e2ad943f8ce2
 F test/window2.test dea2ffecb7182a385143ea0eb368b6241ee43c5f971f4ad1c4337029cb1fc10a
 F test/window3.tcl acea6e86a4324a210fd608d06741010ca83ded9fde438341cb978c49928faf03
@@ -1853,7 +1853,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 465a15c5c2077011befa854a77f9d295bb751ef20b7d2937ac0ba47cc84587c9
-R e34584efe34ddbc0b2a2a75619a185e2
-U drh
-Z bd3a4faab409dc918cd96dcd50ae34d6
+P 846b1de6e5a9e418f225273dc033234c64c116fcd89c8261522b4902c248451f
+R a028f2ca6cbb3cdf8afd64108610da66
+U dan
+Z 229bcd629c79f0e2caa144fb8641d19d

diff --git a/manifest.uuid b/manifest.uuid
index 742935557080f7655fe23a7ffd96100ad90cb287..e2bdf7e08ee15ac6657f15f3c2b60c11a5792ed2 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-846b1de6e5a9e418f225273dc033234c64c116fcd89c8261522b4902c248451f
\ No newline at end of file
+1ffc045d2bbeeda9c13a3a3585538ff6434fc852b0ae6679d3c8b9f606bf92e6
\ No newline at end of file

diff --git a/src/expr.c b/src/expr.c
index 7901608d2d942efe8a11ec9347154965998f4491..92786732f9eb7ddb04c8e23c478aab6d87a34049 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -5492,6 +5492,11 @@ int sqlite3FunctionUsesThisSrc(Expr *pExpr, SrcList *pSrcList){
   cnt.nThis = 0;
   cnt.nOther = 0;
   sqlite3WalkExprList(&w, pExpr->x.pList);
+#ifndef SQLITE_OMIT_WINDOWFUNC
+  if( ExprHasProperty(pExpr, EP_WinFunc) ){
+    sqlite3WalkExpr(&w, pExpr->y.pWin->pFilter);
+  }
+#endif
   return cnt.nThis>0 || cnt.nOther==0;
 }
 

diff --git a/test/filter1.test b/test/filter1.test
index eb50963470bb76e1ce97870d552a7e767583f131..ee17099d99aa3e0ebf42f5ed4a9a2a0ee4e76d6b 100644 (file)
--- a/test/filter1.test
+++ b/test/filter1.test
@@ -184,4 +184,24 @@ do_execsql_test 5.3 {
   SELECT count(*) FILTER (WHERE b>2) OVER (ORDER BY b) FROM (SELECT * FROM t1) 
 } {0 1}
 
+#-------------------------------------------------------------------------
+reset_db
+do_execsql_test 6.0 {
+  CREATE TABLE t1(a,b);
+  INSERT INTO t1 VALUES(1,1);
+  INSERT INTO t1 VALUES(2,2);
+  CREATE TABLE t2(x,y);
+  INSERT INTO t2 VALUES(1,1);
+}
+
+do_execsql_test 6.1 {
+  SELECT (SELECT COUNT(a) FILTER(WHERE x) FROM t2) FROM t1;
+} {1 1}
+do_execsql_test 6.2 {
+  SELECT (SELECT COUNT(a+x) FROM t2) FROM t1;
+} {1 1}
+do_execsql_test 6.3 {
+  SELECT (SELECT COUNT(a) FROM t2) FROM t1;
+} {2}
+
 finish_test

diff --git a/test/window1.test b/test/window1.test
index 4249a58e83d102490c7fd61722232b4511686634..3797c0c6d8293e67153185d9842586a01b314da3 100644 (file)
--- a/test/window1.test
+++ b/test/window1.test
@@ -1333,19 +1333,19 @@ do_execsql_test 37.20 {
 # in a join.
 #
 reset_db
-do_execsql_test 38.10 {
+do_catchsql_test 38.10 {
   CREATE TABLE t0(c0);
   CREATE TABLE t1(c0, c1 UNIQUE);
   INSERT INTO t0(c0) VALUES(1);
   INSERT INTO t1(c0,c1) VALUES(2,3);
   SELECT COUNT(*) FROM t0, t1 WHERE (SELECT AVG(0) FILTER(WHERE t1.c1));
-} {0}
+} {1 {misuse of aggregate: AVG()}}
 do_execsql_test 38.20 {
   SELECT COUNT(*), AVG(1) FILTER(WHERE t1.c1) FROM t0, t1;
 } {1 1.0}
-do_execsql_test 38.30 {
+do_catchsql_test 38.30 {
   SELECT COUNT(*) FROM t0, t1 WHERE (SELECT AVG(1) FILTER(WHERE t1.c1));
-} {1}
+} {1 {misuse of aggregate: AVG()}}
 
 reset_db
 do_execsql_test 39.1 {