aboutsummaryrefslogtreecommitdiff
path: root/src/resolve.c
diff options
context:
space:
mode:
authordrh <>2024-03-19 19:56:39 +0000
committerdrh <>2024-03-19 19:56:39 +0000
commit36f01f2ee3da6698b85d29602a673232a9751fa4 (patch)
tree232f1d56c5ab52f91a78c5ef06c4e3486dc5d11a /src/resolve.c
parent4aa21492d134e4713e7d0b9a2fa0df69af0595f3 (diff)
parenta10c2a9055fd7426cdd19a58c279d06cb794e027 (diff)
downloadsqlite-36f01f2ee3da6698b85d29602a673232a9751fa4.tar.gz
sqlite-36f01f2ee3da6698b85d29602a673232a9751fa4.zip
Return the error "ambiguous column name: rowid", instead of "no such column: rowid", when a "rowid" reference is ambiguous.
FossilOrigin-Name: 0615bdae2dfc70c7e0416a28e89ffde31fa44ed4b3dac46e5ef20eed0d89e58c
Diffstat (limited to 'src/resolve.c')
-rw-r--r--src/resolve.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/resolve.c b/src/resolve.c
index 297193610..6e0c9906a 100644
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -625,13 +625,13 @@ static int lookupName(
** Perhaps the name is a reference to the ROWID
*/
if( cnt==0
- && cntTab==1
+ && cntTab>=1
&& pMatch
&& (pNC->ncFlags & (NC_IdxExpr|NC_GenCol))==0
&& sqlite3IsRowid(zCol)
&& ALWAYS(VisibleRowid(pMatch->pTab) || pMatch->fg.isNestedFrom)
){
- cnt = 1;
+ cnt = cntTab;
if( pMatch->fg.isNestedFrom==0 ) pExpr->iColumn = -1;
pExpr->affExpr = SQLITE_AFF_INTEGER;
}