From 8e599897ca20fe31cb58fad0b401d7e317235024 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Fri, 18 May 2018 17:17:57 -0400 Subject: [PATCH] Improve two error messages --- src/backend/parser/parse_utilcmd.c | 2 +- src/bin/pg_upgrade/check.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/backend/parser/parse_utilcmd.c b/src/backend/parser/parse_utilcmd.c index 17b54b20cc..656b1b5f1b 100644 --- a/src/backend/parser/parse_utilcmd.c +++ b/src/backend/parser/parse_utilcmd.c @@ -2098,7 +2098,7 @@ transformIndexConstraint(Constraint *constraint, CreateStmtContext *cxt) index_rel->rd_indoption[i] != 0) ereport(ERROR, (errcode(ERRCODE_WRONG_OBJECT_TYPE), - errmsg("index \"%s\" does not have default sorting behavior", index_name), + errmsg("index \"%s\" column number %d does not have default sorting behavior", index_name, i + 1), errdetail("Cannot create a primary key or unique constraint using such an index."), parser_errposition(cxt->pstate, constraint->location))); diff --git a/src/bin/pg_upgrade/check.c b/src/bin/pg_upgrade/check.c index 577db73f10..5a78d603dc 100644 --- a/src/bin/pg_upgrade/check.c +++ b/src/bin/pg_upgrade/check.c @@ -382,8 +382,10 @@ check_new_cluster_is_empty(void) { /* pg_largeobject and its index should be skipped */ if (strcmp(rel_arr->rels[relnum].nspname, "pg_catalog") != 0) - pg_fatal("New cluster database \"%s\" is not empty\n", - new_cluster.dbarr.dbs[dbnum].db_name); + pg_fatal("New cluster database \"%s\" is not empty: found relation \"%s.%s\"\n", + new_cluster.dbarr.dbs[dbnum].db_name, + rel_arr->rels[relnum].nspname, + rel_arr->rels[relnum].relname); } } } -- 2.39.5