From b7a08c80283c8d564933381b24c1993d49926e15 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Sun, 12 Oct 2014 01:02:56 -0400 Subject: [PATCH] Message improvements --- src/backend/access/nbtree/nbtpage.c | 2 +- src/backend/access/transam/xlog.c | 6 +++--- src/backend/commands/dbcommands.c | 2 +- src/backend/commands/matview.c | 2 +- src/backend/commands/tablecmds.c | 2 +- src/backend/commands/view.c | 2 +- src/backend/libpq/be-secure-openssl.c | 2 +- src/test/regress/expected/matview.out | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/backend/access/nbtree/nbtpage.c b/src/backend/access/nbtree/nbtpage.c index bab5a49187..b71f65de2c 100644 --- a/src/backend/access/nbtree/nbtpage.c +++ b/src/backend/access/nbtree/nbtpage.c @@ -1186,7 +1186,7 @@ _bt_pagedel(Relation rel, Buffer buf) (errcode(ERRCODE_INDEX_CORRUPTED), errmsg("index \"%s\" contains a half-dead internal page", RelationGetRelationName(rel)), - errhint("This can be caused by an interrupt VACUUM in version 9.3 or older, before upgrade. Please REINDEX it."))); + errhint("This can be caused by an interrupted VACUUM in version 9.3 or older, before upgrade. Please REINDEX it."))); _bt_relbuf(rel, buf); return ndeleted; } diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index 5a4dbb9c53..235b442296 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -5193,8 +5193,8 @@ readRecoveryCommandFile(void) else ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("invalid recovery_target parameter"), - errhint("The only allowed value is 'immediate'"))); + errmsg("invalid value for recovery parameter \"recovery_target\""), + errhint("The only allowed value is \"immediate\"."))); ereport(DEBUG2, (errmsg_internal("recovery_target = '%s'", item->value))); @@ -5257,7 +5257,7 @@ readRecoveryCommandFile(void) "recovery_min_apply_delay"), hintmsg ? errhint("%s", _(hintmsg)) : 0)); ereport(DEBUG2, - (errmsg("recovery_min_apply_delay = '%s'", item->value))); + (errmsg_internal("recovery_min_apply_delay = '%s'", item->value))); } else ereport(FATAL, diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c index 7831e900ba..b52e6b9bc0 100644 --- a/src/backend/commands/dbcommands.c +++ b/src/backend/commands/dbcommands.c @@ -839,7 +839,7 @@ dropdb(const char *dbname, bool missing_ok) if (ReplicationSlotsCountDBSlots(db_id, &nslots, &nslots_active)) ereport(ERROR, (errcode(ERRCODE_OBJECT_IN_USE), - errmsg("database \"%s\" is used by a logical decoding slot", + errmsg("database \"%s\" is used by a logical replication slot", dbname), errdetail_plural("There is %d slot, %d of them active.", "There are %d slots, %d of them active.", diff --git a/src/backend/commands/matview.c b/src/backend/commands/matview.c index d1c8bb0d53..30bd40db18 100644 --- a/src/backend/commands/matview.c +++ b/src/backend/commands/matview.c @@ -597,7 +597,7 @@ refresh_by_match_merge(Oid matviewOid, Oid tempOid, Oid relowner, { ereport(ERROR, (errcode(ERRCODE_CARDINALITY_VIOLATION), - errmsg("new data for \"%s\" contains duplicate rows without any NULL columns", + errmsg("new data for \"%s\" contains duplicate rows without any null columns", RelationGetRelationName(matviewRel)), errdetail("Row: %s", SPI_getvalue(SPI_tuptable->vals[0], SPI_tuptable->tupdesc, 1)))); diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c index d9263e320b..ecdff1e5e3 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -9046,7 +9046,7 @@ ATExecSetRelOptions(Relation rel, List *defList, AlterTableType operation, if (view_updatable_error) ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("WITH CHECK OPTION is supported only on auto-updatable views"), + errmsg("WITH CHECK OPTION is supported only on automatically updatable views"), errhint("%s", view_updatable_error))); } } diff --git a/src/backend/commands/view.c b/src/backend/commands/view.c index 9d0039c42a..184bcd0582 100644 --- a/src/backend/commands/view.c +++ b/src/backend/commands/view.c @@ -471,7 +471,7 @@ DefineView(ViewStmt *stmt, const char *queryString) if (view_updatable_error) ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("WITH CHECK OPTION is supported only on auto-updatable views"), + errmsg("WITH CHECK OPTION is supported only on automatically updatable views"), errhint("%s", view_updatable_error))); } diff --git a/src/backend/libpq/be-secure-openssl.c b/src/backend/libpq/be-secure-openssl.c index 8d8f12952a..b05364ced0 100644 --- a/src/backend/libpq/be-secure-openssl.c +++ b/src/backend/libpq/be-secure-openssl.c @@ -614,7 +614,7 @@ be_tls_write(Port *port, void *ptr, size_t len) if (retries >= 20) ereport(FATAL, (errcode(ERRCODE_PROTOCOL_VIOLATION), - errmsg("unable to complete SSL handshake"))); + errmsg("could not complete SSL handshake on renegotiation, too many failures"))); } } } diff --git a/src/test/regress/expected/matview.out b/src/test/regress/expected/matview.out index 1076b76210..b04510c599 100644 --- a/src/test/regress/expected/matview.out +++ b/src/test/regress/expected/matview.out @@ -411,7 +411,7 @@ REFRESH MATERIALIZED VIEW mv; ERROR: could not create unique index "mv_a_idx" DETAIL: Key (a)=(1) is duplicated. REFRESH MATERIALIZED VIEW CONCURRENTLY mv; -ERROR: new data for "mv" contains duplicate rows without any NULL columns +ERROR: new data for "mv" contains duplicate rows without any null columns DETAIL: Row: (1,10) DROP TABLE foo CASCADE; NOTICE: drop cascades to materialized view mv