pg_upgrade: clarify the database names in error files

bmomjian · bmomjian · commit 1634d361577a · 2019-10-08T22:16:48.000-04:00
Previously, the "Database:" label in the error file was unclear if the label was a status report or the problem was _in_ the database. New text is "In database:". Reported-by: Justin Pryzby Discussion: https://postgr.es/m/20191002172337.GC9680@telsasoft.com Backpatch-through: head
diff --git a/src/bin/pg_upgrade/check.c b/src/bin/pg_upgrade/check.c
@@ -858,7 +858,7 @@ check_for_isn_and_int8_passing_mismatch(ClusterInfo *cluster)
 						 output_path, strerror(errno));
 			if (!db_used)
 			{
-				fprintf(script, "Database: %s\n", active_db->db_name);
+				fprintf(script, "In database: %s\n", active_db->db_name);
 				db_used = true;
 			}
 			fprintf(script, "  %s.%s\n",
@@ -937,7 +937,7 @@ check_for_tables_with_oids(ClusterInfo *cluster)
 						 output_path, strerror(errno));
 			if (!db_used)
 			{
-				fprintf(script, "Database: %s\n", active_db->db_name);
+				fprintf(script, "In database: %s\n", active_db->db_name);
 				db_used = true;
 			}
 			fprintf(script, "  %s.%s\n",
@@ -1046,7 +1046,7 @@ check_for_reg_data_type_usage(ClusterInfo *cluster)
 						 output_path, strerror(errno));
 			if (!db_used)
 			{
-				fprintf(script, "Database: %s\n", active_db->db_name);
+				fprintf(script, "In database: %s\n", active_db->db_name);
 				db_used = true;
 			}
 			fprintf(script, "  %s.%s.%s\n",
@@ -1137,7 +1137,7 @@ check_for_jsonb_9_4_usage(ClusterInfo *cluster)
 						 output_path, strerror(errno));
 			if (!db_used)
 			{
-				fprintf(script, "Database: %s\n", active_db->db_name);
+				fprintf(script, "In database: %s\n", active_db->db_name);
 				db_used = true;
 			}
 			fprintf(script, "  %s.%s.%s\n",
diff --git a/src/bin/pg_upgrade/function.c b/src/bin/pg_upgrade/function.c
@@ -256,7 +256,7 @@ check_loadable_libraries(void)
 		}
 
 		if (was_load_failure)
-			fprintf(script, _("Database: %s\n"),
+			fprintf(script, _("In database: %s\n"),
 					old_cluster.dbarr.dbs[os_info.libraries[libnum].dbnum].db_name);
 	}
 
diff --git a/src/bin/pg_upgrade/version.c b/src/bin/pg_upgrade/version.c
@@ -157,7 +157,7 @@ old_9_3_check_for_line_data_type_usage(ClusterInfo *cluster)
 						 strerror(errno));
 			if (!db_used)
 			{
-				fprintf(script, "Database: %s\n", active_db->db_name);
+				fprintf(script, "In database: %s\n", active_db->db_name);
 				db_used = true;
 			}
 			fprintf(script, "  %s.%s.%s\n",
@@ -258,7 +258,7 @@ old_9_6_check_for_unknown_data_type_usage(ClusterInfo *cluster)
 						 strerror(errno));
 			if (!db_used)
 			{
-				fprintf(script, "Database: %s\n", active_db->db_name);
+				fprintf(script, "In database: %s\n", active_db->db_name);
 				db_used = true;
 			}
 			fprintf(script, "  %s.%s.%s\n",

Original file line number	Diff line number	Diff line change
`@@ -858,7 +858,7 @@ check_for_isn_and_int8_passing_mismatch(ClusterInfo *cluster)`
`858`	`858`	`output_path, strerror(errno));`
`859`	`859`	`if (!db_used)`
`860`	`860`	`{`
`861`		`- fprintf(script, "Database: %s\n", active_db->db_name);`
	`861`	`+ fprintf(script, "In database: %s\n", active_db->db_name);`
`862`	`862`	`db_used = true;`
`863`	`863`	`}`
`864`	`864`	`fprintf(script, " %s.%s\n",`
`@@ -937,7 +937,7 @@ check_for_tables_with_oids(ClusterInfo *cluster)`
`937`	`937`	`output_path, strerror(errno));`
`938`	`938`	`if (!db_used)`
`939`	`939`	`{`
`940`		`- fprintf(script, "Database: %s\n", active_db->db_name);`
	`940`	`+ fprintf(script, "In database: %s\n", active_db->db_name);`
`941`	`941`	`db_used = true;`
`942`	`942`	`}`
`943`	`943`	`fprintf(script, " %s.%s\n",`
`@@ -1046,7 +1046,7 @@ check_for_reg_data_type_usage(ClusterInfo *cluster)`
`1046`	`1046`	`output_path, strerror(errno));`
`1047`	`1047`	`if (!db_used)`
`1048`	`1048`	`{`
`1049`		`- fprintf(script, "Database: %s\n", active_db->db_name);`
	`1049`	`+ fprintf(script, "In database: %s\n", active_db->db_name);`
`1050`	`1050`	`db_used = true;`
`1051`	`1051`	`}`
`1052`	`1052`	`fprintf(script, " %s.%s.%s\n",`
`@@ -1137,7 +1137,7 @@ check_for_jsonb_9_4_usage(ClusterInfo *cluster)`
`1137`	`1137`	`output_path, strerror(errno));`
`1138`	`1138`	`if (!db_used)`
`1139`	`1139`	`{`
`1140`		`- fprintf(script, "Database: %s\n", active_db->db_name);`
	`1140`	`+ fprintf(script, "In database: %s\n", active_db->db_name);`
`1141`	`1141`	`db_used = true;`
`1142`	`1142`	`}`
`1143`	`1143`	`fprintf(script, " %s.%s.%s\n",`
Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,7 @@ check_loadable_libraries(void)`
`256`	`256`	`}`
`257`	`257`
`258`	`258`	`if (was_load_failure)`
`259`		`- fprintf(script, _("Database: %s\n"),`
	`259`	`+ fprintf(script, _("In database: %s\n"),`
`260`	`260`	`old_cluster.dbarr.dbs[os_info.libraries[libnum].dbnum].db_name);`
`261`	`261`	`}`
`262`	`262`
Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ old_9_3_check_for_line_data_type_usage(ClusterInfo *cluster)`
`157`	`157`	`strerror(errno));`
`158`	`158`	`if (!db_used)`
`159`	`159`	`{`
`160`		`- fprintf(script, "Database: %s\n", active_db->db_name);`
	`160`	`+ fprintf(script, "In database: %s\n", active_db->db_name);`
`161`	`161`	`db_used = true;`
`162`	`162`	`}`
`163`	`163`	`fprintf(script, " %s.%s.%s\n",`
`@@ -258,7 +258,7 @@ old_9_6_check_for_unknown_data_type_usage(ClusterInfo *cluster)`
`258`	`258`	`strerror(errno));`
`259`	`259`	`if (!db_used)`
`260`	`260`	`{`
`261`		`- fprintf(script, "Database: %s\n", active_db->db_name);`
	`261`	`+ fprintf(script, "In database: %s\n", active_db->db_name);`
`262`	`262`	`db_used = true;`
`263`	`263`	`}`
`264`	`264`	`fprintf(script, " %s.%s.%s\n",`