diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/parse.y | 2 | ||||
| -rw-r--r-- | src/resolve.c | 3 | ||||
| -rw-r--r-- | src/sqliteInt.h | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/src/parse.y b/src/parse.y index dc8cff84b..52bc87f22 100644 --- a/src/parse.y +++ b/src/parse.y @@ -898,7 +898,7 @@ term(A) ::= INTEGER(X). { A.pExpr = sqlite3ExprAlloc(pParse->db, TK_INTEGER, &X, 1); A.zStart = X.z; A.zEnd = X.z + X.n; - if( A.pExpr ) A.pExpr->flags |= EP_Leaf|EP_Resolved; + if( A.pExpr ) A.pExpr->flags |= EP_Leaf; } expr(A) ::= VARIABLE(X). { if( !(X.z[0]=='#' && sqlite3Isdigit(X.z[1])) ){ diff --git a/src/resolve.c b/src/resolve.c index b13786f4d..78f37512a 100644 --- a/src/resolve.c +++ b/src/resolve.c @@ -517,7 +517,6 @@ Expr *sqlite3CreateColumnExpr(sqlite3 *db, SrcList *pSrc, int iSrc, int iCol){ testcase( iCol==BMS-1 ); pItem->colUsed |= ((Bitmask)1)<<(iCol>=BMS ? BMS-1 : iCol); } - ExprSetProperty(p, EP_Resolved); } return p; } @@ -577,8 +576,6 @@ static int resolveExprStep(Walker *pWalker, Expr *pExpr){ pParse = pNC->pParse; assert( pParse==pWalker->pParse ); - if( ExprHasProperty(pExpr, EP_Resolved) ) return WRC_Prune; - ExprSetProperty(pExpr, EP_Resolved); #ifndef NDEBUG if( pNC->pSrcList && pNC->pSrcList->nAlloc>0 ){ SrcList *pSrcList = pNC->pSrcList; diff --git a/src/sqliteInt.h b/src/sqliteInt.h index 5f7ad50cc..e0c569825 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -2372,7 +2372,7 @@ struct Expr { */ #define EP_FromJoin 0x000001 /* Originates in ON/USING clause of outer join */ #define EP_Agg 0x000002 /* Contains one or more aggregate functions */ -#define EP_Resolved 0x000004 /* IDs have been resolved to COLUMNs */ + /* 0x000004 // available for use */ /* 0x000008 // available for use */ #define EP_Distinct 0x000010 /* Aggregate function with DISTINCT keyword */ #define EP_VarSelect 0x000020 /* pSelect is correlated, not constant */ |