From 07ccbeb360fedd14464d1d3c0c819f7b702f018e Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Fri, 8 Oct 2004 15:03:26 +0000
Subject: [PATCH] Include schema name in pg_restore -l output, per request from
 Phil Endecott.

---
 doc/src/sgml/release.sgml            | 10 ++++++++--
 src/bin/pg_dump/pg_backup_archiver.c |  7 ++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/doc/src/sgml/release.sgml b/doc/src/sgml/release.sgml
index 66ae275c33..73e359f4d3 100644
--- a/doc/src/sgml/release.sgml
+++ b/doc/src/sgml/release.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.300 2004/10/04 22:49:47 tgl Exp $
+$PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.301 2004/10/08 15:03:25 tgl Exp $
 -->
 
 <appendix id="release">
@@ -1723,7 +1723,13 @@ $PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.300 2004/10/04 22:49:47 tgl Exp
 
     <listitem>
      <para>
-      New start/stop of dump markers in pg_dump (Bruce)
+      pg_restore -l display now includes objects' schema names
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      New begin/end markers in pg_dump text output (Bruce)
      </para>
     </listitem>
 
diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c
index 429d037129..168b74a4f8 100644
--- a/src/bin/pg_dump/pg_backup_archiver.c
+++ b/src/bin/pg_dump/pg_backup_archiver.c
@@ -15,7 +15,7 @@
  *
  *
  * IDENTIFICATION
- *		$PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.97 2004/09/10 20:05:18 tgl Exp $
+ *		$PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.98 2004/10/08 15:03:26 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -699,9 +699,10 @@ PrintTOCSummary(Archive *AHX, RestoreOptions *ropt)
 	while (te != AH->toc)
 	{
 		if (_tocEntryRequired(te, ropt, false) != 0)
-			ahprintf(AH, "%d; %u %u %s %s %s\n", te->dumpId,
+			ahprintf(AH, "%d; %u %u %s %s %s %s\n", te->dumpId,
 					 te->catalogId.tableoid, te->catalogId.oid,
-					 te->desc, te->tag, te->owner);
+					 te->desc, te->namespace ? te->namespace : "-",
+					 te->tag, te->owner);
 		te = te->next;
 	}