Fix handling of NULL, text and blob values in window queries that use "RANGE BETWEEN...

FossilOrigin-Name: cb3e2be674316e1d39968eb6567f1fe1b72f9d89af49640a9e83f944979c4cf0

diff --git a/manifest b/manifest
index 3921cbfbc9f7a53b2f8f9846cad5fe2e27381cd8..ad787c3946a6c873778ed6c21ae6923435dbca1b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Updates\sto\sthe\sdefault\ssettings\sin\sMakefile.linux-gcc.
-D 2019-09-03T16:23:41.278
+C Fix\shandling\sof\sNULL,\stext\sand\sblob\svalues\sin\swindow\squeries\sthat\suse\s"RANGE\sBETWEEN\sA\sFOLLOWING\sAND\sB\sFOLLOWING",\sor\s"B\sPRECEDING\sAND\sA\sPRECEDING",\swhere\sA>B.
+D 2019-09-04T06:56:43.134
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -614,7 +614,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 96b0c033d33408f16ac8b177eac6362ee53a23d9b6d7a51a04289ab2f956bb77
+F src/window.c b1e56b1281538b5cdd796b4f6c6281549bef6f977aab63e2493704a2a9f31937
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/affinity2.test da465d3d490ab24ef64f7715b5953343a4967762b9350b29eb1462879ff3fb9e
 F test/affinity3.test 6a101af2fc945ce2912f6fe54dd646018551710d
@@ -1712,8 +1712,8 @@ F test/window5.test d328dd18221217c49c144181975eea17339eaeaf0e9aa558cee3afb84652
 F test/window6.test f8d674254b23289cc17c84d79dec7eda7caa1dfb7836c43122cfdf3640d1df32
 F test/window7.tcl 6a1210f05d40ec89c22960213a22cd3f98d4e2f2eb20646c83c8c30d4d76108f
 F test/window7.test 1d31276961ae7801edc72173edaf7593e3cbc79c06d1f1f09e20d8418af403cd
-F test/window8.tcl 112bdc96dd310cfef93119fc5e4e9108c322080676fdb006ccc98d67d41c8acb
-F test/window8.test 85ad3bd55615482c7a93f5286f0b0968f86ad0d62df5bca2f0ea50699e5aef31
+F test/window8.tcl f2711aa3571e4e6b0dad98db8d95fd6cb8d9db0c92bbdf535f153b07606a1ce2
+F test/window8.test c4331b27a6f66d69fa8f8bab10cc731db1a81d293ae108a68f7c3487fa94e65b
 F test/window9.test 20a6b590be718b6bc98a5356d4396d6cdf19329c547da084fa225b92d68e1693
 F test/windowA.test 6d63dc1260daa17141a55007600581778523a8b420629f1282d2acfc36af23be
 F test/windowerr.tcl f5acd6fbc210d7b5546c0e879d157888455cd4a17a1d3f28f07c1c8a387019e0
@@ -1839,7 +1839,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 5351e920f489562f959ab8a376ff720f845ea165e0cdc7c3a271aac53c2aa64a
-R 925cc947a7aaed39ac73d111ffc8ed4f
-U drh
-Z 4a725e18713a18c2d331c90a708c61ac
+P 3044cf6917ea8324175fc91657e9a5978af9748f72e1914bc361753f0b2d897d
+R 8115b1008885358de7df7c995955e272
+T +closed 91875000a76cad5b7615ea87aafb2d1fec09441592b37424da4f51e7e025cbfd
+U dan
+Z 35e89c49c4707a04ab0cfaf64c9b5bb4

diff --git a/manifest.uuid b/manifest.uuid
index c360ee319279c2308f005834fa7fd1cc9dbf2d12..8dd06dd0f1e95828cfc13ad3348a55a8cf537405 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3044cf6917ea8324175fc91657e9a5978af9748f72e1914bc361753f0b2d897d
\ No newline at end of file
+cb3e2be674316e1d39968eb6567f1fe1b72f9d89af49640a9e83f944979c4cf0
\ No newline at end of file

diff --git a/src/window.c b/src/window.c
index 7cb86e58bef2d9f9fe06e347166f1ee4b1a193a5..ed2e32079f5bdf441168f922559247763fc8fc1f 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -2745,7 +2745,7 @@ void sqlite3WindowCodeStep(
     windowCheckValue(pParse, regEnd, 1 + (pMWin->eFrmType==TK_RANGE ? 3 : 0));
   }
 
-  if( pMWin->eStart==pMWin->eEnd && regStart ){
+  if( pMWin->eFrmType!=TK_RANGE && pMWin->eStart==pMWin->eEnd && regStart ){
     int op = ((pMWin->eStart==TK_FOLLOWING) ? OP_Ge : OP_Le);
     int addrGe = sqlite3VdbeAddOp3(v, op, regStart, 0, regEnd);
     VdbeCoverageNeverNullIf(v, op==OP_Ge); /* NeverNull because bound <expr> */

diff --git a/test/window8.tcl b/test/window8.tcl
index aa934a82673776e24d51627e72f5f6a00716e0b9..a8333f19071e8819435bb782e395e2039730674d 100644 (file)
--- a/test/window8.tcl
+++ b/test/window8.tcl
@@ -351,15 +351,75 @@ execsql_test 7.0 {
   INSERT INTO t2 VALUES(2, NULL);
   INSERT INTO t2 VALUES(3, NULL);
   INSERT INTO t2 VALUES(4, NULL);
+  INSERT INTO t2 VALUES(5, 66);
+  INSERT INTO t2 VALUES(6, 67);
 }
 
-execsql_test 7.1 {
-  SELECT sum(a) OVER win FROM t2
+foreach {tn f ex} {
+  1 sum ""
+  2 min ""
+  3 sum "EXCLUDE CURRENT ROW"
+  4 max "EXCLUDE CURRENT ROW"
+} {
+execsql_test 7.$tn.1 "
+  SELECT $f (a) OVER win FROM t2
   WINDOW win AS (
       ORDER BY b NULLS LAST RANGE BETWEEN 6 FOLLOWING AND UNBOUNDED FOLLOWING
   );
+"
+execsql_test 7.$tn.2 "
+  SELECT $f (a) OVER win FROM t2
+  WINDOW win AS (
+      ORDER BY b NULLS LAST RANGE BETWEEN 1 PRECEDING AND 2 PRECEDING
+  );
+"
+execsql_test 7.$tn.3 "
+  SELECT $f (a) OVER win FROM t2
+  WINDOW win AS (
+      ORDER BY b NULLS LAST RANGE BETWEEN 2 FOLLOWING AND 1 FOLLOWING
+  );
+"
+execsql_test 7.$tn.4 "
+  SELECT $f (a) OVER win FROM t2
+  WINDOW win AS (
+      ORDER BY b NULLS FIRST RANGE BETWEEN 1 PRECEDING AND 2 PRECEDING
+  );
+"
+execsql_test 7.$tn.5 "
+  SELECT $f (a) OVER win FROM t2
+  WINDOW win AS (
+      ORDER BY b NULLS FIRST RANGE BETWEEN 2 FOLLOWING AND 1 FOLLOWING
+  );
+"
+
+execsql_test 7.$tn.6 "
+  SELECT $f (a) OVER win FROM t2
+  WINDOW win AS (
+      ORDER BY b NULLS LAST RANGE BETWEEN 1000 PRECEDING AND 2 PRECEDING
+  );
+"
+execsql_test 7.$tn.7 "
+  SELECT $f (a) OVER win FROM t2
+  WINDOW win AS (
+      ORDER BY b NULLS LAST RANGE BETWEEN 2000 FOLLOWING AND 1000 FOLLOWING
+  );
+"
+execsql_test 7.$tn.8 "
+  SELECT $f (a) OVER win FROM t2
+  WINDOW win AS (
+      ORDER BY b NULLS FIRST RANGE BETWEEN 1000 PRECEDING AND 2000 PRECEDING
+  );
+"
+execsql_test 7.$tn.9 "
+  SELECT $f (a) OVER win FROM t2
+  WINDOW win AS (
+      ORDER BY b NULLS FIRST RANGE BETWEEN 2000 FOLLOWING AND 1000 FOLLOWING
+  );
+"
 }
 
+
+
 finish_test
 
 

diff --git a/test/window8.test b/test/window8.test
index 0c7656b9a13bf3643c4b1de53c80d63f24ac1ae2..ed720ebd4114fac54ba7c177a03c7626e73f0c33 100644 (file)
--- a/test/window8.test
+++ b/test/window8.test
@@ -6213,13 +6213,260 @@ do_execsql_test 7.0 {
   INSERT INTO t2 VALUES(2, NULL);
   INSERT INTO t2 VALUES(3, NULL);
   INSERT INTO t2 VALUES(4, NULL);
+  INSERT INTO t2 VALUES(5, 66);
+  INSERT INTO t2 VALUES(6, 67);
 } {}
 
-do_execsql_test 7.1 {
-  SELECT sum(a) OVER win FROM t2
+do_execsql_test 7.1.1 {
+  SELECT sum (a) OVER win FROM t2
   WINDOW win AS (
       ORDER BY b NULLS LAST RANGE BETWEEN 6 FOLLOWING AND UNBOUNDED FOLLOWING
   );
-} {9   9   9   9}
+} {9   9   9   9   9   9}
+
+do_execsql_test 7.1.2 {
+  SELECT sum (a) OVER win FROM t2
+  WINDOW win AS (
+      ORDER BY b NULLS LAST RANGE BETWEEN 1 PRECEDING AND 2 PRECEDING
+  );
+} {{}   {}   {}   9   9   9}
+
+do_execsql_test 7.1.3 {
+  SELECT sum (a) OVER win FROM t2
+  WINDOW win AS (
+      ORDER BY b NULLS LAST RANGE BETWEEN 2 FOLLOWING AND 1 FOLLOWING
+  );
+} {{}   {}   {}   9   9   9}
+
+do_execsql_test 7.1.4 {
+  SELECT sum (a) OVER win FROM t2
+  WINDOW win AS (
+      ORDER BY b NULLS FIRST RANGE BETWEEN 1 PRECEDING AND 2 PRECEDING
+  );
+} {9   9   9   {}   {}   {}}
+
+do_execsql_test 7.1.5 {
+  SELECT sum (a) OVER win FROM t2
+  WINDOW win AS (
+      ORDER BY b NULLS FIRST RANGE BETWEEN 2 FOLLOWING AND 1 FOLLOWING
+  );
+} {9   9   9   {}   {}   {}}
+
+do_execsql_test 7.1.6 {
+  SELECT sum (a) OVER win FROM t2
+  WINDOW win AS (
+      ORDER BY b NULLS LAST RANGE BETWEEN 1000 PRECEDING AND 2 PRECEDING
+  );
+} {{}   {}   1   9   9   9}
+
+do_execsql_test 7.1.7 {
+  SELECT sum (a) OVER win FROM t2
+  WINDOW win AS (
+      ORDER BY b NULLS LAST RANGE BETWEEN 2000 FOLLOWING AND 1000 FOLLOWING
+  );
+} {{}   {}   {}   9   9   9}
+
+do_execsql_test 7.1.8 {
+  SELECT sum (a) OVER win FROM t2
+  WINDOW win AS (
+      ORDER BY b NULLS FIRST RANGE BETWEEN 1000 PRECEDING AND 2000 PRECEDING
+  );
+} {9   9   9   {}   {}   {}}
+
+do_execsql_test 7.1.9 {
+  SELECT sum (a) OVER win FROM t2
+  WINDOW win AS (
+      ORDER BY b NULLS FIRST RANGE BETWEEN 2000 FOLLOWING AND 1000 FOLLOWING
+  );
+} {9   9   9   {}   {}   {}}
+
+do_execsql_test 7.2.1 {
+  SELECT min (a) OVER win FROM t2
+  WINDOW win AS (
+      ORDER BY b NULLS LAST RANGE BETWEEN 6 FOLLOWING AND UNBOUNDED FOLLOWING
+  );
+} {2   2   2   2   2   2}
+
+do_execsql_test 7.2.2 {
+  SELECT min (a) OVER win FROM t2
+  WINDOW win AS (
+      ORDER BY b NULLS LAST RANGE BETWEEN 1 PRECEDING AND 2 PRECEDING
+  );
+} {{}   {}   {}   2   2   2}
+
+do_execsql_test 7.2.3 {
+  SELECT min (a) OVER win FROM t2
+  WINDOW win AS (
+      ORDER BY b NULLS LAST RANGE BETWEEN 2 FOLLOWING AND 1 FOLLOWING
+  );
+} {{}   {}   {}   2   2   2}
+
+do_execsql_test 7.2.4 {
+  SELECT min (a) OVER win FROM t2
+  WINDOW win AS (
+      ORDER BY b NULLS FIRST RANGE BETWEEN 1 PRECEDING AND 2 PRECEDING
+  );
+} {2   2   2   {}   {}   {}}
+
+do_execsql_test 7.2.5 {
+  SELECT min (a) OVER win FROM t2
+  WINDOW win AS (
+      ORDER BY b NULLS FIRST RANGE BETWEEN 2 FOLLOWING AND 1 FOLLOWING
+  );
+} {2   2   2   {}   {}   {}}
+
+do_execsql_test 7.2.6 {
+  SELECT min (a) OVER win FROM t2
+  WINDOW win AS (
+      ORDER BY b NULLS LAST RANGE BETWEEN 1000 PRECEDING AND 2 PRECEDING
+  );
+} {{}   {}   1   2   2   2}
+
+do_execsql_test 7.2.7 {
+  SELECT min (a) OVER win FROM t2
+  WINDOW win AS (
+      ORDER BY b NULLS LAST RANGE BETWEEN 2000 FOLLOWING AND 1000 FOLLOWING
+  );
+} {{}   {}   {}   2   2   2}
+
+do_execsql_test 7.2.8 {
+  SELECT min (a) OVER win FROM t2
+  WINDOW win AS (
+      ORDER BY b NULLS FIRST RANGE BETWEEN 1000 PRECEDING AND 2000 PRECEDING
+  );
+} {2   2   2   {}   {}   {}}
+
+do_execsql_test 7.2.9 {
+  SELECT min (a) OVER win FROM t2
+  WINDOW win AS (
+      ORDER BY b NULLS FIRST RANGE BETWEEN 2000 FOLLOWING AND 1000 FOLLOWING
+  );
+} {2   2   2   {}   {}   {}}
+
+do_execsql_test 7.3.1 {
+  SELECT sum (a) OVER win FROM t2
+  WINDOW win AS (
+      ORDER BY b NULLS LAST RANGE BETWEEN 6 FOLLOWING AND UNBOUNDED FOLLOWING
+  );
+} {9   9   9   9   9   9}
+
+do_execsql_test 7.3.2 {
+  SELECT sum (a) OVER win FROM t2
+  WINDOW win AS (
+      ORDER BY b NULLS LAST RANGE BETWEEN 1 PRECEDING AND 2 PRECEDING
+  );
+} {{}   {}   {}   9   9   9}
+
+do_execsql_test 7.3.3 {
+  SELECT sum (a) OVER win FROM t2
+  WINDOW win AS (
+      ORDER BY b NULLS LAST RANGE BETWEEN 2 FOLLOWING AND 1 FOLLOWING
+  );
+} {{}   {}   {}   9   9   9}
+
+do_execsql_test 7.3.4 {
+  SELECT sum (a) OVER win FROM t2
+  WINDOW win AS (
+      ORDER BY b NULLS FIRST RANGE BETWEEN 1 PRECEDING AND 2 PRECEDING
+  );
+} {9   9   9   {}   {}   {}}
+
+do_execsql_test 7.3.5 {
+  SELECT sum (a) OVER win FROM t2
+  WINDOW win AS (
+      ORDER BY b NULLS FIRST RANGE BETWEEN 2 FOLLOWING AND 1 FOLLOWING
+  );
+} {9   9   9   {}   {}   {}}
+
+do_execsql_test 7.3.6 {
+  SELECT sum (a) OVER win FROM t2
+  WINDOW win AS (
+      ORDER BY b NULLS LAST RANGE BETWEEN 1000 PRECEDING AND 2 PRECEDING
+  );
+} {{}   {}   1   9   9   9}
+
+do_execsql_test 7.3.7 {
+  SELECT sum (a) OVER win FROM t2
+  WINDOW win AS (
+      ORDER BY b NULLS LAST RANGE BETWEEN 2000 FOLLOWING AND 1000 FOLLOWING
+  );
+} {{}   {}   {}   9   9   9}
+
+do_execsql_test 7.3.8 {
+  SELECT sum (a) OVER win FROM t2
+  WINDOW win AS (
+      ORDER BY b NULLS FIRST RANGE BETWEEN 1000 PRECEDING AND 2000 PRECEDING
+  );
+} {9   9   9   {}   {}   {}}
+
+do_execsql_test 7.3.9 {
+  SELECT sum (a) OVER win FROM t2
+  WINDOW win AS (
+      ORDER BY b NULLS FIRST RANGE BETWEEN 2000 FOLLOWING AND 1000 FOLLOWING
+  );
+} {9   9   9   {}   {}   {}}
+
+do_execsql_test 7.4.1 {
+  SELECT max (a) OVER win FROM t2
+  WINDOW win AS (
+      ORDER BY b NULLS LAST RANGE BETWEEN 6 FOLLOWING AND UNBOUNDED FOLLOWING
+  );
+} {4   4   4   4   4   4}
+
+do_execsql_test 7.4.2 {
+  SELECT max (a) OVER win FROM t2
+  WINDOW win AS (
+      ORDER BY b NULLS LAST RANGE BETWEEN 1 PRECEDING AND 2 PRECEDING
+  );
+} {{}   {}   {}   4   4   4}
+
+do_execsql_test 7.4.3 {
+  SELECT max (a) OVER win FROM t2
+  WINDOW win AS (
+      ORDER BY b NULLS LAST RANGE BETWEEN 2 FOLLOWING AND 1 FOLLOWING
+  );
+} {{}   {}   {}   4   4   4}
+
+do_execsql_test 7.4.4 {
+  SELECT max (a) OVER win FROM t2
+  WINDOW win AS (
+      ORDER BY b NULLS FIRST RANGE BETWEEN 1 PRECEDING AND 2 PRECEDING
+  );
+} {4   4   4   {}   {}   {}}
+
+do_execsql_test 7.4.5 {
+  SELECT max (a) OVER win FROM t2
+  WINDOW win AS (
+      ORDER BY b NULLS FIRST RANGE BETWEEN 2 FOLLOWING AND 1 FOLLOWING
+  );
+} {4   4   4   {}   {}   {}}
+
+do_execsql_test 7.4.6 {
+  SELECT max (a) OVER win FROM t2
+  WINDOW win AS (
+      ORDER BY b NULLS LAST RANGE BETWEEN 1000 PRECEDING AND 2 PRECEDING
+  );
+} {{}   {}   1   4   4   4}
+
+do_execsql_test 7.4.7 {
+  SELECT max (a) OVER win FROM t2
+  WINDOW win AS (
+      ORDER BY b NULLS LAST RANGE BETWEEN 2000 FOLLOWING AND 1000 FOLLOWING
+  );
+} {{}   {}   {}   4   4   4}
+
+do_execsql_test 7.4.8 {
+  SELECT max (a) OVER win FROM t2
+  WINDOW win AS (
+      ORDER BY b NULLS FIRST RANGE BETWEEN 1000 PRECEDING AND 2000 PRECEDING
+  );
+} {4   4   4   {}   {}   {}}
+
+do_execsql_test 7.4.9 {
+  SELECT max (a) OVER win FROM t2
+  WINDOW win AS (
+      ORDER BY b NULLS FIRST RANGE BETWEEN 2000 FOLLOWING AND 1000 FOLLOWING
+  );
+} {4   4   4   {}   {}   {}}
 
 finish_test