🌐 AI搜索 & 代理 主页
Skip to content

Commit 883af81

Browse files
peterepetere
committed
pg_dump: Fix some messages
Make quoting style match existing style. Improve plural support.
1 parent 71fc49d commit 883af81

File tree

3 files changed

+16
-14
lines changed

3 files changed

+16
-14
lines changed

‎src/bin/pg_dump/pg_backup_archiver.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,7 @@ RestoreArchive(Archive *AHX)
631631
{
632632
/* Show namespace if available */
633633
if (te->namespace)
634-
ahlog(AH, 1, "setting owner and privileges for %s \"%s\".\"%s\"\n",
634+
ahlog(AH, 1, "setting owner and privileges for %s \"%s.%s\"\n",
635635
te->desc, te->namespace, te->tag);
636636
else
637637
ahlog(AH, 1, "setting owner and privileges for %s \"%s\"\n",
@@ -711,7 +711,7 @@ restore_toc_entry(ArchiveHandle *AH, TocEntry *te,
711711
{
712712
/* Show namespace if available */
713713
if (te->namespace)
714-
ahlog(AH, 1, "creating %s \"%s\".\"%s\"\n",
714+
ahlog(AH, 1, "creating %s \"%s.%s\"\n",
715715
te->desc, te->namespace, te->tag);
716716
else
717717
ahlog(AH, 1, "creating %s \"%s\"\n", te->desc, te->tag);
@@ -807,7 +807,7 @@ restore_toc_entry(ArchiveHandle *AH, TocEntry *te,
807807
_becomeOwner(AH, te);
808808
_selectOutputSchema(AH, te->namespace);
809809

810-
ahlog(AH, 1, "processing data for table \"%s\".\"%s\"\n",
810+
ahlog(AH, 1, "processing data for table \"%s.%s\"\n",
811811
te->namespace, te->tag);
812812

813813
/*

‎src/bin/pg_dump/pg_dump.c‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -916,7 +916,7 @@ help(const char *progname)
916916
printf(_(" --quote-all-identifiers quote all identifiers, even if not key words\n"));
917917
printf(_(" --section=SECTION dump named section (pre-data, data, or post-data)\n"));
918918
printf(_(" --serializable-deferrable wait until the dump can run without anomalies\n"));
919-
printf(_(" --snapshot=SNAPSHOT use given synchronous snapshot for the dump\n"));
919+
printf(_(" --snapshot=SNAPSHOT use given snapshot for the dump\n"));
920920
printf(_(" --strict-names require table and/or schema include patterns to\n"
921921
" match at least one entity each\n"));
922922
printf(_(" --use-set-session-authorization\n"
@@ -1455,7 +1455,7 @@ dumpTableData_copy(Archive *fout, DumpOptions *dopt, void *dcontext)
14551455
const char *column_list;
14561456

14571457
if (g_verbose)
1458-
write_msg(NULL, "dumping contents of table \"%s\".\"%s\"\n",
1458+
write_msg(NULL, "dumping contents of table \"%s.%s\"\n",
14591459
tbinfo->dobj.namespace->dobj.name, classname);
14601460

14611461
/*
@@ -2852,7 +2852,7 @@ getPolicies(Archive *fout, TableInfo tblinfo[], int numTables)
28522852
continue;
28532853

28542854
if (g_verbose)
2855-
write_msg(NULL, "reading row security enabled for table \"%s\".\"%s\"\n",
2855+
write_msg(NULL, "reading row security enabled for table \"%s.%s\"\n",
28562856
tbinfo->dobj.namespace->dobj.name,
28572857
tbinfo->dobj.name);
28582858

@@ -2883,7 +2883,7 @@ getPolicies(Archive *fout, TableInfo tblinfo[], int numTables)
28832883
}
28842884

28852885
if (g_verbose)
2886-
write_msg(NULL, "reading policies for table \"%s\".\"%s\"\n",
2886+
write_msg(NULL, "reading policies for table \"%s.%s\"\n",
28872887
tbinfo->dobj.namespace->dobj.name,
28882888
tbinfo->dobj.name);
28892889

@@ -5327,7 +5327,7 @@ getIndexes(Archive *fout, TableInfo tblinfo[], int numTables)
53275327
continue;
53285328

53295329
if (g_verbose)
5330-
write_msg(NULL, "reading indexes for table \"%s\".\"%s\"\n",
5330+
write_msg(NULL, "reading indexes for table \"%s.%s\"\n",
53315331
tbinfo->dobj.namespace->dobj.name,
53325332
tbinfo->dobj.name);
53335333

@@ -5694,7 +5694,7 @@ getConstraints(Archive *fout, TableInfo tblinfo[], int numTables)
56945694
continue;
56955695

56965696
if (g_verbose)
5697-
write_msg(NULL, "reading foreign key constraints for table \"%s\".\"%s\"\n",
5697+
write_msg(NULL, "reading foreign key constraints for table \"%s.%s\"\n",
56985698
tbinfo->dobj.namespace->dobj.name,
56995699
tbinfo->dobj.name);
57005700

@@ -6033,7 +6033,7 @@ getTriggers(Archive *fout, TableInfo tblinfo[], int numTables)
60336033
continue;
60346034

60356035
if (g_verbose)
6036-
write_msg(NULL, "reading triggers for table \"%s\".\"%s\"\n",
6036+
write_msg(NULL, "reading triggers for table \"%s.%s\"\n",
60376037
tbinfo->dobj.namespace->dobj.name,
60386038
tbinfo->dobj.name);
60396039

@@ -6767,7 +6767,7 @@ getTableAttrs(Archive *fout, DumpOptions *dopt, TableInfo *tblinfo, int numTable
67676767
* the output of an indexscan on pg_attribute_relid_attnum_index.
67686768
*/
67696769
if (g_verbose)
6770-
write_msg(NULL, "finding the columns and types of table \"%s\".\"%s\"\n",
6770+
write_msg(NULL, "finding the columns and types of table \"%s.%s\"\n",
67716771
tbinfo->dobj.namespace->dobj.name,
67726772
tbinfo->dobj.name);
67736773

@@ -6980,7 +6980,7 @@ getTableAttrs(Archive *fout, DumpOptions *dopt, TableInfo *tblinfo, int numTable
69806980
int numDefaults;
69816981

69826982
if (g_verbose)
6983-
write_msg(NULL, "finding default expressions of table \"%s\".\"%s\"\n",
6983+
write_msg(NULL, "finding default expressions of table \"%s.%s\"\n",
69846984
tbinfo->dobj.namespace->dobj.name,
69856985
tbinfo->dobj.name);
69866986

@@ -7105,7 +7105,7 @@ getTableAttrs(Archive *fout, DumpOptions *dopt, TableInfo *tblinfo, int numTable
71057105
int numConstrs;
71067106

71077107
if (g_verbose)
7108-
write_msg(NULL, "finding check constraints for table \"%s\".\"%s\"\n",
7108+
write_msg(NULL, "finding check constraints for table \"%s.%s\"\n",
71097109
tbinfo->dobj.namespace->dobj.name,
71107110
tbinfo->dobj.name);
71117111

‎src/bin/pg_dump/pg_dump_sort.c‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1247,7 +1247,9 @@ repairDependencyLoop(DumpableObject **loop,
12471247
}
12481248
if (i >= nLoop)
12491249
{
1250-
write_msg(NULL, "NOTICE: there are circular foreign-key constraints among these table(s):\n");
1250+
write_msg(NULL, ngettext("NOTICE: there are circular foreign-key constraints on this table:\n",
1251+
"NOTICE: there are circular foreign-key constraints among these tables:\n",
1252+
nLoop));
12511253
for (i = 0; i < nLoop; i++)
12521254
write_msg(NULL, " %s\n", loop[i]->name);
12531255
write_msg(NULL, "You might not be able to restore the dump without using --disable-triggers or temporarily dropping the constraints.\n");

0 commit comments

Comments
 (0)