From 997d7434b7688f9fbd48fdacdbf1769e2f4cccbe Mon Sep 17 00:00:00 2001
From: dan <dan@noemail.net>
Date: Sat, 28 Dec 2019 18:25:51 +0000
Subject: [PATCH] Do not attempt to flatten compound sub-queries in a FROM
 clause into the parent if any component of the sub-query uses a window
 function.

FossilOrigin-Name: eeb76f621de2f930a548db0fbb9fe25b4479b73581826b8dfa2e63cd1f1ab783
---
 manifest          | 14 +++++++-------
 manifest.uuid     |  2 +-
 src/select.c      |  2 ++
 test/window1.test | 15 +++++++++++++++
 4 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/manifest b/manifest
index 2fbed9f1d1..5dde30505a 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Change\san\sassert()\sin\swhere.c\sto\sa\stestcase()\smacro,\ssince\sthe\scondition\smay\sbe\sfalse.\sThis\swas\sa\sproblem\swith\sthe\sassert()\sonly,\sthere\sis\sno\sbug\sin\srelease\sbuilds\sthat\somit\sassert().
-D 2019-12-28T18:08:39.531
+C Do\snot\sattempt\sto\sflatten\scompound\ssub-queries\sin\sa\sFROM\sclause\sinto\sthe\sparent\sif\sany\scomponent\sof\sthe\ssub-query\suses\sa\swindow\sfunction.
+D 2019-12-28T18:25:51.300
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -528,7 +528,7 @@ F src/printf.c 9be6945837c839ba57837b4bc3af349eba630920fa5532aa518816defe42a7d4
 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c e231da7dd307f99772c40e76096abaf05c6fedcb4f1f045de23a61c194df6da6
 F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
-F src/select.c e18a64e8d9f468ce9c183ab27ad79658b2aad8128e0dcfcd0c5dfe0132fc1074
+F src/select.c dafb9d298e231a58365074215920431956ca606cd2bcda682b4d3d3e93d4327b
 F src/shell.c.in 4a3a9e1c11847b1904f2b01d087af1c052f660902755abab457cab1756817ded
 F src/sqlite.h.in 2a23e8161775253d9cf383c2c6aa559005dc787d350dcb0be67a6c4cc3bd1d19
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -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 caf402a9726a7cbc84106c3d3ba833bbff5ae00223d61c02936bf63049564318
+F test/window1.test cd6e2dafaa14ae26c995547013a9765356d910f473664497c926ea3f47510997
 F test/window2.tcl 492c125fa550cda1dd3555768a2303b3effbeceee215293adf8871efc25f1476
 F test/window2.test e466a88bd626d66edc3d352d7d7e1d5531e0079b549ba44efb029d1fbff9fd3c
 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 9421b442cad9858ec21050c106aa935a1c0723ab08ef9a867a79638b040b6e68
-R e9385abc46897bbfbfbfbc6bfbcfd8c7
+P 82be135dee7ccfde5f8a67f3621b7ced449dce89bae9cadf025154a4de848c11
+R 689fc9af6e2b279bc6d7fd22df0aa0f5
 U dan
-Z 8385698bc4652e7f942fce6214733907
+Z 819583b2c969ec1f752f2ef5cdcbf2f5
diff --git a/manifest.uuid b/manifest.uuid
index f86444f188..d61ccdd153 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-82be135dee7ccfde5f8a67f3621b7ced449dce89bae9cadf025154a4de848c11
\ No newline at end of file
+eeb76f621de2f930a548db0fbb9fe25b4479b73581826b8dfa2e63cd1f1ab783
\ No newline at end of file
diff --git a/src/select.c b/src/select.c
index 6298e331f8..327027f02c 100644
--- a/src/select.c
+++ b/src/select.c
@@ -3669,6 +3669,7 @@ static void substSelect(
 **              (17d1) aggregate, or
 **              (17d2) DISTINCT, or
 **              (17d3) a join.
+**        (17e) the subquery may not contain window functions
 **
 **        The parent and sub-query may contain WHERE clauses. Subject to
 **        rules (11), (13) and (14), they may also contain ORDER BY,
@@ -3853,6 +3854,7 @@ static int flattenSubquery(
       if( (pSub1->selFlags & (SF_Distinct|SF_Aggregate))!=0    /* (17b) */
        || (pSub1->pPrior && pSub1->op!=TK_ALL)                 /* (17a) */
        || pSub1->pSrc->nSrc<1                                  /* (17c) */
+       || pSub1->pWin                                          /* (17d) */
       ){
         return 0;
       }
diff --git a/test/window1.test b/test/window1.test
index 60c23dbda9..0b7884784f 100644
--- a/test/window1.test
+++ b/test/window1.test
@@ -1516,4 +1516,19 @@ do_execsql_test 44.4.2 {
   SELECT (0, 1) IN(SELECT MIN(c0), NTILE(1) OVER()) FROM t0;
 } {1}
 
+#-------------------------------------------------------------------------
+reset_db
+do_execsql_test 45.1 {
+  CREATE TABLE t0(x);
+  CREATE TABLE t1(a);
+  INSERT INTO t1 VALUES(1000);
+  INSERT INTO t1 VALUES(1000);
+  INSERT INTO t0 VALUES(10000);
+}
+do_execsql_test 45.2 {
+  SELECT * FROM (
+      SELECT sum (a) OVER() FROM t1 UNION ALL SELECT x FROM t0
+  );
+} {2000 2000 10000}
+
 finish_test
-- 
2.47.2