aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/resolve.c2
-rw-r--r--src/whereexpr.c5
2 files changed, 6 insertions, 1 deletions
diff --git a/src/resolve.c b/src/resolve.c
index 203253c6e..ef2c0c624 100644
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -636,11 +636,13 @@ static int lookupName(
lookupname_end:
if( cnt==1 ){
assert( pNC!=0 );
+#ifndef SQLITE_OMIT_AUTHORIZATION
if( pParse->db->xAuth
&& (pExpr->op==TK_COLUMN || pExpr->op==TK_TRIGGER)
){
sqlite3AuthRead(pParse, pExpr, pSchema, pNC->pSrcList);
}
+#endif
/* Increment the nRef value on all name contexts from TopNC up to
** the point where the name matched. */
for(;;){
diff --git a/src/whereexpr.c b/src/whereexpr.c
index 30bf2a333..7b80c4139 100644
--- a/src/whereexpr.c
+++ b/src/whereexpr.c
@@ -1210,7 +1210,10 @@ static void exprAnalyzeExists(
assert( pExpr->op==TK_EXISTS );
assert( (pExpr->flags & EP_VarSelect) && (pExpr->flags & EP_xIsSelect) );
- if( (pSel->selFlags & SF_Aggregate) || pSel->pWin ) return;
+ if( pSel->selFlags & SF_Aggregate ) return;
+#ifndef SQLITE_OMIT_WINDOWFUNC
+ if( pSel->pWin ) return;
+#endif
if( pSel->pPrior ) return;
if( pSel->pWhere==0 ) return;
if( 0==exprAnalyzeExistsFindEq(pSel, 0, 0) ) return;