aboutsummaryrefslogtreecommitdiff
path: root/src/backend/parser
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2015-11-16 21:16:42 -0500
committerPeter Eisentraut <peter_e@gmx.net>2015-11-16 21:16:42 -0500
commit689cabf402c33a69e595a0d25f61b1fb49fb1c78 (patch)
tree519966d4b2c4fa4b9cc495a041f18ccf2f484f39 /src/backend/parser
parent75c8af902e07a2090df429f410df1e753e3358f1 (diff)
downloadpostgresql-689cabf402c33a69e595a0d25f61b1fb49fb1c78.tar.gz
postgresql-689cabf402c33a69e595a0d25f61b1fb49fb1c78.zip
Message improvements
Diffstat (limited to 'src/backend/parser')
-rw-r--r--src/backend/parser/parse_agg.c2
-rw-r--r--src/backend/parser/parse_clause.c2
-rw-r--r--src/backend/parser/parse_relation.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/src/backend/parser/parse_agg.c b/src/backend/parser/parse_agg.c
index 3846b569d6f..81c1fb599e7 100644
--- a/src/backend/parser/parse_agg.c
+++ b/src/backend/parser/parse_agg.c
@@ -979,7 +979,7 @@ parseCheckAggregates(ParseState *pstate, Query *qry)
if (!gsets)
ereport(ERROR,
(errcode(ERRCODE_STATEMENT_TOO_COMPLEX),
- errmsg("too many grouping sets present (max 4096)"),
+ errmsg("too many grouping sets present (maximum 4096)"),
parser_errposition(pstate,
qry->groupClause
? exprLocation((Node *) qry->groupClause)
diff --git a/src/backend/parser/parse_clause.c b/src/backend/parser/parse_clause.c
index 9c2846dc337..45d5e6cb0ff 100644
--- a/src/backend/parser/parse_clause.c
+++ b/src/backend/parser/parse_clause.c
@@ -2856,7 +2856,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 (<column>)."),
+ errhint("For example, ON CONFLICT (column_name)."),
parser_errposition(pstate,
exprLocation((Node *) onConflictClause))));
diff --git a/src/backend/parser/parse_relation.c b/src/backend/parser/parse_relation.c
index 0c4ed65afa2..6f569dad545 100644
--- a/src/backend/parser/parse_relation.c
+++ b/src/backend/parser/parse_relation.c
@@ -3080,7 +3080,7 @@ errorMissingColumn(ParseState *pstate,
errmsg("column %s.%s does not exist", relname, colname) :
errmsg("column \"%s\" does not exist", colname),
state->rfirst ? closestfirst ?
- errhint("Perhaps you meant to reference the column \"%s\".\"%s\".",
+ errhint("Perhaps you meant to reference the column \"%s.%s\".",
state->rfirst->eref->aliasname, closestfirst) :
errhint("There is a column named \"%s\" in table \"%s\", but it cannot be referenced from this part of the query.",
colname, state->rfirst->eref->aliasname) : 0,
@@ -3099,7 +3099,7 @@ errorMissingColumn(ParseState *pstate,
relname ?
errmsg("column %s.%s does not exist", relname, colname) :
errmsg("column \"%s\" does not exist", colname),
- errhint("Perhaps you meant to reference the column \"%s\".\"%s\" or the column \"%s\".\"%s\".",
+ errhint("Perhaps you meant to reference the column \"%s.%s\" or the column \"%s.%s\".",
state->rfirst->eref->aliasname, closestfirst,
state->rsecond->eref->aliasname, closestsecond),
parser_errposition(pstate, location)));