From 2bde29739d1e28f58e901b7e53057b8ddc0ec286 Mon Sep 17 00:00:00 2001 From: Heikki Linnakangas Date: Tue, 26 Aug 2014 11:50:48 +0300 Subject: [PATCH] Show schema names in pg_dump verbose output. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Fabrízio de Royes Mello, reviewed by Michael Paquier --- src/bin/pg_dump/pg_backup_archiver.c | 21 ++++++++++++++++----- src/bin/pg_dump/pg_dump.c | 25 ++++++++++++++++--------- 2 files changed, 32 insertions(+), 14 deletions(-) diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c index 3aebac8727..00187200ff 100644 --- a/src/bin/pg_dump/pg_backup_archiver.c +++ b/src/bin/pg_dump/pg_backup_archiver.c @@ -546,8 +546,13 @@ 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", - te->desc, te->tag); + /* 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 diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c index 5c0f95fea3..c084ee9d9e 100644 --- a/src/bin/pg_dump/pg_dump.c +++ b/src/bin/pg_dump/pg_dump.c @@ -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,8 +6340,9 @@ 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", - tbinfo->dobj.name); + write_msg(NULL, "finding the columns and types of table \"%s\".\"%s\"\n", + tbinfo->dobj.namespace->dobj.name, + tbinfo->dobj.name); resetPQExpBuffer(q); @@ -6548,8 +6553,9 @@ getTableAttrs(Archive *fout, TableInfo *tblinfo, int numTables) int numDefaults; if (g_verbose) - write_msg(NULL, "finding default expressions of table \"%s\"\n", - tbinfo->dobj.name); + write_msg(NULL, "finding default expressions of table \"%s\".\"%s\"\n", + tbinfo->dobj.namespace->dobj.name, + tbinfo->dobj.name); resetPQExpBuffer(q); if (fout->remoteVersion >= 70300) @@ -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); -- 2.40.0