diff options
| author | drh <drh@noemail.net> | 2015-02-09 14:07:07 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2015-02-09 14:07:07 +0000 |
| commit | 63f845734e7de67fb04ad1e8990c41850547ce07 (patch) | |
| tree | 3096f92244d7c4fa05e45ae2b6526a7584589c08 /src | |
| parent | 17645f5eecb950205481179bb0dee1e5332a2e8e (diff) | |
| download | sqlite-63f845734e7de67fb04ad1e8990c41850547ce07.tar.gz sqlite-63f845734e7de67fb04ad1e8990c41850547ce07.zip | |
Rename the internal "EP_Constant" bitmask to a less misleading "EP_ConstFunc".
FossilOrigin-Name: 4ef7ceced2b0000d21f7f8014384c04a0e4661d3
Diffstat (limited to 'src')
| -rw-r--r-- | src/expr.c | 2 | ||||
| -rw-r--r-- | src/resolve.c | 2 | ||||
| -rw-r--r-- | src/sqliteInt.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/expr.c b/src/expr.c index 25bd958ce..2f0fe4a58 100644 --- a/src/expr.c +++ b/src/expr.c @@ -1249,7 +1249,7 @@ static int exprNodeIsConstant(Walker *pWalker, Expr *pExpr){ ** and either pWalker->eCode==4 or 5 or the function has the ** SQLITE_FUNC_CONST flag. */ case TK_FUNCTION: - if( pWalker->eCode>=4 || ExprHasProperty(pExpr,EP_Constant) ){ + if( pWalker->eCode>=4 || ExprHasProperty(pExpr,EP_ConstFunc) ){ return WRC_Continue; }else{ pWalker->eCode = 0; diff --git a/src/resolve.c b/src/resolve.c index 3cca16832..47df7243f 100644 --- a/src/resolve.c +++ b/src/resolve.c @@ -740,7 +740,7 @@ static int resolveExprStep(Walker *pWalker, Expr *pExpr){ } #endif if( pDef->funcFlags & SQLITE_FUNC_CONSTANT ){ - ExprSetProperty(pExpr,EP_Constant); + ExprSetProperty(pExpr,EP_ConstFunc); } } if( is_agg && (pNC->ncFlags & NC_AllowAgg)==0 ){ diff --git a/src/sqliteInt.h b/src/sqliteInt.h index 0bc6f679d..f5892db4b 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -2044,7 +2044,7 @@ struct Expr { #define EP_MemToken 0x010000 /* Need to sqlite3DbFree() Expr.zToken */ #define EP_NoReduce 0x020000 /* Cannot EXPRDUP_REDUCE this Expr */ #define EP_Unlikely 0x040000 /* unlikely() or likelihood() function */ -#define EP_Constant 0x080000 /* Node is a constant */ +#define EP_ConstFunc 0x080000 /* Node is a SQLITE_FUNC_CONSTANT function */ #define EP_CanBeNull 0x100000 /* Can be null despite NOT NULL constraint */ /* |