Make sure all terms of the ORDER BY within an aggregate go through aggregate
analysis. Do not attach an aggregate ORDER BY to a window function. FossilOrigin-Name: 16f3805514a741405f70e0ee3b5a6b67720bc75719372e82daa4136fe411ea2b
This commit is contained in:
+16
@@ -1181,6 +1181,16 @@ Expr *sqlite3ExprFunction(
|
||||
return pNew;
|
||||
}
|
||||
|
||||
/*
|
||||
** Report an error when attempting to use an ORDER BY clause within
|
||||
** the arguments of a non-aggregate function.
|
||||
*/
|
||||
void sqlite3ExprOrderByAggregateError(Parse *pParse, Expr *p){
|
||||
sqlite3ErrorMsg(pParse,
|
||||
"ORDER BY may not be used with non-aggregate %#T()", p
|
||||
);
|
||||
}
|
||||
|
||||
/*
|
||||
** Attach an ORDER BY clause to a function call.
|
||||
**
|
||||
@@ -1215,6 +1225,12 @@ void sqlite3ExprAddFunctionOrderBy(
|
||||
sqlite3ExprListDelete(db, pOrderBy);
|
||||
return;
|
||||
}
|
||||
if( IsWindowFunc(pExpr) ){
|
||||
sqlite3ExprOrderByAggregateError(pParse, pExpr);
|
||||
sqlite3ExprListDelete(db, pOrderBy);
|
||||
return;
|
||||
}
|
||||
|
||||
pOB = sqlite3ExprAlloc(db, TK_ORDER, 0, 0);
|
||||
if( pOB==0 ){
|
||||
sqlite3ExprListDelete(db, pOrderBy);
|
||||
|
||||
+1
-4
@@ -1195,10 +1195,7 @@ static int resolveExprStep(Walker *pWalker, Expr *pExpr){
|
||||
}
|
||||
#endif
|
||||
else if( is_agg==0 && pExpr->pLeft ){
|
||||
sqlite3ErrorMsg(pParse,
|
||||
"ORDER BY may not be used with non-aggregate %#T()",
|
||||
pExpr
|
||||
);
|
||||
sqlite3ExprOrderByAggregateError(pParse, pExpr);
|
||||
pNC->nNcErr++;
|
||||
}
|
||||
if( is_agg ){
|
||||
|
||||
@@ -6490,8 +6490,14 @@ static void analyzeAggFuncArgs(
|
||||
pNC->ncFlags |= NC_InAggFunc;
|
||||
for(i=0; i<pAggInfo->nFunc; i++){
|
||||
Expr *pExpr = pAggInfo->aFunc[i].pFExpr;
|
||||
assert( pExpr->op==TK_FUNCTION || pExpr->op==TK_AGG_FUNCTION );
|
||||
assert( ExprUseXList(pExpr) );
|
||||
sqlite3ExprAnalyzeAggList(pNC, pExpr->x.pList);
|
||||
if( pExpr->pLeft ){
|
||||
assert( pExpr->pLeft->op==TK_ORDER );
|
||||
assert( ExprUseXList(pExpr->pLeft) );
|
||||
sqlite3ExprAnalyzeAggList(pNC, pExpr->pLeft->x.pList);
|
||||
}
|
||||
#ifndef SQLITE_OMIT_WINDOWFUNC
|
||||
assert( !IsWindowFunc(pExpr) );
|
||||
if( ExprHasProperty(pExpr, EP_WinFunc) ){
|
||||
|
||||
@@ -4790,6 +4790,7 @@ Expr *sqlite3ExprAnd(Parse*,Expr*, Expr*);
|
||||
Expr *sqlite3ExprSimplifiedAndOr(Expr*);
|
||||
Expr *sqlite3ExprFunction(Parse*,ExprList*, const Token*, int);
|
||||
void sqlite3ExprAddFunctionOrderBy(Parse*,Expr*,ExprList*);
|
||||
void sqlite3ExprOrderByAggregateError(Parse*,Expr*);
|
||||
void sqlite3ExprFunctionUsable(Parse*,const Expr*,const FuncDef*);
|
||||
void sqlite3ExprAssignVarNumber(Parse*, Expr*, u32);
|
||||
void sqlite3ExprDelete(sqlite3*, Expr*);
|
||||
|
||||
Reference in New Issue
Block a user