diff options
| author | mistachkin <mistachkin@noemail.net> | 2013-09-06 22:27:55 +0000 |
|---|---|---|
| committer | mistachkin <mistachkin@noemail.net> | 2013-09-06 22:27:55 +0000 |
| commit | 9a5cbbc4a53b4ab409a56352cad15d0e86726a3d (patch) | |
| tree | a5bf785629ded11011fb50ea6e5ea77c158006de /src/func.c | |
| parent | 0157e01cc81d0d39c2d997f67f1a0f29c129c9ee (diff) | |
| parent | d36e1041120280adfc9612d8f6e4ade318b3ffa0 (diff) | |
| download | sqlite-9a5cbbc4a53b4ab409a56352cad15d0e86726a3d.tar.gz sqlite-9a5cbbc4a53b4ab409a56352cad15d0e86726a3d.zip | |
Merge updates from trunk.
FossilOrigin-Name: 8922be1a3e0269552e12b87fe1e5141c38a8d3f8
Diffstat (limited to 'src/func.c')
| -rw-r--r-- | src/func.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/func.c b/src/func.c index 7c6c6b26b..33eba21b7 100644 --- a/src/func.c +++ b/src/func.c @@ -1693,7 +1693,7 @@ static void setLikeOptFlag(sqlite3 *db, const char *zName, u8 flagVal){ pDef = sqlite3FindFunction(db, zName, sqlite3Strlen30(zName), 2, SQLITE_UTF8, 0); if( ALWAYS(pDef) ){ - pDef->flags = flagVal; + pDef->funcFlags |= flagVal; } } @@ -1737,7 +1737,7 @@ int sqlite3IsLikeFunction(sqlite3 *db, Expr *pExpr, int *pIsNocase, char *aWc){ pDef = sqlite3FindFunction(db, pExpr->u.zToken, sqlite3Strlen30(pExpr->u.zToken), 2, SQLITE_UTF8, 0); - if( NEVER(pDef==0) || (pDef->flags & SQLITE_FUNC_LIKE)==0 ){ + if( NEVER(pDef==0) || (pDef->funcFlags & SQLITE_FUNC_LIKE)==0 ){ return 0; } @@ -1749,7 +1749,7 @@ int sqlite3IsLikeFunction(sqlite3 *db, Expr *pExpr, int *pIsNocase, char *aWc){ assert( (char*)&likeInfoAlt == (char*)&likeInfoAlt.matchAll ); assert( &((char*)&likeInfoAlt)[1] == (char*)&likeInfoAlt.matchOne ); assert( &((char*)&likeInfoAlt)[2] == (char*)&likeInfoAlt.matchSet ); - *pIsNocase = (pDef->flags & SQLITE_FUNC_CASE)==0; + *pIsNocase = (pDef->funcFlags & SQLITE_FUNC_CASE)==0; return 1; } @@ -1830,7 +1830,7 @@ void sqlite3RegisterGlobalFunctions(void){ AGGREGATE(total, 1, 0, 0, sumStep, totalFinalize ), AGGREGATE(avg, 1, 0, 0, sumStep, avgFinalize ), /* AGGREGATE(count, 0, 0, 0, countStep, countFinalize ), */ - {0,SQLITE_UTF8,SQLITE_FUNC_COUNT,0,0,0,countStep,countFinalize,"count",0,0}, + {0,SQLITE_UTF8|SQLITE_FUNC_COUNT,0,0,0,countStep,countFinalize,"count",0,0}, AGGREGATE(count, 1, 0, 0, countStep, countFinalize ), AGGREGATE(group_concat, 1, 0, 0, groupConcatStep, groupConcatFinalize), AGGREGATE(group_concat, 2, 0, 0, groupConcatStep, groupConcatFinalize), |