postgres.git / summary / log / commit / refs

commit    9ebc7781444fd15d56ed16e5312a954483e85cd9
Author:   Tom Lane <tgl@sss.pgh.pa.us>
Date:     Tue Sep 26 19:25:56 2017 +0000
First released in: 11.0, 9.2.24, 9.3.20, 9.4.15, 9.5.10, 9.6.6, 10.0

    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 28b679d0307..322008ac435 100644 --- a/src/backend/commands/analyze.c +++ b/src/backend/commands/analyze.c @@ -396,7 +396,7 @@ do_analyze_rel(Relation onerel, int options, VacuumParams *params, 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 a16f26da7e7..ced53ca9aaf 100644 --- a/src/test/regress/expected/vacuum.out +++ b/src/test/regress/expected/vacuum.out @@ -92,7 +92,7 @@ VACUUM (FULL) vacparted; VACUUM (FREEZE) vacparted; -- check behavior with duplicate column mentions VACUUM ANALYZE vacparted(a,b,a); -ERROR: column "a" of relation "vacparted" is specified twice +ERROR: column "a" of relation "vacparted" appears more than once ANALYZE vacparted(a,b,b); -ERROR: column "b" of relation "vacparted" is specified twice +ERROR: column "b" of relation "vacparted" appears more than once DROP TABLE vacparted; [parent: d29f30d8c3b2]