Fix a problem with processing CTEs that use a WINDOW clause.

FossilOrigin-Name: ca564d4b5b19fe56842a04f31bb61352e6ae9d72a7e7634eb27ebcf5f670545a

diff --git a/manifest b/manifest
index d1eb00a7914afa180d6ddb795346cfcc839f1c13..3e4365572adeff77bf045665b166b01d0b15105c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\s--no-rowids\soption\sto\sthe\s".recover"\scommand.
-D 2019-09-14T16:44:51.726
+C Fix\sa\sproblem\swith\sprocessing\sCTEs\sthat\suse\sa\sWINDOW\sclause.
+D 2019-09-16T05:34:08.899
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -615,7 +615,7 @@ F src/where.c 9685d5988b79b93ebbe46941fbdb60d14861bb0fe3f9126117ef1753acc69b64
 F src/whereInt.h 2c6bae136a7c0be6ff75dc36950d1968c67d005c8e51d7a9d77cb996bb4843d9
 F src/wherecode.c 535c8e228478fd971b9a5b6cb6773995b0fbf7020d5989508a5094ce5b8cd95b
 F src/whereexpr.c b3bbae199e7acd8d0fa822c9a29cbb822ef2b3d84d68de55a3d60b013f5d5da4
-F src/window.c 2a10191a3ec7dd3422f8c77dac423d0e55019dee9efe319613ebd0f02b98991e
+F src/window.c bf055d1baec203de508c9d7ed3ac20146d5551518f2f77009f781876b8d0fdd5
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/affinity2.test da465d3d490ab24ef64f7715b5953343a4967762b9350b29eb1462879ff3fb9e
 F test/affinity3.test 6a101af2fc945ce2912f6fe54dd646018551710d
@@ -1719,7 +1719,7 @@ F test/window8.tcl f2711aa3571e4e6b0dad98db8d95fd6cb8d9db0c92bbdf535f153b07606a1
 F test/window8.test c4331b27a6f66d69fa8f8bab10cc731db1a81d293ae108a68f7c3487fa94e65b
 F test/window9.test 20a6b590be718b6bc98a5356d4396d6cdf19329c547da084fa225b92d68e1693
 F test/windowA.test 6d63dc1260daa17141a55007600581778523a8b420629f1282d2acfc36af23be
-F test/windowB.test af8f3b0a24cc5e7f296e13ef4d312391427d95ace391e248120e1fb90226c3b2
+F test/windowB.test be2ecc1298021e87eef375af35906288cc929fc21f2651139f7dd50a5844b120
 F test/windowerr.tcl f5acd6fbc210d7b5546c0e879d157888455cd4a17a1d3f28f07c1c8a387019e0
 F test/windowerr.test a8b752402109c15aa1c5efe1b93ccb0ce1ef84fa964ae1cd6684dd0b3cc1819b
 F test/windowfault.test a90b397837209f15e54afa62e8be39b2759a0101fae04e05a08bcc50e243a452
@@ -1843,7 +1843,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 3dbed162518a73213bbfb137c763064518fdc2daeae3952cfab39ce0e6813d3f
-R 893a8c502e7609a361861540de405b55
+P 01d71b947a7422081d5c7d6ac2c91b9c936dc41926ab58c92f4a088a64e8c051
+R c92814bccf2f0531ff265b831a716091
 U dan
-Z 284f9491bb2c84cd052f56239d66ee3a
+Z cfe2dcdda6abe970278e2187a7ab525e

diff --git a/manifest.uuid b/manifest.uuid
index ba52a328a7aa602f30d165e3c8adf502f6dc940c..177b32dc78a4e7a8cf0a6be322cf442b82ee6383 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-01d71b947a7422081d5c7d6ac2c91b9c936dc41926ab58c92f4a088a64e8c051
\ No newline at end of file
+ca564d4b5b19fe56842a04f31bb61352e6ae9d72a7e7634eb27ebcf5f670545a
\ No newline at end of file

diff --git a/src/window.c b/src/window.c
index 15f38ee006b52d47789b488f2117f26fdd795481..0fb8eb461d6b6d6e22ac25b2c55c3487c1291dc2 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -2215,6 +2215,7 @@ Window *sqlite3WindowDup(sqlite3 *db, Expr *pOwner, Window *p){
     pNew = sqlite3DbMallocZero(db, sizeof(Window));
     if( pNew ){
       pNew->zName = sqlite3DbStrDup(db, p->zName);
+      pNew->zBase = sqlite3DbStrDup(db, p->zBase);
       pNew->pFilter = sqlite3ExprDup(db, p->pFilter, 0);
       pNew->pFunc = p->pFunc;
       pNew->pPartition = sqlite3ExprListDup(db, p->pPartition, 0);
@@ -2227,6 +2228,7 @@ Window *sqlite3WindowDup(sqlite3 *db, Expr *pOwner, Window *p){
       pNew->pStart = sqlite3ExprDup(db, p->pStart, 0);
       pNew->pEnd = sqlite3ExprDup(db, p->pEnd, 0);
       pNew->pOwner = pOwner;
+      pNew->bImplicitFrame = p->bImplicitFrame;
     }
   }
   return pNew;

diff --git a/test/windowB.test b/test/windowB.test
index fcefbd4e85a366d40fdbd7c747f657cb009a65a1..d28ee0da19b85e582bd7a2144362299d6ddf663e 100644 (file)
--- a/test/windowB.test
+++ b/test/windowB.test
@@ -202,4 +202,32 @@ ifcapable json1 {
   }
 }
 
+#-------------------------------------------------------------------------
+reset_db
+do_execsql_test 4.0 {
+  CREATE TABLE x(a);
+  INSERT INTO x VALUES(1);
+  INSERT INTO x VALUES(2);
+}
+
+do_execsql_test 4.1 {
+  WITH y AS (
+      SELECT Row_Number() OVER (win) FROM x WINDOW win AS (PARTITION BY a)
+  )
+  SELECT * FROM y;
+} {
+  1 1
+}
+
+do_catchsql_test 4.2 {
+  WITH y AS (
+    SELECT Row_Number() OVER (win) FROM x WINDOW win AS (PARTITION
+  BY fake_column))
+  SELECT * FROM y;
+} {1 {no such column: fake_column}}
+
+do_catchsql_test 4.3 {
+  SELECT 1 WINDOW win AS (PARTITION BY fake_column);
+} {0 1}
+
 finish_test