diff options
| author | dan <dan@noemail.net> | 2015-06-02 18:07:58 +0000 |
|---|---|---|
| committer | dan <dan@noemail.net> | 2015-06-02 18:07:58 +0000 |
| commit | 167fd757f0799d5c6519d66cd9f26e6ffcb2f1bd (patch) | |
| tree | 4482f33a4ccf87878095e1bddd515f85f7d57137 /src/resolve.c | |
| parent | dbef6e752e9c1d26f9f1a0a62fee3e523b490bf0 (diff) | |
| parent | 467c1c70fb519279fe5f806425923417673eb2f1 (diff) | |
| download | sqlite-167fd757f0799d5c6519d66cd9f26e6ffcb2f1bd.tar.gz sqlite-167fd757f0799d5c6519d66cd9f26e6ffcb2f1bd.zip | |
Merge latest trunk changes with this branch.
FossilOrigin-Name: c9ffda4abb4390bbc5719e269196e2807b254f97
Diffstat (limited to 'src/resolve.c')
| -rw-r--r-- | src/resolve.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/resolve.c b/src/resolve.c index 23636eace..27eba9fd0 100644 --- a/src/resolve.c +++ b/src/resolve.c @@ -358,7 +358,7 @@ static int lookupName( break; } } - if( iCol>=pTab->nCol && sqlite3IsRowid(zCol) && HasRowid(pTab) ){ + if( iCol>=pTab->nCol && sqlite3IsRowid(zCol) && VisibleRowid(pTab) ){ /* IMP: R-51414-32910 */ /* IMP: R-44911-55124 */ iCol = -1; @@ -388,7 +388,7 @@ static int lookupName( ** Perhaps the name is a reference to the ROWID */ if( cnt==0 && cntTab==1 && pMatch && sqlite3IsRowid(zCol) - && HasRowid(pMatch->pTab) ){ + && VisibleRowid(pMatch->pTab) ){ cnt = 1; pExpr->iColumn = -1; /* IMP: R-44911-55124 */ pExpr->affinity = SQLITE_AFF_INTEGER; |