Message style fixes

alvherre · alvherre · commit 9f8b717a80c5 · 2019-04-30T10:33:37.000-04:00
diff --git a/src/backend/access/table/tableamapi.c b/src/backend/access/table/tableamapi.c
@@ -109,8 +109,8 @@ check_default_table_access_method(char **newval, void **extra, GucSource source)
 
 	if (strlen(*newval) >= NAMEDATALEN)
 	{
-		GUC_check_errdetail("default_table_access_method is too long (maximum %d characters).",
-							NAMEDATALEN - 1);
+		GUC_check_errdetail("%s is too long (maximum %d characters).",
+							"default_table_access_method", NAMEDATALEN - 1);
 		return false;
 	}
 
@@ -131,7 +131,7 @@ check_default_table_access_method(char **newval, void **extra, GucSource source)
 			{
 				ereport(NOTICE,
 						(errcode(ERRCODE_UNDEFINED_OBJECT),
-						 errmsg("Table access method \"%s\" does not exist",
+						 errmsg("table access method \"%s\" does not exist",
 								*newval)));
 			}
 			else
diff --git a/src/backend/access/transam/twophase.c b/src/backend/access/transam/twophase.c
@@ -2190,12 +2190,12 @@ ProcessTwoPhaseBuffer(TransactionId xid,
 		if (fromdisk)
 			ereport(ERROR,
 					(errcode(ERRCODE_DATA_CORRUPTED),
-					 errmsg("corrupted two-phase state file for transaction \"%u\"",
+					 errmsg("corrupted two-phase state file for transaction %u",
 							xid)));
 		else
 			ereport(ERROR,
 					(errcode(ERRCODE_DATA_CORRUPTED),
-					 errmsg("corrupted two-phase state in memory for transaction \"%u\"",
+					 errmsg("corrupted two-phase state in memory for transaction %u",
 							xid)));
 	}
 
diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c
@@ -639,7 +639,7 @@ DefineIndex(Oid relationId,
 		if (partitioned && tablespaceId == MyDatabaseTableSpace)
 			ereport(ERROR,
 					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-					 errmsg("cannot specify default tablespace for partitioned relation")));
+					 errmsg("cannot specify default tablespace for partitioned relations")));
 	}
 	else
 	{
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
@@ -7689,12 +7689,14 @@ ATAddForeignKeyConstraint(List **wqueue, AlteredTableInfo *tab, Relation rel,
 				fkconstraint->fk_upd_action == FKCONSTR_ACTION_CASCADE)
 				ereport(ERROR,
 						(errcode(ERRCODE_SYNTAX_ERROR),
-						 errmsg("invalid ON UPDATE action for foreign key constraint containing generated column")));
+						 errmsg("invalid %s action for foreign key constraint containing generated column",
+								"ON UPDATE")));
 			if (fkconstraint->fk_del_action == FKCONSTR_ACTION_SETNULL ||
 				fkconstraint->fk_del_action == FKCONSTR_ACTION_SETDEFAULT)
 				ereport(ERROR,
 						(errcode(ERRCODE_SYNTAX_ERROR),
-						 errmsg("invalid ON DELETE action for foreign key constraint containing generated column")));
+						 errmsg("invalid %s action for foreign key constraint containing generated column",
+								"ON DELETE")));
 		}
 	}
 
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
@@ -11639,8 +11639,8 @@ check_recovery_target_name(char **newval, void **extra, GucSource source)
 	/* Use the value of newval directly */
 	if (strlen(*newval) >= MAXFNAMELEN)
 	{
-		GUC_check_errdetail("recovery_target_name is too long (maximum %d characters).",
-							MAXFNAMELEN - 1);
+		GUC_check_errdetail("%s is too long (maximum %d characters).",
+							"recovery_target_name", MAXFNAMELEN - 1);
 		return false;
 	}
 	return true;
diff --git a/src/test/regress/output/tablespace.source b/src/test/regress/output/tablespace.source
@@ -106,7 +106,7 @@ Tablespace: "regress_tblspace"
 CREATE TABLE testschema.dflt (a int PRIMARY KEY) PARTITION BY LIST (a) TABLESPACE pg_default;
 ERROR:  cannot specify default tablespace for partitioned relations
 CREATE TABLE testschema.dflt (a int PRIMARY KEY USING INDEX TABLESPACE pg_default) PARTITION BY LIST (a);
-ERROR:  cannot specify default tablespace for partitioned relation
+ERROR:  cannot specify default tablespace for partitioned relations
 SET default_tablespace TO 'pg_default';
 CREATE TABLE testschema.dflt (a int PRIMARY KEY) PARTITION BY LIST (a) TABLESPACE regress_tblspace;
 ERROR:  cannot specify default tablespace for partitioned relations

Original file line number	Diff line number	Diff line change
`@@ -109,8 +109,8 @@ check_default_table_access_method(char newval, void extra, GucSource source)`
`109`	`109`
`110`	`110`	`if (strlen(*newval) >= NAMEDATALEN)`
`111`	`111`	`{`
`112`		`- GUC_check_errdetail("default_table_access_method is too long (maximum %d characters).",`
`113`		`- NAMEDATALEN - 1);`
	`112`	`+ GUC_check_errdetail("%s is too long (maximum %d characters).",`
	`113`	`+ "default_table_access_method", NAMEDATALEN - 1);`
`114`	`114`	`return false;`
`115`	`115`	`}`
`116`	`116`
`@@ -131,7 +131,7 @@ check_default_table_access_method(char newval, void extra, GucSource source)`
`131`	`131`	`{`
`132`	`132`	`ereport(NOTICE,`
`133`	`133`	`(errcode(ERRCODE_UNDEFINED_OBJECT),`
`134`		`- errmsg("Table access method \"%s\" does not exist",`
	`134`	`+ errmsg("table access method \"%s\" does not exist",`
`135`	`135`	`*newval)));`
`136`	`136`	`}`
`137`	`137`	`else`
Original file line number	Diff line number	Diff line change
`@@ -639,7 +639,7 @@ DefineIndex(Oid relationId,`
`639`	`639`	`if (partitioned && tablespaceId == MyDatabaseTableSpace)`
`640`	`640`	`ereport(ERROR,`
`641`	`641`	`(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),`
`642`		`- errmsg("cannot specify default tablespace for partitioned relation")));`
	`642`	`+ errmsg("cannot specify default tablespace for partitioned relations")));`
`643`	`643`	`}`
`644`	`644`	`else`
`645`	`645`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11639,8 +11639,8 @@ check_recovery_target_name(char newval, void extra, GucSource source)`
`11639`	`11639`	`/* Use the value of newval directly */`
`11640`	`11640`	`if (strlen(*newval) >= MAXFNAMELEN)`
`11641`	`11641`	`{`
`11642`		`- GUC_check_errdetail("recovery_target_name is too long (maximum %d characters).",`
`11643`		`- MAXFNAMELEN - 1);`
	`11642`	`+ GUC_check_errdetail("%s is too long (maximum %d characters).",`
	`11643`	`+ "recovery_target_name", MAXFNAMELEN - 1);`
`11644`	`11644`	`return false;`
`11645`	`11645`	`}`
`11646`	`11646`	`return true;`