diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2004-03-03 21:28:55 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2004-03-03 21:28:55 +0000 |
| commit | 9e733eab6981e3c7c6730333f42320bed29b8a68 (patch) | |
| tree | 4e84f0b46dc12ff4211211c2763ad099071c0fb4 /src/bin/pg_dump/pg_backup_custom.c | |
| parent | 6819787c9b1e5aa5972b0eccfc8e81c71877c586 (diff) | |
| download | postgresql-9e733eab6981e3c7c6730333f42320bed29b8a68.tar.gz | |
Modify pg_dump so that the preferred dump order is by name within
object types, rather than by OID. This should help ensure consistent
dump output from databases that are logically the same but have different
histories, per recent discussion about 'diffing' databases. The patch
is bulky because of renaming of fields, but not very complicated.
Also, do some tweaking to cause BLOB restoration to be done in a better
order, and clean up pg_restore's textual output to exactly match pg_dump.
Diffstat (limited to 'src/bin/pg_dump/pg_backup_custom.c')
| -rw-r--r-- | src/bin/pg_dump/pg_backup_custom.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/bin/pg_dump/pg_backup_custom.c b/src/bin/pg_dump/pg_backup_custom.c index 76e1b0f403..d3581a4787 100644 --- a/src/bin/pg_dump/pg_backup_custom.c +++ b/src/bin/pg_dump/pg_backup_custom.c @@ -19,7 +19,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_custom.c,v 1.28 2003/12/06 03:00:11 tgl Exp $ + * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_custom.c,v 1.29 2004/03/03 21:28:54 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -279,8 +279,9 @@ _PrintExtraToc(ArchiveHandle *AH, TocEntry *te) { lclTocEntry *ctx = (lclTocEntry *) te->formatData; - ahprintf(AH, "-- Data Pos: " INT64_FORMAT "\n", - (int64) ctx->dataPos); + if (AH->public.verbose) + ahprintf(AH, "-- Data Pos: " INT64_FORMAT "\n", + (int64) ctx->dataPos); } /* @@ -417,8 +418,8 @@ _EndBlobs(ArchiveHandle *AH, TocEntry *te) } /* - * Print data for a gievn TOC entry -*/ + * Print data for a given TOC entry + */ static void _PrintTocData(ArchiveHandle *AH, TocEntry *te, RestoreOptions *ropt) { @@ -497,8 +498,6 @@ _PrintTocData(ArchiveHandle *AH, TocEntry *te, RestoreOptions *ropt) blkType); break; } - - ahprintf(AH, "\n\n"); } /* |