diff options
| -rw-r--r-- | src/backend/parser/analyze.c | 9 | ||||
| -rw-r--r-- | src/test/regress/expected/join.out | 8 | ||||
| -rw-r--r-- | src/test/regress/sql/join.sql | 6 |
3 files changed, 23 insertions, 0 deletions
diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c index d243e0284a5..9f59b4af357 100644 --- a/src/backend/parser/analyze.c +++ b/src/backend/parser/analyze.c @@ -2809,6 +2809,15 @@ transformLockingClause(ParseState *pstate, Query *qry, LockingClause *lc, ++i; if (!rte->inFromCl) continue; + + /* + * A join RTE without an alias is not visible as a relation + * name and needs to be skipped (otherwise it might hide a + * base relation with the same name). + */ + if (rte->rtekind == RTE_JOIN && rte->alias == NULL) + continue; + if (strcmp(rte->eref->aliasname, thisrel->relname) == 0) { switch (rte->rtekind) diff --git a/src/test/regress/expected/join.out b/src/test/regress/expected/join.out index d2db9804e41..610e70d1cfd 100644 --- a/src/test/regress/expected/join.out +++ b/src/test/regress/expected/join.out @@ -2449,6 +2449,14 @@ ERROR: column t1.x does not exist LINE 1: select t1.x from t1 join t3 on (t1.a = t3.x); ^ HINT: Perhaps you meant to reference the column "t3.x". +-- Test matching of locking clause with wrong alias +select t1.*, t2.*, unnamed_join.* from + t1 join t2 on (t1.a = t2.a), t3 as unnamed_join + for update of unnamed_join; + a | b | a | b | x | y +---+---+---+---+---+--- +(0 rows) + -- -- regression test for 8.1 merge right join bug -- diff --git a/src/test/regress/sql/join.sql b/src/test/regress/sql/join.sql index 16c9b2e4322..2fff1a882e1 100644 --- a/src/test/regress/sql/join.sql +++ b/src/test/regress/sql/join.sql @@ -509,6 +509,12 @@ select * from t1 left join t2 on (t1.a = t2.a); select t1.x from t1 join t3 on (t1.a = t3.x); +-- Test matching of locking clause with wrong alias + +select t1.*, t2.*, unnamed_join.* from + t1 join t2 on (t1.a = t2.a), t3 as unnamed_join + for update of unnamed_join; + -- -- regression test for 8.1 merge right join bug -- |