open-dsi
/
postgres
mirror of https://github.com/postgres/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pg_upgrade: clarify the database names in error files

Browse Source 
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
pull/47/head
Bruce Momjian 6 years ago
parent 6c9fb69f2b
commit 1634d36157
3 changed files with 7 additions and 7 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 8
      src/bin/pg_upgrade/check.c
  2. 2
      src/bin/pg_upgrade/function.c
  3. 4
      src/bin/pg_upgrade/version.c

8
src/bin/pg_upgrade/check.c
Unescape View File

@ -858,7 +858,7 @@ check_for_isn_and_int8_passing_mismatch(ClusterInfo *cluster)
output_path, strerror(errno)); output_path, strerror(errno));
if (!db_used) 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; db_used = true;
} }
fprintf(script, " %s.%s\n", fprintf(script, " %s.%s\n",
@ -937,7 +937,7 @@ check_for_tables_with_oids(ClusterInfo *cluster)
output_path, strerror(errno)); output_path, strerror(errno));
if (!db_used) 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; db_used = true;
} }
fprintf(script, " %s.%s\n", fprintf(script, " %s.%s\n",
@ -1046,7 +1046,7 @@ check_for_reg_data_type_usage(ClusterInfo *cluster)
output_path, strerror(errno)); output_path, strerror(errno));
if (!db_used) 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; db_used = true;
} }
fprintf(script, " %s.%s.%s\n", fprintf(script, " %s.%s.%s\n",
@ -1137,7 +1137,7 @@ check_for_jsonb_9_4_usage(ClusterInfo *cluster)
output_path, strerror(errno)); output_path, strerror(errno));
if (!db_used) 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; db_used = true;
} }
fprintf(script, " %s.%s.%s\n", fprintf(script, " %s.%s.%s\n",

2
src/bin/pg_upgrade/function.c
Unescape View File

@ -256,7 +256,7 @@ check_loadable_libraries(void)
} }
if (was_load_failure) 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); old_cluster.dbarr.dbs[os_info.libraries[libnum].dbnum].db_name);
} }

4
src/bin/pg_upgrade/version.c
Unescape View File

@ -157,7 +157,7 @@ old_9_3_check_for_line_data_type_usage(ClusterInfo *cluster)
strerror(errno)); strerror(errno));
if (!db_used) 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; db_used = true;
} }
fprintf(script, " %s.%s.%s\n", fprintf(script, " %s.%s.%s\n",
@ -258,7 +258,7 @@ old_9_6_check_for_unknown_data_type_usage(ClusterInfo *cluster)
strerror(errno)); strerror(errno));
if (!db_used) 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; db_used = true;
} }
fprintf(script, " %s.%s.%s\n", fprintf(script, " %s.%s.%s\n",

Write Preview
Loading…
Cancel
Save