Fix handling of window functions in aggregate queries that have no GROUP BY clause. Also remove a faulty assert causing the error reported in [618156e3].

FossilOrigin-Name: 38e3dd389d142e520c71139ec84aa3c7722992af28a5f93a7f16e0ea176b74bb

7 files changed, 77 insertions, 13 deletions

diff --git a/manifest b/manifest
index 7846ab258..33968d93c 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C At\sthe\send\sof\sthe\sright-hand\stable\sloop\sof\sa\sLEFT\sJOIN\sthat\suses\san\sIN\noperator\sin\sthe\sON\sclause,\sput\sthe\sOP_IfNoHope\soperator\safter\sthe\nOP_IfNotOpen\soperator,\snot\sbefore,\sto\savoid\sa\s(harmless)\suninitialized\nregister\sreference.\s\sTicket\s[82b588d342d515d1]
-D 2020-03-16T03:07:53.840
+C Fix\shandling\sof\swindow\sfunctions\sin\saggregate\squeries\sthat\shave\sno\sGROUP\sBY\sclause.\sAlso\sremove\sa\sfaulty\sassert\scausing\sthe\serror\sreported\sin\s[618156e3].
+D 2020-03-16T18:52:53.584
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -531,7 +531,7 @@ F src/printf.c 9be6945837c839ba57837b4bc3af349eba630920fa5532aa518816defe42a7d4
 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c 38e3a5636f5bdc92e3683e4cafbba6418c0aa15e0d89ca5b28bd0b621dbb80bf
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
-F src/select.c c94eec317c8ba929bc228392eb3cac8124f2d0fbe3fc1bddecb44dfc7057bc78
+F src/select.c 49d46acea0e69311aa891e18253973d63e81da2a9c135924bc827856d33872ad
 F src/shell.c.in f76590931c0cbbfef347f44f81ade6b335f80c46bc6e59b8b6114383a8df30e0
 F src/sqlite.h.in 802957feeb249ede54f8dfe99b72aa19e70a0b7737969c46e625dc2f9f2d42b0
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -621,7 +621,7 @@ F src/where.c 9546c82056e8cdb27291f98cf1adca5d271240b399bb97b32f77fc2bea6146c9
 F src/whereInt.h 6b874aa15f94e43a2cec1080be64d955b04deeafeac90ffb5d6975c0d511be3c
 F src/wherecode.c 7b939de85d65cc4b4bfa197513136b9e0ae03167e3b82842ca5a0ba1055ba65d
 F src/whereexpr.c 264d58971eaf8256eb5b0917bcd7fc7a1f1109fdda183a8382308a1b18a2dce7
-F src/window.c 0b824edbab94e473d0ade203645798ce80358d0c89ff6ac0ba0f7e2768543319
+F src/window.c ba1ffb78d73c5831433681aab7ee634230ee32f14ad508efa585044662141d5a
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/affinity2.test ce1aafc86e110685b324e9a763eab4f2a73f737842ec3b687bd965867de90627
 F test/affinity3.test 6a101af2fc945ce2912f6fe54dd646018551710d
@@ -1726,15 +1726,15 @@ F test/window2.tcl 492c125fa550cda1dd3555768a2303b3effbeceee215293adf8871efc25f1
 F test/window2.test e466a88bd626d66edc3d352d7d7e1d5531e0079b549ba44efb029d1fbff9fd3c
 F test/window3.tcl acea6e86a4324a210fd608d06741010ca83ded9fde438341cb978c49928faf03
 F test/window3.test e9959a993c8a71e96433be8daaa1827d78b8921e4f12debd7bdbeb3c856ef3cb
-F test/window4.tcl d732df0e81beedc0ba8a563ade68611d322d27303ad0c0c8e4444107c39e84ec
-F test/window4.test 807f3e6b15f9338e5b9742b87c5c7ca825b42b9657fde6096e890119370848e0
+F test/window4.tcl 6f85307eb67242b654d051f7da32a996a66aee039a09c5ae358541aa61720742
+F test/window4.test fbead87f681400ac07ef3555e0488b544a47d35491f8bf09a7474b6f76ce9b4e
 F test/window5.test d328dd18221217c49c144181975eea17339eaeaf0e9aa558cee3afb84652821e
 F test/window6.test f8d674254b23289cc17c84d79dec7eda7caa1dfb7836c43122cfdf3640d1df32
 F test/window7.tcl 6a1210f05d40ec89c22960213a22cd3f98d4e2f2eb20646c83c8c30d4d76108f
 F test/window7.test 1d31276961ae7801edc72173edaf7593e3cbc79c06d1f1f09e20d8418af403cd
 F test/window8.tcl f2711aa3571e4e6b0dad98db8d95fd6cb8d9db0c92bbdf535f153b07606a1ce2
 F test/window8.test c4331b27a6f66d69fa8f8bab10cc731db1a81d293ae108a68f7c3487fa94e65b
-F test/window9.test b63f6f74d730547e63e78946f951f5d1a7d4e99f91f6d5906305469043d92a15
+F test/window9.test c22c25377c820613e1842fe7ad4af7c03df625f6a7caee99e6fdb4fcd52e0a8b
 F test/windowA.test 6d63dc1260daa17141a55007600581778523a8b420629f1282d2acfc36af23be
 F test/windowB.test 7a983ea1cc1cf72be7f378e4b32f6cb2d73014c5cd8b25aaee825164cd4269e5
 F test/windowerr.tcl f5acd6fbc210d7b5546c0e879d157888455cd4a17a1d3f28f07c1c8a387019e0
@@ -1860,7 +1860,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 ea914bec81c49625072fc9d23faa048300f3a0421e069d303b7203edcdfb3743
-R b1b65d980d2d4656e7b02420f8df636b
-U drh
-Z 811ca3b054e19d2372fac6c1a58bfc2f
+P 8b437b47266ec2d80d85eafcfdd6949556d6c28d9d67d5f43d89799f0f5b7bd0
+R 83896a738442d3613c6ebca4ec841bd3
+U dan
+Z 2f006c28af39fb0df1c35af9d6bf5ad5
diff --git a/manifest.uuid b/manifest.uuid
index a26ea9cda..8afdae801 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8b437b47266ec2d80d85eafcfdd6949556d6c28d9d67d5f43d89799f0f5b7bd0
\ No newline at end of file
+38e3dd389d142e520c71139ec84aa3c7722992af28a5f93a7f16e0ea176b74bb
\ No newline at end of file
diff --git a/src/select.c b/src/select.c
index a9ec1e852..3128d482a 100644
--- a/src/select.c
+++ b/src/select.c
@@ -103,7 +103,6 @@ static void clearSelect(sqlite3 *db, Select *p, int bFree){
     if( OK_IF_ALWAYS_TRUE(p->pWinDefn) ){
       sqlite3WindowListDelete(db, p->pWinDefn);
     }
-    assert( p->pWin==0 );
 #endif
     if( OK_IF_ALWAYS_TRUE(p->pWith) ) sqlite3WithDelete(db, p->pWith);
     if( bFree ) sqlite3DbFreeNN(db, p);
diff --git a/src/window.c b/src/window.c
index 3aafea543..db495d832 100644
--- a/src/window.c
+++ b/src/window.c
@@ -933,6 +933,7 @@ int sqlite3WindowRewrite(Parse *pParse, Select *p){
     Window *pMWin = p->pWin;      /* Master window object */
     Window *pWin;                 /* Window object iterator */
     Table *pTab;
+    u32 selFlags = p->selFlags;
 
     pTab = sqlite3DbMallocZero(db, sizeof(Table));
     if( pTab==0 ){
@@ -1022,6 +1023,7 @@ int sqlite3WindowRewrite(Parse *pParse, Select *p){
       sqlite3SrcListAssignCursors(pParse, p->pSrc);
       pSub->selFlags |= SF_Expanded;
       pTab2 = sqlite3ResultSetOfSelect(pParse, pSub, SQLITE_AFF_NONE);
+      pSub->selFlags |= (selFlags & SF_Aggregate);
       if( pTab2==0 ){
         /* Might actually be some other kind of error, but in that case
         ** pParse->nErr will be set, so if SQLITE_NOMEM is set, we will get
diff --git a/test/window4.tcl b/test/window4.tcl
index 1b2b2ef62..0b91d768a 100644
--- a/test/window4.tcl
+++ b/test/window4.tcl
@@ -385,6 +385,20 @@ execsql_test 11.4 {
   ) sub;
 }
 
+execsql_test 11.5 {
+  SELECT sum( min(t) ) OVER () FROM t8 GROUP BY total;
+}
+execsql_test 11.5 {
+  SELECT sum( max(t) ) OVER () FROM t8 GROUP BY total;
+}
+
+execsql_test 11.7 {
+  SELECT sum( min(t) ) OVER () FROM t8;
+}
+execsql_test 11.8 {
+  SELECT sum( max(t) ) OVER () FROM t8;
+}
+
 execsql_test 12.0 {
   DROP TABLE IF EXISTS t2;
   CREATE TABLE t2(a INTEGER);
diff --git a/test/window4.test b/test/window4.test
index 6951a2343..4194f7535 100644
--- a/test/window4.test
+++ b/test/window4.test
@@ -1324,6 +1324,22 @@ do_execsql_test 11.4 {
   ) sub;
 } {0   1   2}
 
+do_execsql_test 11.5 {
+  SELECT sum( min(t) ) OVER () FROM t8 GROUP BY total;
+} {5   5}
+
+do_execsql_test 11.5 {
+  SELECT sum( max(t) ) OVER () FROM t8 GROUP BY total;
+} {10   10}
+
+do_execsql_test 11.7 {
+  SELECT sum( min(t) ) OVER () FROM t8;
+} {0}
+
+do_execsql_test 11.8 {
+  SELECT sum( max(t) ) OVER () FROM t8;
+} {10}
+
 do_execsql_test 12.0 {
   DROP TABLE IF EXISTS t2;
   CREATE TABLE t2(a INTEGER);
diff --git a/test/window9.test b/test/window9.test
index adfeaba35..46d746c4f 100644
--- a/test/window9.test
+++ b/test/window9.test
@@ -232,4 +232,37 @@ do_execsql_test 7.4 {
   7.2 8.75 10.0 11.0 15.0
 }
 
+#-------------------------------------------------------------------------
+reset_db
+do_execsql_test 8.1.1 {
+  CREATE TABLE t1(a, b);
+  INSERT INTO t1 VALUES(1, 2), (3, 4);
+  SELECT min( sum(a) ) OVER () FROM t1;
+} {4}
+
+do_execsql_test 8.1.2 {
+  SELECT min( sum(a) ) OVER () FROM t1 GROUP BY a;
+} {1 1}
+
+do_execsql_test 8.2 {
+  CREATE VIEW v1 AS 
+    SELECT 0 AS x
+      UNION 
+    SELECT count() OVER() FROM (SELECT 0) 
+    ORDER BY 1
+  ;
+}
+
+do_catchsql_test 8.3 {
+  SELECT min( max((SELECT x FROM v1)) ) OVER()
+} {1 {misuse of aggregate: max()}}
+
+do_execsql_test 8.4 {
+  SELECT(
+      SELECT x UNION 
+      SELECT sum( avg((SELECT x FROM v1)) ) OVER()
+  )
+  FROM v1;
+} {0.0}
+
 finish_test