diff options
| author | drh <drh@noemail.net> | 2004-05-26 16:54:42 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2004-05-26 16:54:42 +0000 |
| commit | f9b596ebc05ff3365bed6b8dafb02d251c652889 (patch) | |
| tree | db56a7ae7dafee19f1d8fe3f947333c0914a7e0e /src/select.c | |
| parent | b77f5dadbf3e34d9724c836c6871955b59694123 (diff) | |
| download | sqlite-f9b596ebc05ff3365bed6b8dafb02d251c652889.tar.gz sqlite-f9b596ebc05ff3365bed6b8dafb02d251c652889.zip | |
Remove dataType and includeTypes flags from function definitions. Added new
P3_FUNCDEF type for P3 arguments on opcodes. Fixes to several user functions.
28 tests fail now. (CVS 1464)
FossilOrigin-Name: 36e031625995b2f7baf7654d771ca8fb764a0085
Diffstat (limited to 'src/select.c')
| -rw-r--r-- | src/select.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/select.c b/src/select.c index 2340cb5b4..36431d91e 100644 --- a/src/select.c +++ b/src/select.c @@ -12,7 +12,7 @@ ** This file contains C code routines that are called by the parser ** to handle SELECT statements in SQLite. ** -** $Id: select.c,v 1.177 2004/05/26 10:11:06 danielk1977 Exp $ +** $Id: select.c,v 1.178 2004/05/26 16:54:44 drh Exp $ */ #include "sqliteInt.h" @@ -2338,7 +2338,7 @@ int sqlite3Select( for(i=0; i<pParse->nAgg; i++){ FuncDef *pFunc; if( (pFunc = pParse->aAgg[i].pFunc)!=0 && pFunc->xFinalize!=0 ){ - sqlite3VdbeOp3(v, OP_AggInit, 0, i, (char*)pFunc, P3_POINTER); + sqlite3VdbeOp3(v, OP_AggInit, 0, i, (char*)pFunc, P3_FUNCDEF); } } if( pGroupBy==0 ){ @@ -2412,7 +2412,7 @@ int sqlite3Select( pE = pAgg->pExpr; assert( pE!=0 ); assert( pE->op==TK_AGG_FUNCTION ); - nExpr = sqlite3ExprCodeExprList(pParse, pE->pList, pDef->includeTypes); + nExpr = sqlite3ExprCodeExprList(pParse, pE->pList); sqlite3VdbeAddOp(v, OP_Integer, i, 0); sqlite3VdbeOp3(v, OP_AggFunc, 0, nExpr, (char*)pDef, P3_POINTER); } |