database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-29 13:56:47 +03:00
Code

Final (?) fix for tar (null block at end)

Browse Source 
Dump template db in dumpall
This commit is contained in:
Philip Warner 2000-10-25 10:21:38 +00:00
parent 03f9e5a5fc
commit 48f0490809
3 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/pg_dump/pg_backup_archiver.h
View File

@ -62,7 +62,7 @@ typedef z_stream *z_streamp;
#define K_VERS_MAJOR 1 #define K_VERS_MAJOR 1
#define K_VERS_MINOR 4 #define K_VERS_MINOR 4
#define K_VERS_REV 20 #define K_VERS_REV 21
/* Data block types */ /* Data block types */
#define BLK_DATA 1 #define BLK_DATA 1

9
src/bin/pg_dump/pg_backup_tar.c
View File

@ -721,7 +721,7 @@ static void _CloseArchive(ArchiveHandle* AH)
lclContext* ctx = (lclContext*)AH->formatData; lclContext* ctx = (lclContext*)AH->formatData;
TAR_MEMBER *th; TAR_MEMBER *th;
RestoreOptions *ropt; RestoreOptions *ropt;
int savVerbose; int savVerbose, i;
if (AH->mode == archModeWrite) { if (AH->mode == archModeWrite) {
@ -774,6 +774,13 @@ static void _CloseArchive(ArchiveHandle* AH)
AH->public.verbose = savVerbose; AH->public.verbose = savVerbose;
tarClose(AH, th); tarClose(AH, th);
/* Add a block of NULLs since it's de-rigeur. */
for(i=0; i<512; i++)
{
fputc(0, ctx->tarFH);
}
} }
AH->FH = NULL; AH->FH = NULL;

16
src/bin/pg_dump/pg_dumpall.sh
View File

@ -6,7 +6,7 @@
# and "pg_group" tables, which belong to the whole installation rather # and "pg_group" tables, which belong to the whole installation rather
# than any one individual database. # than any one individual database.
# #
# $Header: /cvsroot/pgsql/src/bin/pg_dump/Attic/pg_dumpall.sh,v 1.4 2000/09/08 18:29:27 petere Exp $ # $Header: /cvsroot/pgsql/src/bin/pg_dump/Attic/pg_dumpall.sh,v 1.5 2000/10/25 10:21:38 pjw Exp $
CMDNAME=`basename $0` CMDNAME=`basename $0`
@ -179,6 +179,20 @@ while read GRONAME GROSYSID GROLIST ; do
done done
# First we dump the template in case there are local extensions.
echo
echo "--"
echo "-- Database template1"
echo "--"
echo "${BS}connect template1"
$PGDUMP "template1"
if [ "$?" -ne 0 ] ; then
echo "pg_dump failed on template1, exiting" 1>&2
exit 1
fi
# For each database, run pg_dump to dump the contents of that database. # For each database, run pg_dump to dump the contents of that database.
$PSQL -d template1 -At -F ' ' \ $PSQL -d template1 -At -F ' ' \