Further improvements to the processing of nested aggregate queries.
FossilOrigin-Name: 3c3ffa901f5ce8a523028ff15563ce3e0f55a641
diff --git a/src/resolve.c b/src/resolve.c
index a66f88f..bfbcd20 100644
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -568,13 +568,19 @@
nId, zId);
pNC->nErr++;
}
- if( is_agg ){
- pExpr->op = TK_AGG_FUNCTION;
- pNC->ncFlags |= NC_HasAgg;
- }
if( is_agg ) pNC->ncFlags &= ~NC_AllowAgg;
sqlite3WalkExprList(pWalker, pList);
- if( is_agg ) pNC->ncFlags |= NC_AllowAgg;
+ if( is_agg ){
+ NameContext *pNC2 = pNC;
+ pExpr->op = TK_AGG_FUNCTION;
+ pExpr->op2 = 0;
+ while( pNC2 && !sqlite3FunctionUsesThisSrc(pExpr, pNC2->pSrcList) ){
+ pExpr->op2++;
+ pNC2 = pNC2->pNext;
+ }
+ if( pNC2 ) pNC2->ncFlags |= NC_HasAgg;
+ pNC->ncFlags |= NC_AllowAgg;
+ }
/* FIX ME: Compute pExpr->affinity based on the expected return
** type of the function
*/