Commit 2bde2973 authored by Heikki Linnakangas's avatar Heikki Linnakangas

Show schema names in pg_dump verbose output.

Fabrízio de Royes Mello, reviewed by Michael Paquier
parent a7ae1dcf
......@@ -546,7 +546,12 @@ RestoreArchive(Archive *AHX)
/* Both schema and data objects might now have ownership/ACLs */
if ((te->reqs & (REQ_SCHEMA | REQ_DATA)) != 0)
{
ahlog(AH, 1, "setting owner and privileges for %s %s\n",
/* Show namespace if available */
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);
}
......@@ -621,7 +626,13 @@ restore_toc_entry(ArchiveHandle *AH, TocEntry *te,
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);
defnDumped = true;
......@@ -713,8 +724,8 @@ restore_toc_entry(ArchiveHandle *AH, TocEntry *te,
_becomeOwner(AH, te);
_selectOutputSchema(AH, te->namespace);
ahlog(AH, 1, "processing data for table \"%s\"\n",
te->tag);
ahlog(AH, 1, "processing data for table \"%s\".\"%s\"\n",
te->namespace, te->tag);
/*
* In parallel restore, if we created the table earlier in
......
......@@ -1400,7 +1400,8 @@ dumpTableData_copy(Archive *fout, void *dcontext)
const char *column_list;
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
......@@ -5019,7 +5020,8 @@ getIndexes(Archive *fout, TableInfo tblinfo[], int numTables)
continue;
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);
/* Make sure we are in proper schema so indexdef is right */
......@@ -5385,7 +5387,8 @@ getConstraints(Archive *fout, TableInfo tblinfo[], int numTables)
continue;
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);
/*
......@@ -5723,7 +5726,8 @@ getTriggers(Archive *fout, TableInfo tblinfo[], int numTables)
continue;
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);
/*
......@@ -6336,7 +6340,8 @@ getTableAttrs(Archive *fout, TableInfo *tblinfo, int numTables)
* the output of an indexscan on pg_attribute_relid_attnum_index.
*/
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.namespace->dobj.name,
tbinfo->dobj.name);
resetPQExpBuffer(q);
......@@ -6548,7 +6553,8 @@ getTableAttrs(Archive *fout, TableInfo *tblinfo, int numTables)
int numDefaults;
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.namespace->dobj.name,
tbinfo->dobj.name);
resetPQExpBuffer(q);
......@@ -6672,7 +6678,8 @@ getTableAttrs(Archive *fout, TableInfo *tblinfo, int numTables)
int numConstrs;
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);
resetPQExpBuffer(q);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment