From a6283f97069e6f747bdc2052e9f755a9136a5edc Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Fri, 5 Sep 2014 01:20:33 -0400 Subject: Assorted message fixes and improvements --- src/backend/commands/dbcommands.c | 6 ++++-- src/backend/commands/matview.c | 2 +- src/backend/commands/tablecmds.c | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) (limited to 'src/backend/commands') diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c index 5705889f31d..ce674fe7332 100644 --- a/src/backend/commands/dbcommands.c +++ b/src/backend/commands/dbcommands.c @@ -819,8 +819,10 @@ dropdb(const char *dbname, bool missing_ok) (errcode(ERRCODE_OBJECT_IN_USE), errmsg("database \"%s\" is used by a logical decoding slot", dbname), - errdetail("There are %d slot(s), %d of them active", - nslots, nslots_active))); + errdetail_plural("There is %d slot, %d of them active.", + "There are %d slots, %d of them active.", + nslots, + nslots, nslots_active))); /* * Check for other backends in the target database. (Because we hold the diff --git a/src/backend/commands/matview.c b/src/backend/commands/matview.c index 79dee7873cd..327587f2b7e 100644 --- a/src/backend/commands/matview.c +++ b/src/backend/commands/matview.c @@ -680,7 +680,7 @@ refresh_by_match_merge(Oid matviewOid, Oid tempOid, Oid relowner, (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE), errmsg("cannot refresh materialized view \"%s\" concurrently", matviewname), - errhint("Create a UNIQUE index with no WHERE clause on one or more columns of the materialized view."))); + errhint("Create a unique index with no WHERE clause on one or more columns of the materialized view."))); appendStringInfoString(&querybuf, " AND newdata OPERATOR(pg_catalog.*=) mv) " diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c index 34c38de3fff..ba9314b7ded 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -9338,7 +9338,7 @@ AlterTableMoveAll(AlterTableMoveAllStmt *stmt) !ConditionalLockRelationOid(relOid, AccessExclusiveLock)) ereport(ERROR, (errcode(ERRCODE_OBJECT_IN_USE), - errmsg("aborting due to \"%s\".\"%s\" --- lock not available", + errmsg("aborting because lock on relation \"%s\".\"%s\" is not available", get_namespace_name(relForm->relnamespace), NameStr(relForm->relname)))); else -- cgit v1.2.3