diff options
| author | drh <drh@noemail.net> | 2015-08-19 15:20:00 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2015-08-19 15:20:00 +0000 |
| commit | 8a48b9c0b18e01b0fec665ad1c86a6fce5fbf1cf (patch) | |
| tree | 585273f1e2fc5552b6442e4d53aa0eb174334eb6 /src/resolve.c | |
| parent | 398f872d1f8d264068bc58ab9947cb7aa6a42427 (diff) | |
| download | sqlite-8a48b9c0b18e01b0fec665ad1c86a6fce5fbf1cf.tar.gz sqlite-8a48b9c0b18e01b0fec665ad1c86a6fce5fbf1cf.zip | |
Minor refactor of the SrcList object so that it is able to hold the argument
list to a table-valued-function in the FROM clause.
FossilOrigin-Name: b919376147597c4b73421abe5788f893baf1560b
Diffstat (limited to 'src/resolve.c')
| -rw-r--r-- | src/resolve.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/resolve.c b/src/resolve.c index fd57fd702..ecba89162 100644 --- a/src/resolve.c +++ b/src/resolve.c @@ -306,7 +306,7 @@ static int lookupName( ** USING clause, then skip this match. */ if( cnt==1 ){ - if( pItem->jointype & JT_NATURAL ) continue; + if( pItem->fg.jointype & JT_NATURAL ) continue; if( nameInUsingClause(pItem->pUsing, zCol) ) continue; } cnt++; @@ -321,8 +321,8 @@ static int lookupName( pExpr->iTable = pMatch->iCursor; pExpr->pTab = pMatch->pTab; /* RIGHT JOIN not (yet) supported */ - assert( (pMatch->jointype & JT_RIGHT)==0 ); - if( (pMatch->jointype & JT_LEFT)!=0 ){ + assert( (pMatch->fg.jointype & JT_RIGHT)==0 ); + if( (pMatch->fg.jointype & JT_LEFT)!=0 ){ ExprSetProperty(pExpr, EP_CanBeNull); } pSchema = pExpr->pTab->pSchema; @@ -1215,7 +1215,7 @@ static int resolveSelectStep(Walker *pWalker, Select *p){ ** parent contexts. After resolving references to expressions in ** pItem->pSelect, check if this value has changed. If so, then ** SELECT statement pItem->pSelect must be correlated. Set the - ** pItem->isCorrelated flag if this is the case. */ + ** pItem->fg.isCorrelated flag if this is the case. */ for(pNC=pOuterNC; pNC; pNC=pNC->pNext) nRef += pNC->nRef; if( pItem->zName ) pParse->zAuthContext = pItem->zName; @@ -1224,8 +1224,8 @@ static int resolveSelectStep(Walker *pWalker, Select *p){ if( pParse->nErr || db->mallocFailed ) return WRC_Abort; for(pNC=pOuterNC; pNC; pNC=pNC->pNext) nRef -= pNC->nRef; - assert( pItem->isCorrelated==0 && nRef<=0 ); - pItem->isCorrelated = (nRef!=0); + assert( pItem->fg.isCorrelated==0 && nRef<=0 ); + pItem->fg.isCorrelated = (nRef!=0); } } |