No prepare-time penality for ordered-set aggregates for applications that

do not use them.

FossilOrigin-Name: e070c16d2183312e416ff6af770346041e4d3836c4db2c9ea6049f63fb0eaa07

4 files changed, 16 insertions, 13 deletions

diff --git a/src/parse.y b/src/parse.y
index 3db20e9ac..c126c815d 100644
--- a/src/parse.y
+++ b/src/parse.y
@@ -1199,12 +1199,20 @@ expr(A) ::= idj(X) LP STAR RP. {
       }
       sqlite3ExprListDelete(pParse->db, pOrig);
     }
-    if( isDistinct==SF_Distinct ){
-      sqlite3ErrorMsg(pParse, "DISTINCT not allows on ordered-set aggregate %T()",
-                      pFuncname);
-    }
     pExpr = sqlite3ExprFunction(pParse, p, pFuncname, 0);
-    if( pExpr ) pExpr->iColumn = 1;
+    if( pParse->nErr==0 ){
+      FuncDef *pDef;
+      u8 enc = ENC(pParse->db);
+      assert( pExpr!=0 );  /* Because otherwise pParse->nErr would not be zero */
+      assert( p!=0 );      /* Because otherwise pParse->nErr would not be zero */
+      pDef = sqlite3FindFunction(pParse->db, pExpr->u.zToken, p->nExpr, enc, 0);
+      if( pDef==0 || (pDef->funcFlags & SQLITE_SELFORDER1)==0 ){
+        sqlite3ErrorMsg(pParse, "%#T() is not an ordered-set aggregate", pExpr);
+      }else if( isDistinct==SF_Distinct ){
+        sqlite3ErrorMsg(pParse, "DISTINCT not allows on ordered-set aggregate %T()",
+                        pFuncname);
+      }
+    }
     return pExpr;
   }
 }
diff --git a/src/resolve.c b/src/resolve.c
index f448bc324..b755cc864 100644
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -1292,10 +1292,6 @@ static int resolveExprStep(Walker *pWalker, Expr *pExpr){
       else if( ExprHasProperty(pExpr, EP_WinFunc) || pExpr->pLeft ){
         is_agg = 1;
       }
-      if( pExpr->iColumn && (pDef->funcFlags & SQLITE_SELFORDER1)==0 ){
-        sqlite3ErrorMsg(pParse, "%#T() is not a ordered-set aggregate function",
-                        pExpr);
-      }
       sqlite3WalkExprList(pWalker, pList);
       if( is_agg ){
         if( pExpr->pLeft ){
diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index 8e5e327c9..c1f1c1c36 100644
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -5619,9 +5619,9 @@ int sqlite3_create_window_function(
 ** [[SQLITE_SELFORDER1]] <dt>SQLITE_SELFORDER1</dt><dd>
 ** The SQLITE_SELFORDER1 flag indicates that the function is an aggregate
 ** that internally orders the values provided to the first argument.  The
-** ordered-set aggregate SQL notation can be used to invoke this function.
-** If the ordered-set aggregate notation is used on a function that lacks
-** this flag, then an error is raised.
+** ordered-set aggregate SQL notation with a single ORDER BY term can be
+** used to invoke this function.  If the ordered-set aggregate notation is
+** used on a function that lacks this flag, then an error is raised.
 ** </dd>
 ** </dl>
 */
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index b77f035e7..0dab59f7a 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -3052,7 +3052,6 @@ struct Expr {
                          ** TK_SELECT: 1st register of result vector */
   ynVar iColumn;         /* TK_COLUMN: column index.  -1 for rowid.
                          ** TK_VARIABLE: variable number (always >= 1).
-                         ** TK_FUNCTION: Uses ordered-set aggregate syntax
                          ** TK_SELECT_COLUMN: column of the result vector */
   i16 iAgg;              /* Which entry in pAggInfo->aCol[] or ->aFunc[] */
   union {