sharpetronics/PostgreSQL
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-13 01:13:08 -04:00
Code Issues Projects Releases Wiki Activity

Show schema names in pg_dump verbose output.

Browse Source 
Fabrízio de Royes Mello, reviewed by Michael Paquier
This commit is contained in:
Heikki Linnakangas 2014-08-26 11:50:48 +03:00
parent a7ae1dcf49
commit 2bde29739d
2 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/bin/pg_dump/pg_backup_archiver.c
View File

@ -546,8 +546,13 @@ RestoreArchive(Archive *AHX)
/* Both schema and data objects might now have ownership/ACLs */ /* Both schema and data objects might now have ownership/ACLs */
if ((te->reqs & (REQ_SCHEMA | REQ_DATA)) != 0) if ((te->reqs & (REQ_SCHEMA | REQ_DATA)) != 0)
{ {
ahlog(AH, 1, "setting owner and privileges for %s %s\n", /* Show namespace if available */
te->desc, te->tag); if (te->namespace)
ahlog(AH, 1, "setting owner and privileges for %s \"%s\".\"%s\"\n",
te->desc, te->namespace, te->tag);
else
ahlog(AH, 1, "setting owner and privileges for %s \"%s\"\n",
te->desc, te->tag);
_printTocEntry(AH, te, ropt, false, true); _printTocEntry(AH, te, ropt, false, true);
} }
} }
@ -621,7 +626,13 @@ restore_toc_entry(ArchiveHandle *AH, TocEntry *te,
if ((reqs & REQ_SCHEMA) != 0) /* We want the schema */ if ((reqs & REQ_SCHEMA) != 0) /* We want the schema */
{ {
ahlog(AH, 1, "creating %s %s\n", te->desc, te->tag); /* Show namespace if available */
if (te->namespace)
ahlog(AH, 1, "creating %s \"%s\".\"%s\"\n",
te->desc, te->namespace, te->tag);
else
ahlog(AH, 1, "creating %s \"%s\"\n", te->desc, te->tag);
_printTocEntry(AH, te, ropt, false, false); _printTocEntry(AH, te, ropt, false, false);
defnDumped = true; defnDumped = true;
@ -713,8 +724,8 @@ restore_toc_entry(ArchiveHandle *AH, TocEntry *te,
_becomeOwner(AH, te); _becomeOwner(AH, te);
_selectOutputSchema(AH, te->namespace); _selectOutputSchema(AH, te->namespace);
ahlog(AH, 1, "processing data for table \"%s\"\n", ahlog(AH, 1, "processing data for table \"%s\".\"%s\"\n",
te->tag); te->namespace, te->tag);
/* /*
* In parallel restore, if we created the table earlier in * In parallel restore, if we created the table earlier in

25
src/bin/pg_dump/pg_dump.c
View File

@ -1400,7 +1400,8 @@ dumpTableData_copy(Archive *fout, void *dcontext)
const char *column_list; const char *column_list;
if (g_verbose) if (g_verbose)
write_msg(NULL, "dumping contents of table %s\n", classname); write_msg(NULL, "dumping contents of table \"%s\".\"%s\"\n",
tbinfo->dobj.namespace->dobj.name, classname);
/* /*
* Make sure we are in proper schema. We will qualify the table name * Make sure we are in proper schema. We will qualify the table name
@ -5019,7 +5020,8 @@ getIndexes(Archive *fout, TableInfo tblinfo[], int numTables)
continue; continue;
if (g_verbose) if (g_verbose)
write_msg(NULL, "reading indexes for table \"%s\"\n", write_msg(NULL, "reading indexes for table \"%s\".\"%s\"\n",
tbinfo->dobj.namespace->dobj.name,
tbinfo->dobj.name); tbinfo->dobj.name);
/* Make sure we are in proper schema so indexdef is right */ /* Make sure we are in proper schema so indexdef is right */
@ -5385,7 +5387,8 @@ getConstraints(Archive *fout, TableInfo tblinfo[], int numTables)
continue; continue;
if (g_verbose) if (g_verbose)
write_msg(NULL, "reading foreign key constraints for table \"%s\"\n", write_msg(NULL, "reading foreign key constraints for table \"%s\".\"%s\"\n",
tbinfo->dobj.namespace->dobj.name,
tbinfo->dobj.name); tbinfo->dobj.name);
/* /*
@ -5723,7 +5726,8 @@ getTriggers(Archive *fout, TableInfo tblinfo[], int numTables)
continue; continue;
if (g_verbose) if (g_verbose)
write_msg(NULL, "reading triggers for table \"%s\"\n", write_msg(NULL, "reading triggers for table \"%s\".\"%s\"\n",
tbinfo->dobj.namespace->dobj.name,
tbinfo->dobj.name); tbinfo->dobj.name);
/* /*
@ -6336,8 +6340,9 @@ getTableAttrs(Archive *fout, TableInfo *tblinfo, int numTables)
* the output of an indexscan on pg_attribute_relid_attnum_index. * the output of an indexscan on pg_attribute_relid_attnum_index.
*/ */
if (g_verbose) if (g_verbose)
write_msg(NULL, "finding the columns and types of table \"%s\"\n", write_msg(NULL, "finding the columns and types of table \"%s\".\"%s\"\n",
tbinfo->dobj.name); tbinfo->dobj.namespace->dobj.name,
tbinfo->dobj.name);
resetPQExpBuffer(q); resetPQExpBuffer(q);
@ -6548,8 +6553,9 @@ getTableAttrs(Archive *fout, TableInfo *tblinfo, int numTables)
int numDefaults; int numDefaults;
if (g_verbose) if (g_verbose)
write_msg(NULL, "finding default expressions of table \"%s\"\n", write_msg(NULL, "finding default expressions of table \"%s\".\"%s\"\n",
tbinfo->dobj.name); tbinfo->dobj.namespace->dobj.name,
tbinfo->dobj.name);
resetPQExpBuffer(q); resetPQExpBuffer(q);
if (fout->remoteVersion >= 70300) if (fout->remoteVersion >= 70300)
@ -6672,7 +6678,8 @@ getTableAttrs(Archive *fout, TableInfo *tblinfo, int numTables)
int numConstrs; int numConstrs;
if (g_verbose) if (g_verbose)
write_msg(NULL, "finding check constraints for table \"%s\"\n", write_msg(NULL, "finding check constraints for table \"%s\".\"%s\"\n",
tbinfo->dobj.namespace->dobj.name,
tbinfo->dobj.name); tbinfo->dobj.name);
resetPQExpBuffer(q); resetPQExpBuffer(q);