diff options
| author | Andres Freund <andres@anarazel.de> | 2015-05-19 21:07:28 +0200 |
|---|---|---|
| committer | Andres Freund <andres@anarazel.de> | 2015-05-19 23:18:57 +0200 |
| commit | 9bc77c45199c7d2e525cd5b1457d5a57f6e9edb0 (patch) | |
| tree | 06b8809dd701d4e82663ddb025ad0fb28813a6e0 /src/backend/parser/parse_clause.c | |
| parent | 0740cbd7593d871858c352fab29a59cf7fa54b00 (diff) | |
| download | postgresql-9bc77c45199c7d2e525cd5b1457d5a57f6e9edb0.tar.gz postgresql-9bc77c45199c7d2e525cd5b1457d5a57f6e9edb0.zip | |
Various fixes around ON CONFLICT for rule deparsing.
Neither the deparsing of the new alias for INSERT's target table, nor of
the inference clause was supported. Also fixup a typo in an error
message.
Add regression tests to test those code paths.
Author: Peter Geoghegan
Diffstat (limited to 'src/backend/parser/parse_clause.c')
| -rw-r--r-- | src/backend/parser/parse_clause.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/backend/parser/parse_clause.c b/src/backend/parser/parse_clause.c index c8af5ab1d05..f8eebfe8c3e 100644 --- a/src/backend/parser/parse_clause.c +++ b/src/backend/parser/parse_clause.c @@ -2765,7 +2765,7 @@ transformOnConflictArbiter(ParseState *pstate, ereport(ERROR, (errcode(ERRCODE_SYNTAX_ERROR), errmsg("ON CONFLICT DO UPDATE requires inference specification or constraint name"), - errhint("For example, ON CONFLICT ON CONFLICT (<column>)."), + errhint("For example, ON CONFLICT (<column>)."), parser_errposition(pstate, exprLocation((Node *) onConflictClause)))); |