diff options
| author | drh <drh@noemail.net> | 2015-09-24 14:26:51 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2015-09-24 14:26:51 +0000 |
| commit | 9ec0efd946b8015f8b3ba3b726bc39f0b15d306c (patch) | |
| tree | b4764dfa9ca1b2d064f80f3d13056f2b5bbeba61 /src/resolve.c | |
| parent | 438b881540c83370029c73c8a1d7eba78979c491 (diff) | |
| parent | 22c733da644bcf8d614b7caf058c7a2b51286ab8 (diff) | |
| download | sqlite-9ec0efd946b8015f8b3ba3b726bc39f0b15d306c.tar.gz sqlite-9ec0efd946b8015f8b3ba3b726bc39f0b15d306c.zip | |
Merge all the latest trunk enhancements into the sessions branch.
FossilOrigin-Name: c91065f8edb1e54076791716fc20d3fcfe3070dc
Diffstat (limited to 'src/resolve.c')
| -rw-r--r-- | src/resolve.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/resolve.c b/src/resolve.c index 2c4212ba7..ac1706b59 100644 --- a/src/resolve.c +++ b/src/resolve.c @@ -355,8 +355,13 @@ static int lookupName( /* ** Perhaps the name is a reference to the ROWID */ - if( cnt==0 && cntTab==1 && pMatch && sqlite3IsRowid(zCol) - && VisibleRowid(pMatch->pTab) ){ + if( cnt==0 + && cntTab==1 + && pMatch + && (pNC->ncFlags & NC_IdxExpr)==0 + && sqlite3IsRowid(zCol) + && VisibleRowid(pMatch->pTab) + ){ cnt = 1; pExpr->iColumn = -1; /* IMP: R-44911-55124 */ pExpr->affinity = SQLITE_AFF_INTEGER; |