database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-07-30 19:03:16 +03:00
Code Activity

:-) (CVS 79)

Browse Source 
FossilOrigin-Name: 305b043f4f71278d6d2c32e6e457f63efefae20d
This commit is contained in:
drh
2000-06-08 11:25:00 +00:00
parent 191b690eb3
commit aaf88729b7
5 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/expr.c
View File

@ -23,7 +23,7 @@
*************************************************************************
** This file contains C code routines used for processing expressions
**
** $Id: expr.c,v 1.11 2000/06/07 23:51:50 drh Exp $
** $Id: expr.c,v 1.12 2000/06/08 11:25:01 drh Exp $
*/
#include "sqliteInt.h"
@ -834,7 +834,6 @@ int sqliteExprAnalyzeAggregates(Parse *pParse, Expr *pExpr){
if( aAgg[i].isAgg ) continue;
if( aAgg[i].pExpr->iTable==pExpr->iTable
&& aAgg[i].pExpr->iField==pExpr->iField ){
pExpr->iAgg = i;
break;
}
}
@ -844,6 +843,7 @@ int sqliteExprAnalyzeAggregates(Parse *pParse, Expr *pExpr){
pParse->aAgg[i].isAgg = 0;
pParse->aAgg[i].pExpr = pExpr;
}
pExpr->iAgg = i;
break;
}
case TK_AGG_FUNCTION: {

3
src/select.c
View File

@ -24,7 +24,7 @@
** This file contains C code routines that are called by the parser
** to handle SELECT statements.
**
** $Id: select.c,v 1.20 2000/06/08 11:13:02 drh Exp $
** $Id: select.c,v 1.21 2000/06/08 11:25:01 drh Exp $
*/
#include "sqliteInt.h"
@ -781,6 +781,7 @@ int sqliteSelect(
/* Do an analysis of aggregate expressions.
*/
if( isAgg ){
assert( pParse->nAgg==0 && pParse->iAggCount<0 );
for(i=0; i<pEList->nExpr; i++){
if( sqliteExprAnalyzeAggregates(pParse, pEList->a[i].pExpr) ){
return 1;