diff options
author | drh <drh@noemail.net> | 2020-06-19 13:33:53 +0000 |
---|---|---|
committer | drh <drh@noemail.net> | 2020-06-19 13:33:53 +0000 |
commit | 1e32bed3c1ce78263598d860d531d3e7e6171929 (patch) | |
tree | 99d3cd6e0ba9a7f1f5a2ae425e638afd95f913ba /src/expr.c | |
parent | ccb2113a622f4d119f97185a59d088910cf827b7 (diff) | |
download | sqlite-1e32bed3c1ce78263598d860d531d3e7e6171929.tar.gz sqlite-1e32bed3c1ce78263598d860d531d3e7e6171929.zip |
Further refactoring of the schema table name.
FossilOrigin-Name: 9536fa0ae0c1ae6e2e98d2fa11e5acda7f3c9b8ca5061b6f7f8cae63a11d936b
Diffstat (limited to 'src/expr.c')
-rw-r--r-- | src/expr.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/expr.c b/src/expr.c index bfa247b4e..201d53ac3 100644 --- a/src/expr.c +++ b/src/expr.c @@ -1993,10 +1993,10 @@ Expr *sqlite3ExprSimplifiedAndOr(Expr *pExpr){ ** ** The sqlite3ExprIsConstantOrFunction() is used for evaluating DEFAULT ** expressions in a CREATE TABLE statement. The Walker.eCode value is 5 -** when parsing an existing schema out of the sqlite_master table and 4 +** when parsing an existing schema out of the sqlite_schema table and 4 ** when processing a new CREATE TABLE statement. A bound parameter raises ** an error for new statements, but is silently converted -** to NULL for existing schemas. This allows sqlite_master tables that +** to NULL for existing schemas. This allows sqlite_schema tables that ** contain a bound parameter because they were generated by older versions ** of SQLite to be parsed by newer versions of SQLite without raising a ** malformed schema error. @@ -2058,7 +2058,7 @@ static int exprNodeIsConstant(Walker *pWalker, Expr *pExpr){ if( pWalker->eCode==5 ){ /* Silently convert bound parameters that appear inside of CREATE ** statements into a NULL when parsing the CREATE statement text out - ** of the sqlite_master table */ + ** of the sqlite_schema table */ pExpr->op = TK_NULL; }else if( pWalker->eCode==4 ){ /* A bound parameter in a CREATE statement that originates from @@ -2191,12 +2191,12 @@ int sqlite3ExprIsConstantOrGroupBy(Parse *pParse, Expr *p, ExprList *pGroupBy){ ** the expression is constant or a function call with constant arguments. ** Return and 0 if there are any variables. ** -** isInit is true when parsing from sqlite_master. isInit is false when +** isInit is true when parsing from sqlite_schema. isInit is false when ** processing a new CREATE TABLE statement. When isInit is true, parameters ** (such as ? or $abc) in the expression are converted into NULL. When ** isInit is false, parameters raise an error. Parameters should not be ** allowed in a CREATE TABLE statement, but some legacy versions of SQLite -** allowed it, so we need to support it when reading sqlite_master for +** allowed it, so we need to support it when reading sqlite_schema for ** backwards compatibility. ** ** If isInit is true, set EP_FromDDL on every TK_FUNCTION node. |