Message improvements

petere · petere · commit 7ce2a45aeb12 · 2014-10-12T01:02:56.000-04:00
diff --git 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
@@ -5204,8 +5204,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)));
@@ -5268,7 +5268,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
@@ -817,7 +817,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
@@ -588,7 +588,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
@@ -8945,7 +8945,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
@@ -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.c b/src/backend/libpq/be-secure.c
@@ -381,7 +381,7 @@ secure_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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -1186,7 +1186,7 @@ _bt_pagedel(Relation rel, Buffer buf)`
`1186`	`1186`	`(errcode(ERRCODE_INDEX_CORRUPTED),`
`1187`	`1187`	`errmsg("index \"%s\" contains a half-dead internal page",`
`1188`	`1188`	`RelationGetRelationName(rel)),`
`1189`		`- errhint("This can be caused by an interrupt VACUUM in version 9.3 or older, before upgrade. Please REINDEX it.")));`
	`1189`	`+ errhint("This can be caused by an interrupted VACUUM in version 9.3 or older, before upgrade. Please REINDEX it.")));`
`1190`	`1190`	`_bt_relbuf(rel, buf);`
`1191`	`1191`	`return ndeleted;`
`1192`	`1192`	`}`
Original file line number	Diff line number	Diff line change
`@@ -588,7 +588,7 @@ refresh_by_match_merge(Oid matviewOid, Oid tempOid, Oid relowner,`
`588`	`588`	`{`
`589`	`589`	`ereport(ERROR,`
`590`	`590`	`(errcode(ERRCODE_CARDINALITY_VIOLATION),`
`591`		`- errmsg("new data for \"%s\" contains duplicate rows without any NULL columns",`
	`591`	`+ errmsg("new data for \"%s\" contains duplicate rows without any null columns",`
`592`	`592`	`RelationGetRelationName(matviewRel)),`
`593`	`593`	`errdetail("Row: %s",`
`594`	`594`	`SPI_getvalue(SPI_tuptable->vals[0], SPI_tuptable->tupdesc, 1))));`
Original file line number	Diff line number	Diff line change
`@@ -8945,7 +8945,7 @@ ATExecSetRelOptions(Relation rel, List *defList, AlterTableType operation,`
`8945`	`8945`	`if (view_updatable_error)`
`8946`	`8946`	`ereport(ERROR,`
`8947`	`8947`	`(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),`
`8948`		`- errmsg("WITH CHECK OPTION is supported only on auto-updatable views"),`
	`8948`	`+ errmsg("WITH CHECK OPTION is supported only on automatically updatable views"),`
`8949`	`8949`	`errhint("%s", view_updatable_error)));`
`8950`	`8950`	`}`
`8951`	`8951`	`}`
Original file line number	Diff line number	Diff line change
`@@ -471,7 +471,7 @@ DefineView(ViewStmt stmt, const char queryString)`
`471`	`471`	`if (view_updatable_error)`
`472`	`472`	`ereport(ERROR,`
`473`	`473`	`(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),`
`474`		`- errmsg("WITH CHECK OPTION is supported only on auto-updatable views"),`
	`474`	`+ errmsg("WITH CHECK OPTION is supported only on automatically updatable views"),`
`475`	`475`	`errhint("%s", view_updatable_error)));`
`476`	`476`	`}`
`477`	`477`
Original file line number	Diff line number	Diff line change
`@@ -381,7 +381,7 @@ secure_write(Port port, void ptr, size_t len)`
`381`	`381`	`if (retries >= 20)`
`382`	`382`	`ereport(FATAL,`
`383`	`383`	`(errcode(ERRCODE_PROTOCOL_VIOLATION),`
`384`		`- errmsg("unable to complete SSL handshake")));`
	`384`	`+ errmsg("could not complete SSL handshake on renegotiation, too many failures")));`
`385`	`385`	`}`
`386`	`386`	`}`
`387`	`387`	`}`