rdelaage/postgresql
1
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-10-01 22:11:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix obviously-utterly-untested noTocComments code.

Browse Source
This commit is contained in:
Tom Lane 2004-08-30 19:44:14 +00:00
parent 64cb889106
commit c7040429e7
1 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,7 +15,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.95 2004/08/29 05:06:53 momjian Exp $ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.96 2004/08/30 19:44:14 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -2357,8 +2357,6 @@ _getObjectFromDropStmt(const char *dropStmt, const char *type)
static void static void
_printTocEntry(ArchiveHandle *AH, TocEntry *te, RestoreOptions *ropt, bool isData, bool acl_pass) _printTocEntry(ArchiveHandle *AH, TocEntry *te, RestoreOptions *ropt, bool isData, bool acl_pass)
{ {
const char *pfx;
/* ACLs are dumped only during acl pass */ /* ACLs are dumped only during acl pass */
if (acl_pass) if (acl_pass)
{ {
@ -2371,9 +2369,6 @@ _printTocEntry(ArchiveHandle *AH, TocEntry *te, RestoreOptions *ropt, bool isDat
return; return;
} }
if (AH->noTocComments)
return;
/* /*
* Avoid dumping the public schema, as it will already be created ... * Avoid dumping the public schema, as it will already be created ...
* unless we are using --clean mode, in which case it's been deleted * unless we are using --clean mode, in which case it's been deleted
@ -2392,6 +2387,10 @@ _printTocEntry(ArchiveHandle *AH, TocEntry *te, RestoreOptions *ropt, bool isDat
_setWithOids(AH, te); _setWithOids(AH, te);
/* Emit header comment for item */ /* Emit header comment for item */
if (!AH->noTocComments)
{
const char *pfx;
if (isData) if (isData)
pfx = "Data for "; pfx = "Data for ";
else else
@ -2416,9 +2415,10 @@ _printTocEntry(ArchiveHandle *AH, TocEntry *te, RestoreOptions *ropt, bool isDat
pfx, te->tag, te->desc, pfx, te->tag, te->desc,
te->namespace ? te->namespace : "-", te->namespace ? te->namespace : "-",
te->owner); te->owner);
if (AH->PrintExtraTocPtr !=NULL) if (AH->PrintExtraTocPtr != NULL)
(*AH->PrintExtraTocPtr) (AH, te); (*AH->PrintExtraTocPtr) (AH, te);
ahprintf(AH, "--\n\n"); ahprintf(AH, "--\n\n");
}
/* /*
* Actually print the definition. * Actually print the definition.