Fix a bug in the lead() and lag() window functions causing them to fail when

used in queries featuring multiple window functions.

FossilOrigin-Name: 3839fb18f917e4f705821198d624b19d84eb07f1ee29ad23314ab7cec6bf6a2b

diff --git a/manifest b/manifest
index 648c77643ce0103263f90d72f878361b6ba8781f..43e3c8eb82be4d9b2746a6529c647aefb8b90aee 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sproblem\swith\shandling\sof\sstatements\scontaining\stwo\sor\smore\sdifferent\nwindows.
-D 2018-06-14T20:52:08.656
+C Fix\sa\sbug\sin\sthe\slead()\sand\slag()\swindow\sfunctions\scausing\sthem\sto\sfail\swhen\nused\sin\squeries\sfeaturing\smultiple\swindow\sfunctions.
+D 2018-06-15T16:10:44.916
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 498b77b89a8cb42f2ee20fcd6317f279a45c0d6ff40d27825f94b69884c09bbe
@@ -583,7 +583,7 @@ F src/where.c 0bcbf9e191ca07f9ea2008aa80e70ded46bcdffd26560c83397da501f00aece6
 F src/whereInt.h b90ef9b9707ef750eab2a7a080c48fb4900315033274689def32d0cf5a81ebe4
 F src/wherecode.c 3317f2b083a66d3e65a03edf316ade4ccb0a99c9956273282ebb579b95d4ba96
 F src/whereexpr.c 19cf35cdd9bf6d5589d8a5c960d99259761136187a2319a6e14d11cf1abe14c2
-F src/window.c 8d9999b2dd3c0d9fe49523480b20100478875eedf652bfc7811046f4db54c761
+F src/window.c 3c94dfffdfba99159cdd11bd972c7d7c0a23fa7e09135963e99e4d583e75e77f
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
 F test/affinity3.test 6a101af2fc945ce2912f6fe54dd646018551710d
@@ -1617,13 +1617,13 @@ F test/win32heap.test 10fd891266bd00af68671e702317726375e5407561d859be1aa04696f2
 F test/win32lock.test fbf107c91d8f5512be5a5b87c4c42ab9fdd54972
 F test/win32longpath.test 169c75a3b2e43481f4a62122510210c67b08f26d
 F test/win32nolock.test ac4f08811a562e45a5755e661f45ca85892bdbbc
-F test/window1.test 68607fd4cfa24f5cdd6029a63a2a7c062042ff5787fa054aa5c0b006154fe183
+F test/window1.test fb076d9229d92bce9652fd676b1d942fe01601461e34ac138991464b5f3aec50
 F test/window2.tcl 0983de5eade5eeda49469244799d5331bfe3199fca3f6c6d2a836aa08f4fba1b
 F test/window2.test 79747b2edde4ad424e0752b27529aedc86e91f3d8d88846fa17ff0cb67f65086
 F test/window3.tcl 654d61d73e10db089b22514d498bb23ec310f720c0f4b5f69f67fda83d672048
 F test/window3.test 41727668ee31d2ba50f78efcb5bf1bda2c5cffd889aa65243511004669d1ac25
-F test/window4.tcl 9a04d14649ba625608a7b0ddd1640b41619632ee5550bdb772d466b628ede95a
-F test/window4.test 2959afeb5dc86c85711a80ad920f7f65d7d158d7bbce37bf2460c862b8c74de6
+F test/window4.tcl edacba69c2b0fb04afa26ea30c15e71c8f8d8b0895c6768f4cac43755d305951
+F test/window4.test c3e7e53d54d1ccaf22c9f6c43da7f11a54eb59c5d5c09bf5c3e16eeb7cb98546
 F test/with1.test 58475190cd8caaeebea8cfeb2a264ec97a0c492b8ffe9ad20cefbb23df462f96
 F test/with2.test e0030e2f0267a910d6c0e4f46f2dfe941c1cc0d4f659ba69b3597728e7e8f1ab
 F test/with3.test 5e8ce2c585170bbbc0544e2a01a4941fa0be173ba5265e5c92eb588cd99a232d
@@ -1740,7 +1740,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 43eb1e75a4d7ac0973ed8589bbaf379c24cdc8eacc4e613610d2d4c24d385dc1
-R 8fa685be6b05cccf51d69be1e42b3c72
+P 567e09ef2a8cd84a2481117e52595bed0f3b588745a9e441aae0f87680f3a2e8
+R e8ba8b73a2fd4c283cd2e0bbc79f1ce0
 U dan
-Z 5df8e391006a1a484745351d3ef4fda5
+Z cc3dd406dede77715a8840ea4818b97d

diff --git a/manifest.uuid b/manifest.uuid
index e8793de8a79cb9a0e00a522b910f7532c2c556ef..d8e4fcb2d552c1909d47e2b9b3c92189d7c58697 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-567e09ef2a8cd84a2481117e52595bed0f3b588745a9e441aae0f87680f3a2e8
\ No newline at end of file
+3839fb18f917e4f705821198d624b19d84eb07f1ee29ad23314ab7cec6bf6a2b
\ No newline at end of file

diff --git a/src/window.c b/src/window.c
index babbf3f3ff7c8543d5e67bd2792ba3d28f0cf132..9431771465126c0daf0ce86c295586800d00f554 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -1108,7 +1108,7 @@ static void windowPartitionCache(
   if( pMWin->pPartition ){
     int addr;
     ExprList *pPart = pMWin->pPartition;
-    int nPart = (pPart ? pPart->nExpr : 0);
+    int nPart = pPart->nExpr;
     int regNewPart = reg + pMWin->nBufferCol;
     KeyInfo *pKeyInfo = sqlite3KeyInfoFromExprList(pParse, pPart, 0, 0);
 
@@ -1175,7 +1175,7 @@ static void windowReturnOneRow(
     }
     else if( pFunc->xSFunc==leadStepFunc || pFunc->xSFunc==lagStepFunc ){
       int nArg = pWin->pOwner->x.pList->nExpr;
-      int iEph = pWin->iEphCsr;
+      int iEph = pMWin->iEphCsr;
       int csr = pWin->csrApp;
       int lbl = sqlite3VdbeMakeLabel(v);
       int tmpReg = sqlite3GetTempReg(pParse);

diff --git a/test/window1.test b/test/window1.test
index 14edd0e0315efca7d7ab215503267a91185e4185..2c99aa132b522284aac7f82d3d62b384f165631e 100644 (file)
--- a/test/window1.test
+++ b/test/window1.test
@@ -250,11 +250,21 @@ do_catchsql_test 7.1.5 {
 do_catchsql_test 7.1.6 {
   SELECT trim(x) OVER (ORDER BY y) FROM t1;
 } {1 {trim() may not be used as a window function}}
-
 do_catchsql_test 7.1.7 {
   SELECT max(x) OVER abc FROM t1 WINDOW def AS (ORDER BY y);
 } {1 {no such window: abc}}
 
+do_execsql_test 7.2 {
+  SELECT 
+    lead(y) OVER win, 
+    lead(y, 2) OVER win, 
+    lead(y, 3, 'default') OVER win
+  FROM t1
+  WINDOW win AS (ORDER BY x)
+} {
+  4 6 8   6 8 10   8 10 default   10 {} default   {} {} default
+}
+
 
 finish_test
 

diff --git a/test/window4.tcl b/test/window4.tcl
index bb76d26f5958bed26e143306a58a8160714ecf25..29c0a5585de768f27630d16f29989e3d4f5196cc 100644 (file)
--- a/test/window4.tcl
+++ b/test/window4.tcl
@@ -228,6 +228,49 @@ foreach o1 $lOrder { foreach o2 $lOrder {
   incr tn
 }}
 
+==========
+
+execsql_test 7.0 {
+  DROP TABLE IF EXISTS t1;
+  CREATE TABLE t1(x INTEGER, y INTEGER);
+  INSERT INTO t1 VALUES(1, 2);
+  INSERT INTO t1 VALUES(3, 4);
+  INSERT INTO t1 VALUES(5, 6);
+  INSERT INTO t1 VALUES(7, 8);
+  INSERT INTO t1 VALUES(9, 10);
+}
+
+execsql_test 7.1 {
+  SELECT lead(y) OVER win FROM t1
+  WINDOW win AS (ORDER BY x)
+}
+
+execsql_test 7.2 {
+  SELECT lead(y, 2) OVER win FROM t1
+  WINDOW win AS (ORDER BY x)
+}
+
+execsql_test 7.3 {
+  SELECT lead(y, 3, -1) OVER win FROM t1
+  WINDOW win AS (ORDER BY x)
+}
+
+execsql_test 7.4 {
+  SELECT 
+    lead(y) OVER win, lead(y) OVER win
+  FROM t1
+  WINDOW win AS (ORDER BY x)
+}
+
+execsql_test 7.5 {
+  SELECT 
+    lead(y) OVER win, 
+    lead(y, 2) OVER win, 
+    lead(y, 3, -1) OVER win
+  FROM t1
+  WINDOW win AS (ORDER BY x)
+}
+
 
 finish_test
 

diff --git a/test/window4.test b/test/window4.test
index a6f3a020c0b6bb1cd94d57b7abb403f4f5156d3f..7e99f870f351ebced2d4db2aec0a58d95f3a88d8 100644 (file)
--- a/test/window4.test
+++ b/test/window4.test
@@ -1123,4 +1123,47 @@ do_execsql_test 4.5.73.2 {
   FROM ttt ORDER BY a
 } {1 1   2 2   3 3   3 3   5 5   7 7   6 6   9 9   12 12}
 
+#==========================================================================
+
+do_execsql_test 7.0 {
+  DROP TABLE IF EXISTS t1;
+  CREATE TABLE t1(x INTEGER, y INTEGER);
+  INSERT INTO t1 VALUES(1, 2);
+  INSERT INTO t1 VALUES(3, 4);
+  INSERT INTO t1 VALUES(5, 6);
+  INSERT INTO t1 VALUES(7, 8);
+  INSERT INTO t1 VALUES(9, 10);
+} {}
+
+do_execsql_test 7.1 {
+  SELECT lead(y) OVER win FROM t1
+  WINDOW win AS (ORDER BY x)
+} {4   6   8   10   {}}
+
+do_execsql_test 7.2 {
+  SELECT lead(y, 2) OVER win FROM t1
+  WINDOW win AS (ORDER BY x)
+} {6   8   10   {}   {}}
+
+do_execsql_test 7.3 {
+  SELECT lead(y, 3, -1) OVER win FROM t1
+  WINDOW win AS (ORDER BY x)
+} {8   10   -1   -1   -1}
+
+do_execsql_test 7.4 {
+  SELECT 
+    lead(y) OVER win, lead(y) OVER win
+  FROM t1
+  WINDOW win AS (ORDER BY x)
+} {4 4   6 6   8 8   10 10   {} {}}
+
+do_execsql_test 7.5 {
+  SELECT 
+    lead(y) OVER win, 
+    lead(y, 2) OVER win, 
+    lead(y, 3, -1) OVER win
+  FROM t1
+  WINDOW win AS (ORDER BY x)
+} {4 6 8   6 8 10   8 10 -1   10 {} -1   {} {} -1}
+
 finish_test