Try to improve the error messages for misformed frame specifications in

window definitions.

FossilOrigin-Name: 927b95a0812787bcb3c28d1a0ea94717dc2cc60f6d480623f0c7cbce0c546fc9

diff --git a/manifest b/manifest
index 32191fd4fc9bae6196b94ed6795a7045e355efd8..af25dfdb2cf9fd3c861f39c2b202b67d66c9262c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Also\sdisallow\snon-constant\sexpressions\sin\s"<expr>\sPRECEDING"\sor\s"<expr>\nFOLLOWING"\sclauses.
-D 2018-07-06T14:31:26.509
+C Try\sto\simprove\sthe\serror\smessages\sfor\smisformed\sframe\sspecifications\sin\nwindow\sdefinitions.
+D 2018-07-06T17:19:20.546
 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 b681846aee3d5831ef555a1bb40cad473cbe423f6688cc1153db966ec0b0a423
+F src/window.c 0e127e916e7a56a580242604d438707571ce250b4ad4ae1652b08fad716d9c56
 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 a7f0e514602c8a6c43bc68c25ecc4def4f3e2abc5f721c4e6cf70eade1a6cfdf
 F test/window4.test 048b4760d0335ccefda73403ff2c054085383cbe5a0e5c175f56eda9d2f419f6
 F test/window5.test 8187f46597c90b73e8f96659e893353cbda337479cc582f7a488eab351ba08d3
-F test/window6.test 9b7d99ebe582f0d024eaa5086d418e1bbaea1380a68679b5f0771846df80856d
+F test/window6.test d2a243f0bf64cfc964fa55b0425ec74d984321bbe650e47d0d74e8f84aa9b7e9
 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 0f3f8fcde1a535bcf93e23a68d2411c21785d8c0cac1f9481a06e7225755cdbc
-R e301442ef11a5fd7b3f1ad65c10032f1
-U dan
-Z ea4860780f59b6fa99126e1ce0170d58
+P a6dffecc6b35c618cc5e5a06892765bdbec587dcd0ae8686c231a21516e38eab
+R 055d95416b748db9a689b97d7fc462d8
+U drh
+Z 8b00be6f689dd332950878afd9b35e47

diff --git a/manifest.uuid b/manifest.uuid
index 714c2ca1310301b12a00fb9a175b6171666594e0..2f86ae14feabb1c6ae880bea64c896c75431abcb 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a6dffecc6b35c618cc5e5a06892765bdbec587dcd0ae8686c231a21516e38eab
\ No newline at end of file
+927b95a0812787bcb3c28d1a0ea94717dc2cc60f6d480623f0c7cbce0c546fc9
\ No newline at end of file

diff --git a/src/window.c b/src/window.c
index 2a30ba42440b32e2fd2335d80359ebcf1c7a22c6..24dbc7930005b90b11f6c4312ac15244f874d069 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -827,18 +827,52 @@ void sqlite3WindowListDelete(sqlite3 *db, Window *p){
 }
 
 /*
-** Allocate and return a new Window object.
+** The argument expression is an PRECEDING or FOLLOWING offset.  The
+** value should be a non-negative integer.  If the value is not a
+** constant, change it to NULL.  The fact that it is then a non-negative
+** integer will be caught later.  But it is important not to leave
+** variable values in the expression tree.
+*/
+static Expr *sqlite3WindowOffsetExpr(Parse *pParse, Expr *pExpr){
+  if( 0==sqlite3ExprIsConstant(pExpr) ){
+    sqlite3ExprDelete(pParse->db, pExpr);
+    pExpr = sqlite3ExprAlloc(pParse->db, TK_NULL, 0, 0);
+  }
+  return pExpr;
+}
+
+/*
+** Allocate and return a new Window object describing a Window Definition.
 */
 Window *sqlite3WindowAlloc(
-  Parse *pParse, 
-  int eType,
-  int eStart, Expr *pStart,
-  int eEnd, Expr *pEnd
+  Parse *pParse,    /* Parsing context */
+  int eType,        /* Frame type. TK_RANGE or TK_ROWS */
+  int eStart,       /* Start type: CURRENT, PRECEDING, FOLLOWING, UNBOUNDED */
+  Expr *pStart,     /* Start window size if TK_PRECEDING or FOLLOWING */
+  int eEnd,         /* End type: CURRENT, FOLLOWING, TK_UNBOUNDED, PRECEDING */
+  Expr *pEnd        /* End window size if TK_FOLLOWING or PRECEDING */
 ){
   Window *pWin = 0;
 
+  /* Parser assures the following: */
+  assert( eType==TK_RANGE || eType==TK_ROWS );
+  assert( eStart==TK_CURRENT || eStart==TK_PRECEDING
+           || eStart==TK_UNBOUNDED || eStart==TK_FOLLOWING );
+  assert( eEnd==TK_CURRENT || eEnd==TK_FOLLOWING
+           || eEnd==TK_UNBOUNDED || eEnd==TK_PRECEDING );
+  assert( (eStart==TK_PRECEDING || eStart==TK_FOLLOWING)==(pStart!=0) );
+  assert( (eEnd==TK_FOLLOWING || eEnd==TK_PRECEDING)==(pEnd!=0) );
+
+
   /* If a frame is declared "RANGE" (not "ROWS"), then it may not use
-  ** either "<expr> PRECEDING" or "<expr> FOLLOWING". Additionally, the
+  ** either "<expr> PRECEDING" or "<expr> FOLLOWING".
+  */
+  if( eType==TK_RANGE && (pStart!=0 || pEnd!=0) ){
+    sqlite3ErrorMsg(pParse, "RANGE must use only UNBOUNDED or CURRENT ROW");
+    goto windowAllocErr;
+  }
+
+  /* Additionally, the
   ** starting boundary type may not occur earlier in the following list than
   ** the ending boundary type:
   **
@@ -852,30 +886,26 @@ Window *sqlite3WindowAlloc(
   ** boundary, and than "UNBOUNDED FOLLOWING" cannot be used as a starting
   ** frame boundary.
   */
-  if( eType==TK_RANGE && (pStart || pEnd) 
-   || (eStart==TK_CURRENT && eEnd==TK_PRECEDING)
+  if( (eStart==TK_CURRENT && eEnd==TK_PRECEDING)
    || (eStart==TK_FOLLOWING && (eEnd==TK_PRECEDING || eEnd==TK_CURRENT))
-   || (0==sqlite3ExprIsConstantOrFunction(pStart, 0))
-   || (0==sqlite3ExprIsConstantOrFunction(pEnd, 0))
   ){
-    sqlite3ErrorMsg(pParse, "unsupported window-frame type");
-  }else{
-    pWin = (Window*)sqlite3DbMallocZero(pParse->db, sizeof(Window));
-  }
-
-  if( pWin ){
-    assert( eType );
-    pWin->eType = eType;
-    pWin->eStart = eStart;
-    pWin->eEnd = eEnd;
-    pWin->pEnd = pEnd;
-    pWin->pStart = pStart;
-  }else{
-    sqlite3ExprDelete(pParse->db, pEnd);
-    sqlite3ExprDelete(pParse->db, pStart);
+    sqlite3ErrorMsg(pParse, "unsupported frame delimiter for ROWS");
+    goto windowAllocErr;
   }
 
+  pWin = (Window*)sqlite3DbMallocZero(pParse->db, sizeof(Window));
+  if( pWin==0 ) goto windowAllocErr;
+  pWin->eType = eType;
+  pWin->eStart = eStart;
+  pWin->eEnd = eEnd;
+  pWin->pEnd = sqlite3WindowOffsetExpr(pParse, pEnd);
+  pWin->pStart = sqlite3WindowOffsetExpr(pParse, pStart);
   return pWin;
+
+windowAllocErr:
+  sqlite3ExprDelete(pParse->db, pEnd);
+  sqlite3ExprDelete(pParse->db, pStart);
+  return 0;
 }
 
 /*
@@ -887,7 +917,8 @@ void sqlite3WindowAttach(Parse *pParse, Expr *p, Window *pWin){
       p->pWin = pWin;
       pWin->pOwner = p;
       if( p->flags & EP_Distinct ){
-        sqlite3ErrorMsg(pParse,"DISTINCT is not supported for window functions");
+        sqlite3ErrorMsg(pParse,
+           "DISTINCT is not supported for window functions");
       }
     }
   }else{
@@ -973,7 +1004,7 @@ void sqlite3WindowCodeInit(Parse *pParse, Window *pMWin){
 ** VM code to check that the value is a non-negative integer and throws
 ** an exception if it is not.
 */
-static void windowCheckFrameValue(Parse *pParse, int reg, int bEnd){
+static void windowCheckFrameOffset(Parse *pParse, int reg, int bEnd){
   static const char *azErr[] = {
     "frame starting offset must be a non-negative integer",
     "frame ending offset must be a non-negative integer"
@@ -1536,11 +1567,11 @@ static void windowCodeRowExprStep(
   ** an exception.  */
   if( pMWin->pStart ){
     sqlite3ExprCode(pParse, pMWin->pStart, regStart);
-    windowCheckFrameValue(pParse, regStart, 0);
+    windowCheckFrameOffset(pParse, regStart, 0);
   }
   if( pMWin->pEnd ){
     sqlite3ExprCode(pParse, pMWin->pEnd, regEnd);
-    windowCheckFrameValue(pParse, regEnd, 1);
+    windowCheckFrameOffset(pParse, regEnd, 1);
   }
 
   /* If this is "ROWS <expr1> FOLLOWING AND ROWS <expr2> FOLLOWING", do:

diff --git a/test/window6.test b/test/window6.test
index 9fd5257aecaf5bda6bd58a5d5321ee7bdbb50677..6d776cbddadc5fa78d16d4e155863567ada56bd7 100644 (file)
--- a/test/window6.test
+++ b/test/window6.test
@@ -221,13 +221,13 @@ do_catchsql_test 9.1 {
   WITH RECURSIVE c(x) AS (VALUES(1) UNION ALL SELECT x+1 FROM c WHERE x<5)
   SELECT x, group_concat(x) OVER (ORDER BY x RANGE 2 PRECEDING)
   FROM c;
-} {1 {unsupported window-frame type}}
+} {1 {RANGE must use only UNBOUNDED or CURRENT ROW}}
 
 do_catchsql_test 9.2 {
   WITH RECURSIVE c(x) AS (VALUES(1) UNION ALL SELECT x+1 FROM c WHERE x<5)
   SELECT x, group_concat(x) OVER (ORDER BY x RANGE BETWEEN UNBOUNDED PRECEDING AND 2 FOLLOWING)
   FROM c;
-} {1 {unsupported window-frame type}}
+} {1 {RANGE must use only UNBOUNDED or CURRENT ROW}}
 
 do_catchsql_test 9.3 {
   WITH RECURSIVE c(x) AS (VALUES(1) UNION ALL SELECT x+1 FROM c WHERE x<5)
@@ -254,16 +254,27 @@ foreach {tn frame} {
   2 "4 FOLLOWING"
   3 "BETWEEN 4 FOLLOWING AND CURRENT ROW"
   4 "BETWEEN 4 FOLLOWING AND 2 PRECEDING"
-  5 "BETWEEN a PRECEDING AND 2 FOLLOWING"
-  6 "BETWEEN 4 PRECEDING AND a FOLLOWING"
 } {
   do_catchsql_test 9.7.$tn "
     WITH RECURSIVE c(x) AS (VALUES(1) UNION ALL SELECT x+1 FROM c WHERE x<5)
     SELECT count() OVER (
         ORDER BY x ROWS $frame 
     ) FROM c;
-  " {1 {unsupported window-frame type}}
+  " {1 {unsupported frame delimiter for ROWS}}
 }
 
-finish_test
+do_catchsql_test 9.8.1 {
+  WITH RECURSIVE c(x) AS (VALUES(1) UNION ALL SELECT x+1 FROM c WHERE x<5)
+  SELECT count() OVER (
+      ORDER BY x ROWS BETWEEN a PRECEDING AND 2 FOLLOWING
+  ) FROM c;
+} {1 {frame starting offset must be a non-negative integer}}
+do_catchsql_test 9.8.2 {
+  WITH RECURSIVE c(x) AS (VALUES(1) UNION ALL SELECT x+1 FROM c WHERE x<5)
+  SELECT count() OVER (
+      ORDER BY x ROWS BETWEEN 2 PRECEDING AND a FOLLOWING
+  ) FROM c;
+} {1 {frame ending offset must be a non-negative integer}}
 
+
+finish_test