diff options
| author | drh <drh@noemail.net> | 2020-01-06 15:25:41 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2020-01-06 15:25:41 +0000 |
| commit | 2928a15b3c4c16bb3894bcd809c0626c469bf7ba (patch) | |
| tree | c9c92cc31c09d287aad3356caa9f49f8fc7a9232 /src/resolve.c | |
| parent | 67c826536fba0cf3f430fc1abe42e0795de50de5 (diff) | |
| download | sqlite-2928a15b3c4c16bb3894bcd809c0626c469bf7ba.tar.gz sqlite-2928a15b3c4c16bb3894bcd809c0626c469bf7ba.zip | |
Refactor names of flags for improved legibility.
FossilOrigin-Name: 411e8ec2219bb4181aaf2209fb1e7baf5e8df8b8c8adb82a69b48cf7e8e7e7d4
Diffstat (limited to 'src/resolve.c')
| -rw-r--r-- | src/resolve.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/resolve.c b/src/resolve.c index c4321e393..8ccd0ab7d 100644 --- a/src/resolve.c +++ b/src/resolve.c @@ -887,17 +887,18 @@ static int resolveExprStep(Walker *pWalker, Expr *pExpr){ pDef = 0; }else if( (pDef->funcFlags & (SQLITE_FUNC_DIRECT|SQLITE_FUNC_UNSAFE))!=0 - && ExprHasProperty(pExpr, EP_Indirect) + && ExprHasProperty(pExpr, EP_FromDDL) && !IN_RENAME_OBJECT ){ if( (pDef->funcFlags & SQLITE_FUNC_DIRECT)!=0 - || (pParse->db->flags & SQLITE_UnsafeDDL)==0 + || (pParse->db->flags & SQLITE_UnsafeSchema)!=0 ){ /* Functions prohibited in triggers and views if: ** (1) tagged with SQLITE_DIRECTONLY ** (2) not tagged with SQLITE_INNOCUOUS (which means it ** is tagged with SQLITE_FUNC_UNSAFE) and - ** SQLITE_DBCONFIG_ENABLE_UNSAFE_DDL is off + ** SQLITE_DBCONFIG_UNTRUSTED_SCHEMA is off (meaning + ** that the schema is fully trustworthy). */ sqlite3ErrorMsg(pParse, "%s() prohibited in triggers and views", pDef->zName); |