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

Commitb6dacc1

Browse files
committed
pg_dump: Message style improvements
1 parente65953b commitb6dacc1

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

‎src/bin/pg_dump/pg_backup_archiver.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2658,35 +2658,35 @@ StrictNamesCheck(RestoreOptions *ropt)
26582658
{
26592659
missing_name=simple_string_list_not_touched(&ropt->schemaNames);
26602660
if (missing_name!=NULL)
2661-
exit_horribly(modulename,"Schema \"%s\" not found.\n",missing_name);
2661+
exit_horribly(modulename,"schema \"%s\" not found\n",missing_name);
26622662
}
26632663

26642664
if (ropt->tableNames.head!=NULL)
26652665
{
26662666
missing_name=simple_string_list_not_touched(&ropt->tableNames);
26672667
if (missing_name!=NULL)
2668-
exit_horribly(modulename,"Table \"%s\" not found.\n",missing_name);
2668+
exit_horribly(modulename,"table \"%s\" not found\n",missing_name);
26692669
}
26702670

26712671
if (ropt->indexNames.head!=NULL)
26722672
{
26732673
missing_name=simple_string_list_not_touched(&ropt->indexNames);
26742674
if (missing_name!=NULL)
2675-
exit_horribly(modulename,"Index \"%s\" not found.\n",missing_name);
2675+
exit_horribly(modulename,"index \"%s\" not found\n",missing_name);
26762676
}
26772677

26782678
if (ropt->functionNames.head!=NULL)
26792679
{
26802680
missing_name=simple_string_list_not_touched(&ropt->functionNames);
26812681
if (missing_name!=NULL)
2682-
exit_horribly(modulename,"Function \"%s\" not found.\n",missing_name);
2682+
exit_horribly(modulename,"function \"%s\" not found\n",missing_name);
26832683
}
26842684

26852685
if (ropt->triggerNames.head!=NULL)
26862686
{
26872687
missing_name=simple_string_list_not_touched(&ropt->triggerNames);
26882688
if (missing_name!=NULL)
2689-
exit_horribly(modulename,"Trigger \"%s\" not found.\n",missing_name);
2689+
exit_horribly(modulename,"trigger \"%s\" not found\n",missing_name);
26902690
}
26912691
}
26922692

‎src/bin/pg_dump/pg_dump.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -706,7 +706,7 @@ main(int argc, char **argv)
706706
&schema_include_oids,
707707
strict_names);
708708
if (schema_include_oids.head == NULL)
709-
exit_horribly(NULL, "No matching schemas were found\n");
709+
exit_horribly(NULL, "no matching schemas were found\n");
710710
}
711711
expand_schema_name_patterns(fout, &schema_exclude_patterns,
712712
&schema_exclude_oids,
@@ -720,7 +720,7 @@ main(int argc, char **argv)
720720
&table_include_oids,
721721
strict_names);
722722
if (table_include_oids.head == NULL)
723-
exit_horribly(NULL, "No matching tables were found\n");
723+
exit_horribly(NULL, "no matching tables were found\n");
724724
}
725725
expand_table_name_patterns(fout, &table_exclude_patterns,
726726
&table_exclude_oids,
@@ -1190,7 +1190,7 @@ expand_schema_name_patterns(Archive *fout,
11901190

11911191
res = ExecuteSqlQuery(fout, query->data, PGRES_TUPLES_OK);
11921192
if (strict_names && PQntuples(res) == 0)
1193-
exit_horribly(NULL, "No matchingtable(s) were found for pattern \"%s\"\n", cell->val);
1193+
exit_horribly(NULL, "no matchingtables were found for pattern \"%s\"\n", cell->val);
11941194

11951195
for (i = 0; i < PQntuples(res); i++)
11961196
{
@@ -12315,7 +12315,7 @@ dumpAccessMethod(Archive *fout, AccessMethodInfo *aminfo)
1231512315
appendPQExpBuffer(q, "TYPE INDEX ");
1231612316
break;
1231712317
default:
12318-
write_msg(NULL, "WARNING: invalid type%c of access method%s\n",
12318+
write_msg(NULL, "WARNING: invalid type\"%c\" of access method\"%s\"\n",
1231912319
aminfo->amtype, qamname);
1232012320
pg_free(qamname);
1232112321
destroyPQExpBuffer(q);

‎src/bin/pg_dump/pg_dumpall.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -774,7 +774,7 @@ dumpRoles(PGconn *conn)
774774

775775
if (strncmp(rolename,"pg_",3)==0)
776776
{
777-
fprintf(stderr,_("%s: role name starting with'pg_' skipped (%s)\n"),
777+
fprintf(stderr,_("%s: role name starting with\"pg_\" skipped (%s)\n"),
778778
progname,rolename);
779779
continue;
780780
}

‎src/bin/pg_dump/pg_restore.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@ usage(const char *progname)
460460
printf(_(" -P, --function=NAME(args) restore named function\n"));
461461
printf(_(" -s, --schema-only restore only the schema, no data\n"));
462462
printf(_(" -S, --superuser=NAME superuser user name to use for disabling triggers\n"));
463-
printf(_(" -t, --table=NAME restore named relation (table, view, etc)\n"));
463+
printf(_(" -t, --table=NAME restore named relation (table, view, etc.)\n"));
464464
printf(_(" -T, --trigger=NAME restore named trigger\n"));
465465
printf(_(" -x, --no-privileges skip restoration of access privileges (grant/revoke)\n"));
466466
printf(_(" -1, --single-transaction restore as a single transaction\n"));

0 commit comments

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