Ensure that the "push-down" optimization does not push constraints down into compound...

FossilOrigin-Name: d31850fe50420cb0d2c48f19741b889700c52d0d0273967eb4b81571a4ee63a7

diff --git a/manifest b/manifest
index de005e09edf68c045e12c0ffb3d59b04ca5b188d..0cb3ae727e9787b4461bebdd295be5a7f3260ace 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Disable\sAggInfo\sconsistency\schecks\swhen\sunwinding\safter\san\sOOM.
-D 2020-06-10T11:01:21.457
+C Ensure\sthat\sthe\s"push-down"\soptimization\sdoes\snot\spush\sconstraints\sdown\sinto\scompound\squeries\sif\sany\sof\sthe\scomponent\squeries\suses\swindow\sfunctions.
+D 2020-06-10T11:01:58.755
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -533,7 +533,7 @@ F src/printf.c 94b5419ad0a17269f76a9e968ca19cf9fa37617abed2e246fc48844e511b6bc6
 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c c2008519a0654f1e7490e9281ed0397d0f14bb840d81f0b96946248afcbdb25d
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
-F src/select.c fbdbf6d55e0095ed000332615226c0e31ffb656412304b7f03c17f5788e79f00
+F src/select.c 62ad2c28c17f1a4301655b25b5f786bf3f06c03e26467ed3bb806fa4d76dde52
 F src/shell.c.in cf2d24f54412c06e5fb34af7fabc748651125e1dceac29b740e91f06d23447b6
 F src/sqlite.h.in 74342b41e9d68ff9e56b192009046f8dd0aa2bd76ce1a588f330de614ba61de7
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -1727,7 +1727,7 @@ F test/win32heap.test 10fd891266bd00af68671e702317726375e5407561d859be1aa04696f2
 F test/win32lock.test fbf107c91d8f5512be5a5b87c4c42ab9fdd54972
 F test/win32longpath.test 4baffc3acb2e5188a5e3a895b2b543ed09e62f7c72d713c1feebf76222fe9976
 F test/win32nolock.test ac4f08811a562e45a5755e661f45ca85892bdbbc
-F test/window1.test 49f81c25c065fd65b64cd2aaa96f20199fd5d8f847dd1c8151cfccae2aeae83f
+F test/window1.test 486f0e01310fc7d98e626cdcb3806582c17cb0afaf1f3ec0f58ba8619c38f5ae
 F test/window2.tcl 492c125fa550cda1dd3555768a2303b3effbeceee215293adf8871efc25f1476
 F test/window2.test e466a88bd626d66edc3d352d7d7e1d5531e0079b549ba44efb029d1fbff9fd3c
 F test/window3.tcl acea6e86a4324a210fd608d06741010ca83ded9fde438341cb978c49928faf03
@@ -1866,8 +1866,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 a376ec6942734e5d35c6a2c07bde9010ed4b56e412623e2121efd76017595a4f
-Q +65179814aa0ae5927bae97c10ef20f290535399b889d96d5b88931f62635f212
-R f9c919e6988b11f7b4a2a1403ad4d52a
+P 7e2833fb2be8e7df5b25b8db73aed60ec81780bbd3e4f11a43b5eacbd5bd01a7
+Q +094dcfe779613301521e8bb990432df187b3686add75a3420b4a193f02f3467f
+R 9454a807e31316909ba248e12e498e73
 U dan
-Z 4b02b602e3397cbbcf09a15e5159d1d0
+Z bdd9d69ac053dbc3f361f19e896ab22a

diff --git a/manifest.uuid b/manifest.uuid
index a2ef26a6bf728954a9baa9ccc0b98eab27c8528b..95150959c1bab855c04fadeaa890b37ada13c186 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7e2833fb2be8e7df5b25b8db73aed60ec81780bbd3e4f11a43b5eacbd5bd01a7
\ No newline at end of file
+d31850fe50420cb0d2c48f19741b889700c52d0d0273967eb4b81571a4ee63a7
\ No newline at end of file

diff --git a/src/select.c b/src/select.c
index ad8f5bec8c03337e6f5017ddf6c86584b1a2b295..738db131bfbe989640881f56b0ddd41672955efb 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -4429,11 +4429,14 @@ static int pushDownWhereTerms(
 ){
   Expr *pNew;
   int nChng = 0;
+  Select *pSel;
   if( pWhere==0 ) return 0;
   if( pSubq->selFlags & SF_Recursive ) return 0;  /* restriction (2) */
 
 #ifndef SQLITE_OMIT_WINDOWFUNC
-  if( pSubq->pWin ) return 0;    /* restriction (6) */
+  for(pSel=pSubq; pSel; pSel=pSel->pPrior){
+    if( pSel->pWin ) return 0;    /* restriction (6) */
+  }
 #endif
 
 #ifdef SQLITE_DEBUG

diff --git a/test/window1.test b/test/window1.test
index 3336a613ab887541d964e8debcbfa8805a4b3db7..ea5b66459e98f784d2f31af9fb6e66f44da4c400 100644 (file)
--- a/test/window1.test
+++ b/test/window1.test
@@ -1756,7 +1756,7 @@ do_catchsql_test 54.2 {
       UNION
     SELECT b AS c FROM t1
   ) WHERE c>10;
-} {1 {misuse of window function sum()}}
+} {0 {}}
 
 do_execsql_test 54.3 {
   INSERT INTO t1 VALUES('2',5.0);
@@ -1769,7 +1769,7 @@ do_catchsql_test 54.4 {
       UNION
     SELECT b AS c FROM t1
   ) WHERE c>10;
-} {1 {misuse of window function sum()}}
+} {0 {15.0 30.0}}
 
 # 2020-06-05 ticket c8d3b9f0a750a529
 reset_db
@@ -1889,4 +1889,32 @@ INSERT INTO t1 VALUES(5),(NULL),('seventeen');
 SELECT (SELECT max(x)OVER(ORDER BY x) % min(x)OVER(ORDER BY CASE x WHEN 889 THEN x WHEN x THEN x END)) FROM (SELECT (SELECT sum(CAST(a IN(SELECT (SELECT max(x)OVER(ORDER BY CASE x WHEN 889 THEN 299 WHEN 863 THEN 863 END)) FROM (SELECT (SELECT sum(CAST((SELECT (SELECT max(x)OVER(ORDER BY x) / min(x)OVER(ORDER BY CASE x WHEN 889 THEN 299 WHEN -true THEN 863 END)) FROM (SELECT (SELECT sum(CAST(a IN(SELECT (SELECT max(x) & sum ( a )OVER(ORDER BY CASE x WHEN -8 THEN 299 WHEN 863 THEN 863 END)) FROM (SELECT (SELECT sum(CAST(a AS )) FROM t1) AS x FROM t1)) AS t1 )) FROM t1) AS x FROM t1)) AS x )) FROM t1) AS x FROM t1)) AS real)) FROM t1) AS x FROM t1);
 } {{} {} {}}
 
+#-------------------------------------------------------------------------
+reset_db
+do_execsql_test 62.1 {
+  CREATE TABLE t1(a VARCHAR(20), b FLOAT);
+  INSERT INTO t1 VALUES('1',10.0);
+}
+
+do_execsql_test 62.2 {
+  SELECT * FROM ( 
+      SELECT sum(b) OVER() AS c FROM t1 
+      UNION
+      SELECT b AS c FROM t1
+      ) WHERE c>10;
+}
+
+do_execsql_test 62.3 {
+  INSERT INTO t1 VALUES('2',5.0);
+  INSERT INTO t1 VALUES('3',15.0);
+}
+
+do_execsql_test 62.4 {
+  SELECT * FROM ( 
+      SELECT sum(b) OVER() AS c FROM t1 
+      UNION
+      SELECT b AS c FROM t1
+      ) WHERE c>10;
+} {15.0 30.0}
+
 finish_test