Fix a bad assert() in window.c.

FossilOrigin-Name: fe8aaf0c806413965f50a03e34b5fdfaaa8b09dc0af73f41e830f7b664bd1ced

diff --git a/manifest b/manifest
index 757ed6cb8554a5e385b77de2edc754635d2ed3c8..db50739a1171d5acd380ed291ed70ac28abafa66 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Simplification\sto\sthe\slogic\sthat\sdetects\smisuse\sof\sthe\sapplication-defined\nfunction\screation\sinterfaces.
-D 2018-07-09T02:37:12.305
+C Fix\sa\sbad\sassert()\sin\swindow.c.
+D 2018-07-09T06:51:36.138
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 0a3a6c81e6fcb969ff9106e882f0a08547014ba463cb6beca4c4efaecc924ee6
@@ -584,7 +584,7 @@ F src/where.c 0bcbf9e191ca07f9ea2008aa80e70ded46bcdffd26560c83397da501f00aece6
 F src/whereInt.h b90ef9b9707ef750eab2a7a080c48fb4900315033274689def32d0cf5a81ebe4
 F src/wherecode.c 3317f2b083a66d3e65a03edf316ade4ccb0a99c9956273282ebb579b95d4ba96
 F src/whereexpr.c 571618c67a3eb5ce0f1158c2792c1aee9b4a4a264392fc4fb1b35467f80abf9a
-F src/window.c e42415fb8d1421fd9353872244e8a90f4025cd6a4a215f1603f06735e9be20b6
+F src/window.c fcc7f6febe4f49df2399b09fd4db5418072424085d409bcb4e5e83c94e50c594
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
 F test/affinity3.test 6a101af2fc945ce2912f6fe54dd646018551710d
@@ -1627,7 +1627,7 @@ F test/window3.test 87fb18021903fc4d1659b8b2092aea55d611a9606cfa7272686234e5197c
 F test/window4.tcl 9491acccf705d0e0f44177dc20478f978bd0bd4812a6ddd6a350881cc7781876
 F test/window4.test b43a22ad5b748c37925e64c93ed0958ebae1c8d2eca59a79350c22c2e6f609a0
 F test/window5.test 8187f46597c90b73e8f96659e893353cbda337479cc582f7a488eab351ba08d3
-F test/window6.test d2a243f0bf64cfc964fa55b0425ec74d984321bbe650e47d0d74e8f84aa9b7e9
+F test/window6.test 8370c02744297fcb9214c084779182bb95df1c87709906dccbe2643a0346ccdf
 F test/windowfault.test a44baa1b0bdf339d7792623ad3a6ebe057b1a6d7a7fd7ae880c8b744cfc0dafb
 F test/with1.test 58475190cd8caaeebea8cfeb2a264ec97a0c492b8ffe9ad20cefbb23df462f96
 F test/with2.test e0030e2f0267a910d6c0e4f46f2dfe941c1cc0d4f659ba69b3597728e7e8f1ab
@@ -1745,7 +1745,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 164b1641e346994f0b9f91261c3cbc86b68e1c96cc401b78e48e186e26916abe
-R 5ef1abf7334b1553c130201729c88651
-U drh
-Z a05977d596ec32f50af0c6fe3387bd66
+P 8f21d778450e1e5d2bc7f109d614fe018eb3d228b0bfc91cd3c6a5204415998f
+R c99424e74d45d4c034c17713bab90e29
+U dan
+Z 08afb33e1e6d6af7e7e8db9039bcb259

diff --git a/manifest.uuid b/manifest.uuid
index 980f7470ad52d49ee66eb27d6ac47e65fb6519d8..0fd521cf4d8885de9e67fe8b4f32c5ed73817143 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8f21d778450e1e5d2bc7f109d614fe018eb3d228b0bfc91cd3c6a5204415998f
\ No newline at end of file
+fe8aaf0c806413965f50a03e34b5fdfaaa8b09dc0af73f41e830f7b664bd1ced
\ No newline at end of file

diff --git a/src/window.c b/src/window.c
index 3ff88f79a0fc522a09ce378b95a40712e31b1d8a..cd09f92ca73e1ca4846a240e4aaf1918ae38dd49 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -1117,7 +1117,8 @@ static void windowAggStep(
       int addrIf = 0;
       if( pWin->pFilter ){
         int regTmp;
-        assert( nArg==pWin->pOwner->x.pList->nExpr );
+        assert( nArg==0 || nArg==pWin->pOwner->x.pList->nExpr );
+        assert( nArg || pWin->pOwner->x.pList==0 );
         if( csr>0 ){
           regTmp = sqlite3GetTempReg(pParse);
           sqlite3VdbeAddOp3(v, OP_Column, csr, pWin->iArgCol+nArg,regTmp);
@@ -1132,6 +1133,7 @@ static void windowAggStep(
       }
       if( pWin->pFunc->funcFlags & SQLITE_FUNC_NEEDCOLL ){
         CollSeq *pColl;
+        assert( nArg>0 );
         pColl = sqlite3ExprNNCollSeq(pParse, pWin->pOwner->x.pList->a[0].pExpr);
         sqlite3VdbeAddOp4(v, OP_CollSeq, 0,0,0, (const char*)pColl, P4_COLLSEQ);
       }

diff --git a/test/window6.test b/test/window6.test
index 6d776cbddadc5fa78d16d4e155863567ada56bd7..effebea30f56889200fd067749e20da1a97de06d 100644 (file)
--- a/test/window6.test
+++ b/test/window6.test
@@ -276,5 +276,11 @@ do_catchsql_test 9.8.2 {
   ) FROM c;
 } {1 {frame ending offset must be a non-negative integer}}
 
+do_execsql_test 10.0 {
+  WITH t1(a,b) AS (VALUES(1,2))
+  SELECT count() FILTER (where b<>5) OVER w1
+    FROM t1
+    WINDOW w1 AS (ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING);
+} {1}
 
 finish_test