aboutsummaryrefslogtreecommitdiff
path: root/src/resolve.c
diff options
context:
space:
mode:
authordan <Dan Kennedy>2024-03-19 14:55:49 +0000
committerdan <Dan Kennedy>2024-03-19 14:55:49 +0000
commita10c2a9055fd7426cdd19a58c279d06cb794e027 (patch)
tree2d9e81b53d46c157e8841afbeda0370b4a78a447 /src/resolve.c
parent1fe31dcfabf886517e41cbab3b8435e0e828b44f (diff)
downloadsqlite-a10c2a9055fd7426cdd19a58c279d06cb794e027.tar.gz
sqlite-a10c2a9055fd7426cdd19a58c279d06cb794e027.zip
Return the error "ambiguous column name: rowid", instead of "no such column: rowid", when a "rowid" reference is ambiguous.
FossilOrigin-Name: 021f34fcfed41b607be8169bbda59aef93f130108d944f4741b46e8e345b2bbb
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 c2957a870..2a128199d 100644
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -596,13 +596,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;
}