From 6c77b47b2e8edbe6446a42adc6099d1543e69214 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Tue, 26 Sep 2017 15:25:57 -0400 Subject: [PATCH] Improve wording of error message added in commit 714805010. Per suggestions from Peter Eisentraut and David Johnston. Back-patch, like the previous commit. Discussion: https://postgr.es/m/E1dv9jI-0006oT-Fn@gemulon.postgresql.org --- src/backend/commands/analyze.c | 2 +- src/test/regress/expected/vacuum.out | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c index 0b35561e960..3616d5063cd 100644 --- a/src/backend/commands/analyze.c +++ b/src/backend/commands/analyze.c @@ -395,7 +395,7 @@ do_analyze_rel(Relation onerel, VacuumStmt *vacstmt, if (bms_is_member(i, unique_cols)) ereport(ERROR, (errcode(ERRCODE_DUPLICATE_COLUMN), - errmsg("column \"%s\" of relation \"%s\" is specified twice", + errmsg("column \"%s\" of relation \"%s\" appears more than once", col, RelationGetRelationName(onerel)))); unique_cols = bms_add_member(unique_cols, i); diff --git a/src/test/regress/expected/vacuum.out b/src/test/regress/expected/vacuum.out index bf5034ad685..fda1b390c09 100644 --- a/src/test/regress/expected/vacuum.out +++ b/src/test/regress/expected/vacuum.out @@ -81,8 +81,8 @@ SQL function "wrap_do_analyze" statement 1 VACUUM FULL vactst; -- check behavior with duplicate column mentions VACUUM ANALYZE vaccluster(i,i); -ERROR: column "i" of relation "vaccluster" is specified twice +ERROR: column "i" of relation "vaccluster" appears more than once ANALYZE vaccluster(i,i); -ERROR: column "i" of relation "vaccluster" is specified twice +ERROR: column "i" of relation "vaccluster" appears more than once DROP TABLE vaccluster; DROP TABLE vactst;