diff options
| author | drh <drh@noemail.net> | 2014-02-12 14:43:52 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2014-02-12 14:43:52 +0000 |
| commit | 784156f84c7a64d0546ec600a0e7ce0612b48565 (patch) | |
| tree | 1887da7b5fd1e6f44375429bdf715fa4cf822cb6 /src/resolve.c | |
| parent | c5185cd845664005898f8a00b4b5ecfc3b106f2c (diff) | |
| download | sqlite-784156f84c7a64d0546ec600a0e7ce0612b48565.tar.gz sqlite-784156f84c7a64d0546ec600a0e7ce0612b48565.zip | |
Make sure "rowid" columns are correctly resolved in joins between normal
tables and WITHOUT ROWID tables. Fix for ticket [c34d0557f740c45070].
FossilOrigin-Name: 5d01426ddfb2d47c57f93f71378594e637424be0
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 b0adb8629..07e0e919a 100644 --- a/src/resolve.c +++ b/src/resolve.c @@ -380,8 +380,8 @@ static int lookupName( /* ** Perhaps the name is a reference to the ROWID */ - assert( pTab!=0 || cntTab==0 ); - if( cnt==0 && cntTab==1 && sqlite3IsRowid(zCol) && HasRowid(pTab) ){ + if( cnt==0 && cntTab==1 && pMatch && sqlite3IsRowid(zCol) + && HasRowid(pMatch->pTab) ){ cnt = 1; pExpr->iColumn = -1; /* IMP: R-44911-55124 */ pExpr->affinity = SQLITE_AFF_INTEGER; |