pg_upgrade: Improve one log message

petere · petere · commit 8fa09a11c994 · 2023-08-24T08:23:43.000+02:00
The parenthesized plural is unnecessary here and inconsistent with
nearby similar messages.
diff --git a/src/bin/pg_upgrade/check.c b/src/bin/pg_upgrade/check.c
@@ -1133,7 +1133,7 @@ check_for_composite_data_type_usage(ClusterInfo *cluster)
 	if (found)
 	{
 		pg_log(PG_REPORT, "fatal");
-		pg_fatal("Your installation contains system-defined composite type(s) in user tables.\n"
+		pg_fatal("Your installation contains system-defined composite types in user tables.\n"
 				 "These type OIDs are not stable across PostgreSQL versions,\n"
 				 "so this cluster cannot currently be upgraded.  You can\n"
 				 "drop the problem columns and restart the upgrade.\n"

Original file line number	Diff line number	Diff line change
`@@ -1133,7 +1133,7 @@ check_for_composite_data_type_usage(ClusterInfo *cluster)`
`1133`	`1133`	`if (found)`
`1134`	`1134`	`{`
`1135`	`1135`	`pg_log(PG_REPORT, "fatal");`
`1136`		`- pg_fatal("Your installation contains system-defined composite type(s) in user tables.\n"`
	`1136`	`+ pg_fatal("Your installation contains system-defined composite types in user tables.\n"`
`1137`	`1137`	`"These type OIDs are not stable across PostgreSQL versions,\n"`
`1138`	`1138`	`"so this cluster cannot currently be upgraded. You can\n"`
`1139`	`1139`	`"drop the problem columns and restart the upgrade.\n"`