diff options
| author | drh <drh@noemail.net> | 2013-04-22 23:59:06 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2013-04-22 23:59:06 +0000 |
| commit | 16fb176814bd2b8fe46f7ed0e50a0b3d33db89a0 (patch) | |
| tree | 95791389bfc2d16f158af35b89e36fd39b23cc53 /src/resolve.c | |
| parent | 8bc8bfcb05ab15cac3c84b137b572350beb4de65 (diff) | |
| parent | da8caa0b2da85ebaf75fce1b19f5d645246f3eba (diff) | |
| download | sqlite-16fb176814bd2b8fe46f7ed0e50a0b3d33db89a0.tar.gz sqlite-16fb176814bd2b8fe46f7ed0e50a0b3d33db89a0.zip | |
Merge the latest trunk changes into the sessions branch.
FossilOrigin-Name: 6994826c0784280f2e9728dfa4185848846d03df
Diffstat (limited to 'src/resolve.c')
| -rw-r--r-- | src/resolve.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/resolve.c b/src/resolve.c index 038013867..9b350caf8 100644 --- a/src/resolve.c +++ b/src/resolve.c @@ -388,7 +388,10 @@ static int lookupName( ** Note that the expression in the result set should have already been ** resolved by the time the WHERE clause is resolved. */ - if( cnt==0 && (pEList = pNC->pEList)!=0 && zTab==0 ){ + if( (pEList = pNC->pEList)!=0 + && zTab==0 + && ((pNC->ncFlags & NC_AsMaybe)==0 || cnt==0) + ){ for(j=0; j<pEList->nExpr; j++){ char *zAs = pEList->a[j].zName; if( zAs!=0 && sqlite3StrICmp(zAs, zCol)==0 ){ @@ -479,7 +482,9 @@ static int lookupName( lookupname_end: if( cnt==1 ){ assert( pNC!=0 ); - sqlite3AuthRead(pParse, pExpr, pSchema, pNC->pSrcList); + if( pExpr->op!=TK_AS ){ + sqlite3AuthRead(pParse, pExpr, pSchema, pNC->pSrcList); + } /* Increment the nRef value on all name contexts from TopNC up to ** the point where the name matched. */ for(;;){ @@ -1154,11 +1159,10 @@ static int resolveSelectStep(Walker *pWalker, Select *p){ ** re-evaluated for each reference to it. */ sNC.pEList = p->pEList; - if( sqlite3ResolveExprNames(&sNC, p->pWhere) || - sqlite3ResolveExprNames(&sNC, p->pHaving) - ){ - return WRC_Abort; - } + if( sqlite3ResolveExprNames(&sNC, p->pHaving) ) return WRC_Abort; + sNC.ncFlags |= NC_AsMaybe; + if( sqlite3ResolveExprNames(&sNC, p->pWhere) ) return WRC_Abort; + sNC.ncFlags &= ~NC_AsMaybe; /* The ORDER BY and GROUP BY clauses may not refer to terms in ** outer queries |