Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit1634d36

Browse files
committed
pg_upgrade: clarify the database names in error files
Previously, the "Database:" label in the error file was unclear if thelabel was a status report or the problem was _in_ the database. Newtext is "In database:".Reported-by: Justin PryzbyDiscussion:https://postgr.es/m/20191002172337.GC9680@telsasoft.comBackpatch-through: head
1 parent6c9fb69 commit1634d36

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

‎src/bin/pg_upgrade/check.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -858,7 +858,7 @@ check_for_isn_and_int8_passing_mismatch(ClusterInfo *cluster)
858858
output_path,strerror(errno));
859859
if (!db_used)
860860
{
861-
fprintf(script,"Database: %s\n",active_db->db_name);
861+
fprintf(script,"In database: %s\n",active_db->db_name);
862862
db_used= true;
863863
}
864864
fprintf(script," %s.%s\n",
@@ -937,7 +937,7 @@ check_for_tables_with_oids(ClusterInfo *cluster)
937937
output_path,strerror(errno));
938938
if (!db_used)
939939
{
940-
fprintf(script,"Database: %s\n",active_db->db_name);
940+
fprintf(script,"In database: %s\n",active_db->db_name);
941941
db_used= true;
942942
}
943943
fprintf(script," %s.%s\n",
@@ -1046,7 +1046,7 @@ check_for_reg_data_type_usage(ClusterInfo *cluster)
10461046
output_path,strerror(errno));
10471047
if (!db_used)
10481048
{
1049-
fprintf(script,"Database: %s\n",active_db->db_name);
1049+
fprintf(script,"In database: %s\n",active_db->db_name);
10501050
db_used= true;
10511051
}
10521052
fprintf(script," %s.%s.%s\n",
@@ -1137,7 +1137,7 @@ check_for_jsonb_9_4_usage(ClusterInfo *cluster)
11371137
output_path,strerror(errno));
11381138
if (!db_used)
11391139
{
1140-
fprintf(script,"Database: %s\n",active_db->db_name);
1140+
fprintf(script,"In database: %s\n",active_db->db_name);
11411141
db_used= true;
11421142
}
11431143
fprintf(script," %s.%s.%s\n",

‎src/bin/pg_upgrade/function.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ check_loadable_libraries(void)
256256
}
257257

258258
if (was_load_failure)
259-
fprintf(script,_("Database: %s\n"),
259+
fprintf(script,_("In database: %s\n"),
260260
old_cluster.dbarr.dbs[os_info.libraries[libnum].dbnum].db_name);
261261
}
262262

‎src/bin/pg_upgrade/version.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ old_9_3_check_for_line_data_type_usage(ClusterInfo *cluster)
157157
strerror(errno));
158158
if (!db_used)
159159
{
160-
fprintf(script,"Database: %s\n",active_db->db_name);
160+
fprintf(script,"In database: %s\n",active_db->db_name);
161161
db_used= true;
162162
}
163163
fprintf(script," %s.%s.%s\n",
@@ -258,7 +258,7 @@ old_9_6_check_for_unknown_data_type_usage(ClusterInfo *cluster)
258258
strerror(errno));
259259
if (!db_used)
260260
{
261-
fprintf(script,"Database: %s\n",active_db->db_name);
261+
fprintf(script,"In database: %s\n",active_db->db_name);
262262
db_used= true;
263263
}
264264
fprintf(script," %s.%s.%s\n",

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp