diff options
| author | drh <drh@noemail.net> | 2013-09-12 16:50:49 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2013-09-12 16:50:49 +0000 |
| commit | c5cd124900f463df0410da7f30e8d47ec07810d5 (patch) | |
| tree | 6ed728b3a36777d4e14db55c062ccd0a385dd42e /src/resolve.c | |
| parent | a9cb5be49aed9014dfc7fcc74f7bf4bfe62909cf (diff) | |
| download | sqlite-c5cd124900f463df0410da7f30e8d47ec07810d5.tar.gz sqlite-c5cd124900f463df0410da7f30e8d47ec07810d5.zip | |
Increase the number of bits available in Expr.flags. Other tweaks aimed at
making expression processing more robust.
FossilOrigin-Name: 579a512538528cf4bb4381ba393c5d9e7310086b
Diffstat (limited to 'src/resolve.c')
| -rw-r--r-- | src/resolve.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/resolve.c b/src/resolve.c index 43a3870e2..54ce3adf5 100644 --- a/src/resolve.c +++ b/src/resolve.c @@ -129,7 +129,7 @@ static void resolveAlias( if( !ExprHasProperty(pExpr, EP_IntValue) && pExpr->u.zToken!=0 ){ assert( (pExpr->flags & (EP_Reduced|EP_TokenOnly))==0 ); pExpr->u.zToken = sqlite3DbStrDup(db, pExpr->u.zToken); - pExpr->flags2 |= EP2_MallocedToken; + pExpr->flags |= EP_MemToken; } sqlite3DbFree(db, pDup); } @@ -229,7 +229,7 @@ static int lookupName( assert( pNC ); /* the name context cannot be NULL. */ assert( zCol ); /* The Z in X.Y.Z cannot be NULL */ - assert( !ExprHasAnyProperty(pExpr, EP_TokenOnly|EP_Reduced) ); + assert( !ExprHasProperty(pExpr, EP_TokenOnly|EP_Reduced) ); /* Initialize the node to no-match */ pExpr->iTable = -1; @@ -591,7 +591,7 @@ static int resolveExprStep(Walker *pWalker, Expr *pExpr){ pParse = pNC->pParse; assert( pParse==pWalker->pParse ); - if( ExprHasAnyProperty(pExpr, EP_Resolved) ) return WRC_Prune; + if( ExprHasProperty(pExpr, EP_Resolved) ) return WRC_Prune; ExprSetProperty(pExpr, EP_Resolved); #ifndef NDEBUG if( pNC->pSrcList && pNC->pSrcList->nAlloc>0 ){ |