mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Suggest use of psql when pg_restore gets a text dump.

Browse Source
This commit is contained in:
Andrew Dunstan 2012-01-03 16:02:49 -05:00
parent bc2a050d40
commit 54a622cadf
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,6 +77,9 @@ typedef struct _parallel_slot
#define NO_SLOT (-1) #define NO_SLOT (-1)
#define TEXT_DUMP_HEADER "--\n-- PostgreSQL database dump\n--\n\n"
#define TEXT_DUMPALL_HEADER "--\n-- PostgreSQL database cluster dump\n--\n\n"
/* state needed to save/restore an archive's output target */ /* state needed to save/restore an archive's output target */
typedef struct _outputContext typedef struct _outputContext
{ {
@ -1862,12 +1865,20 @@ _discoverArchiveFormat(ArchiveHandle *AH)
else else
{ {
/* /*
* *Maybe* we have a tar archive format file... So, read first 512 * *Maybe* we have a tar archive format file or a text dump ...
* byte header... * So, read first 512 byte header...
*/ */
cnt = fread(&AH->lookahead[AH->lookaheadLen], 1, 512 - AH->lookaheadLen, fh); cnt = fread(&AH->lookahead[AH->lookaheadLen], 1, 512 - AH->lookaheadLen, fh);
AH->lookaheadLen += cnt; AH->lookaheadLen += cnt;
if (AH->lookaheadLen >= strlen(TEXT_DUMPALL_HEADER) &&
(strncmp(AH->lookahead, TEXT_DUMP_HEADER, strlen(TEXT_DUMP_HEADER)) == 0 ||
strncmp(AH->lookahead, TEXT_DUMPALL_HEADER, strlen(TEXT_DUMPALL_HEADER)) == 0))
{
/* looks like it's probably a text format dump. so suggest they try psql */
die_horribly(AH, modulename, "input file appears to be a text format dump. Please use psql.\n");
}
if (AH->lookaheadLen != 512) if (AH->lookaheadLen != 512)
die_horribly(AH, modulename, "input file does not appear to be a valid archive (too short?)\n"); die_horribly(AH, modulename, "input file does not appear to be a valid archive (too short?)\n");