database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-30 11:03:19 +03:00
Code Activity

pg_upgrade: adjust error paragraph width to be consistent

Browse Source 
Previously these error paragraphs were too wide.

Backpatch-through: 13
This commit is contained in:
Bruce Momjian
2019-11-27 20:36:33 -05:00
parent f0b57aec1d
commit 60b35b7f1e
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/bin/pg_upgrade/check.c
View File

@ -963,8 +963,8 @@ check_for_tables_with_oids(ClusterInfo *cluster)
if (found) if (found)
{ {
pg_log(PG_REPORT, "fatal\n"); pg_log(PG_REPORT, "fatal\n");
pg_fatal("Your installation contains tables declared WITH OIDS, which is not supported\n" pg_fatal("Your installation contains tables declared WITH OIDS, which is not\n"
"anymore. Consider removing the oid column using\n" "supported anymore. Consider removing the oid column using\n"
" ALTER TABLE ... SET WITHOUT OIDS;\n" " ALTER TABLE ... SET WITHOUT OIDS;\n"
"A list of tables with the problem is in the file:\n" "A list of tables with the problem is in the file:\n"
" %s\n\n", output_path); " %s\n\n", output_path);
@ -1076,8 +1076,8 @@ check_for_reg_data_type_usage(ClusterInfo *cluster)
pg_fatal("Your installation contains one of the reg* data types in user tables.\n" pg_fatal("Your installation contains one of the reg* data types in user tables.\n"
"These data types reference system OIDs that are not preserved by\n" "These data types reference system OIDs that are not preserved by\n"
"pg_upgrade, so this cluster cannot currently be upgraded. You can\n" "pg_upgrade, so this cluster cannot currently be upgraded. You can\n"
"remove the problem tables and restart the upgrade. A list of the problem\n" "remove the problem tables and restart the upgrade. A list of the\n"
"columns is in the file:\n" "problem columns is in the file:\n"
" %s\n\n", output_path); " %s\n\n", output_path);
} }
else else
@ -1165,9 +1165,10 @@ check_for_jsonb_9_4_usage(ClusterInfo *cluster)
{ {
pg_log(PG_REPORT, "fatal\n"); pg_log(PG_REPORT, "fatal\n");
pg_fatal("Your installation contains the \"jsonb\" data type in user tables.\n" pg_fatal("Your installation contains the \"jsonb\" data type in user tables.\n"
"The internal format of \"jsonb\" changed during 9.4 beta so this cluster cannot currently\n" "The internal format of \"jsonb\" changed during 9.4 beta so this\n"
"be upgraded. You can remove the problem tables and restart the upgrade. A list\n" "cluster cannot currently be upgraded. You can remove the problem\n"
"of the problem columns is in the file:\n" "tables and restart the upgrade. A list of the problem columns is\n"
"in the file:\n"
" %s\n\n", output_path); " %s\n\n", output_path);
} }
else else