Back out the change at [47cd634c98b502d4] which was incorrect. Add a test

case so that we don't accidently back out that change again.

FossilOrigin-Name: 596ac2a4eab28b74f4050fb4eb71883f2a1421fdbccf302413e4653391bb52c9

diff --git a/manifest b/manifest
index e990056a988f229265ab0b4d9b899ce73b526d12..9688a40bb91ec95db89f62198825ed13479ee78f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sfurther\scomments\sto\swindow.c.
-D 2019-08-30T17:28:55.760
+C Back\sout\sthe\schange\sat\s[47cd634c98b502d4]\swhich\swas\sincorrect.\s\sAdd\sa\stest\ncase\sso\sthat\swe\sdon't\saccidently\sback\sout\sthat\schange\sagain.
+D 2019-08-30T18:02:49.143
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -613,7 +613,7 @@ F src/where.c fb546afbdbedc77a6193a236db92f6f85bc8e17412ec596230dd8aee03a93716
 F src/whereInt.h 4a296fd4fa79fdcbc2b5e8c1b898901617655811223e1082b899c23ecb092217
 F src/wherecode.c 535c8e228478fd971b9a5b6cb6773995b0fbf7020d5989508a5094ce5b8cd95b
 F src/whereexpr.c 2757afbd5cfdbb420f9d0392e1bd5f5c0e33dee50a8c692befc7e502308e449f
-F src/window.c ff37ca403ad3c47bb1e60b0e88c546aa5194524dc20d7f75e866187a093ae5d7
+F src/window.c 9f55b65411e1d37fa51b78afdeed16b73c73f1d97a052ee58c91c724a1b615d8
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/affinity2.test b03930d288e38b07f55023a58538ad174605695e98934bdab1facf6bd9ecc436
 F test/affinity3.test 6a101af2fc945ce2912f6fe54dd646018551710d
@@ -1714,7 +1714,7 @@ F test/window7.test 1d31276961ae7801edc72173edaf7593e3cbc79c06d1f1f09e20d8418af4
 F test/window8.tcl 3b63931d608b6f00a9d26368207a7ffc9370c96e3e137ae2aff35284ade69d13
 F test/window8.test 4531204bfb5d833efbd8a5a1527c9871e62f8ae479386f42a7b55bdb5be39df3
 F test/window9.test 20a6b590be718b6bc98a5356d4396d6cdf19329c547da084fa225b92d68e1693
-F test/windowA.test 5cd7c8dc3b2fcdfc6ea122c81a35726106880ae75afd097f62061839aff13b71
+F test/windowA.test 6d63dc1260daa17141a55007600581778523a8b420629f1282d2acfc36af23be
 F test/windowerr.tcl f5acd6fbc210d7b5546c0e879d157888455cd4a17a1d3f28f07c1c8a387019e0
 F test/windowerr.test a8b752402109c15aa1c5efe1b93ccb0ce1ef84fa964ae1cd6684dd0b3cc1819b
 F test/windowfault.test a90b397837209f15e54afa62e8be39b2759a0101fae04e05a08bcc50e243a452
@@ -1838,7 +1838,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 f7002f86c780e279c9f8a6268f317586519c059c9de2115ff6f1cad272570c29
-R 717428315655334cbf16abae9c8648f7
-U dan
-Z e01e05b9266977bc594b107aacdc1011
+P 900464567b2a5ce0c278a3297e4be1968f609258608aa0fbe2fc67709aa22a4b
+Q -47cd634c98b502d40a493455ba6d73cbd0dae74944f9cf06fcbcd025f4b49d6e
+R 29d0b25ea3e14a5d62e6dc7f8a60e5a3
+U drh
+Z 198db2b82ee9fb9cef5cc67ca7c92ad8

diff --git a/manifest.uuid b/manifest.uuid
index e5c97e32cdd8009edd2aedd51a8e9ae59d424bc9..aa386daac43629fd4f6c3d7da567343b96580eb7 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-900464567b2a5ce0c278a3297e4be1968f609258608aa0fbe2fc67709aa22a4b
\ No newline at end of file
+596ac2a4eab28b74f4050fb4eb71883f2a1421fdbccf302413e4653391bb52c9
\ No newline at end of file

diff --git a/src/window.c b/src/window.c
index fbb60b9c401dc8e7fcde8c1b4843c05a89cde73f..ad709bb036b5ea24b25d25d10b52a9e8c064543d 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -2016,11 +2016,14 @@ static void windowCodeRangeTest(
         sqlite3VdbeAddOp2(v, OP_Goto, 0, lbl); 
         break;
       case OP_Gt: 
-        sqlite3VdbeAddOp2(v, OP_NotNull, reg2, lbl); VdbeCoverage(v); 
+        sqlite3VdbeAddOp2(v, OP_NotNull, reg2, lbl); 
+        VdbeCoverage(v); 
         break;
-      default: assert( op==OP_Le );
-        sqlite3VdbeAddOp2(v, OP_IsNull, reg2, lbl); VdbeCoverage(v); 
+      case OP_Le: 
+        sqlite3VdbeAddOp2(v, OP_IsNull, reg2, lbl); 
+        VdbeCoverage(v); 
         break;
+      default: assert( op==OP_Lt ); /* no-op */ break;
     }
     sqlite3VdbeAddOp2(v, OP_Goto, 0, sqlite3VdbeCurrentAddr(v)+3);
 

diff --git a/test/windowA.test b/test/windowA.test
index 20c904eee22cec8f1630f2a11c77fb5bd6e105ca..e94ae57e43f74d793f46560dddda40220d0d8828 100644 (file)
--- a/test/windowA.test
+++ b/test/windowA.test
@@ -289,4 +289,21 @@ do_execsql_test 3.4 {
   1 A   5.4 A        \
 ]
 
+do_execsql_test 4.0 {
+  SELECT a, b, quote(d), group_concat(b,'') OVER w1 FROM t1
+  WINDOW w1 AS 
+     (ORDER BY d DESC NULLS FIRST
+      RANGE BETWEEN 2.50 PRECEDING AND 0.5 PRECEDING)
+  ORDER BY +d DESC NULLS FIRST, +a;
+} [list \
+  6 N  NULL NN  \
+  7 N  NULL NN  \
+  5 E 10.26 {}  \
+  4 D 10.25 {}  \
+  3 C   8.0 ED  \
+  2 B  5.55 C   \
+  1 A   5.4 {}  \
+]
+
+
 finish_test