diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/parser/analyze.c | 3 | ||||
| -rw-r--r-- | src/test/regress/expected/insert_conflict.out | 6 | ||||
| -rw-r--r-- | src/test/regress/expected/update.out | 6 | ||||
| -rw-r--r-- | src/test/regress/sql/insert_conflict.sql | 3 | ||||
| -rw-r--r-- | src/test/regress/sql/update.sql | 3 |
5 files changed, 21 insertions, 0 deletions
diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c index 06fc8ce98b5..dbdf6bf8964 100644 --- a/src/backend/parser/analyze.c +++ b/src/backend/parser/analyze.c @@ -2518,6 +2518,9 @@ transformUpdateTargetList(ParseState *pstate, List *origTlist) errmsg("column \"%s\" of relation \"%s\" does not exist", origTarget->name, RelationGetRelationName(pstate->p_target_relation)), + (origTarget->indirection != NIL && + strcmp(origTarget->name, pstate->p_target_nsitem->p_names->aliasname) == 0) ? + errhint("SET target columns cannot be qualified with the relation name.") : 0, parser_errposition(pstate, origTarget->location))); updateTargetListEntry(pstate, tle, origTarget->name, diff --git a/src/test/regress/expected/insert_conflict.out b/src/test/regress/expected/insert_conflict.out index 9e9e3bd00cd..563c5eb52ac 100644 --- a/src/test/regress/expected/insert_conflict.out +++ b/src/test/regress/expected/insert_conflict.out @@ -272,6 +272,12 @@ ERROR: invalid reference to FROM-clause entry for table "insertconflicttest" LINE 1: ...onfruit') on conflict (key) do update set fruit = insertconf... ^ HINT: Perhaps you meant to reference the table alias "ict". +-- Check helpful hint when qualifying set column with target table +insert into insertconflicttest values (3, 'Kiwi') on conflict (key, fruit) do update set insertconflicttest.fruit = 'Mango'; +ERROR: column "insertconflicttest" of relation "insertconflicttest" does not exist +LINE 1: ...3, 'Kiwi') on conflict (key, fruit) do update set insertconf... + ^ +HINT: SET target columns cannot be qualified with the relation name. drop index key_index; -- -- Composite key tests diff --git a/src/test/regress/expected/update.out b/src/test/regress/expected/update.out index c809f88f546..cb0b033da61 100644 --- a/src/test/regress/expected/update.out +++ b/src/test/regress/expected/update.out @@ -44,6 +44,12 @@ SELECT * FROM update_test; 10 | 20 | (2 rows) +-- error, you're not supposed to qualify the target column +UPDATE update_test t SET t.b = t.b + 10 WHERE t.a = 10; +ERROR: column "t" of relation "update_test" does not exist +LINE 1: UPDATE update_test t SET t.b = t.b + 10 WHERE t.a = 10; + ^ +HINT: SET target columns cannot be qualified with the relation name. -- -- Test VALUES in FROM -- diff --git a/src/test/regress/sql/insert_conflict.sql b/src/test/regress/sql/insert_conflict.sql index 23d5778b821..653f9baf98e 100644 --- a/src/test/regress/sql/insert_conflict.sql +++ b/src/test/regress/sql/insert_conflict.sql @@ -118,6 +118,9 @@ insert into insertconflicttest AS ict values (6, 'Passionfruit') on conflict (ke insert into insertconflicttest AS ict values (6, 'Passionfruit') on conflict (key) do update set fruit = ict.fruit; -- ok, alias insert into insertconflicttest AS ict values (6, 'Passionfruit') on conflict (key) do update set fruit = insertconflicttest.fruit; -- error, references aliased away name +-- Check helpful hint when qualifying set column with target table +insert into insertconflicttest values (3, 'Kiwi') on conflict (key, fruit) do update set insertconflicttest.fruit = 'Mango'; + drop index key_index; -- diff --git a/src/test/regress/sql/update.sql b/src/test/regress/sql/update.sql index 7a7bee77b92..8b4707eb9c3 100644 --- a/src/test/regress/sql/update.sql +++ b/src/test/regress/sql/update.sql @@ -31,6 +31,9 @@ UPDATE update_test t SET b = t.b + 10 WHERE t.a = 10; SELECT * FROM update_test; +-- error, you're not supposed to qualify the target column +UPDATE update_test t SET t.b = t.b + 10 WHERE t.a = 10; + -- -- Test VALUES in FROM -- |