Suggest use of psql when pg_restore gets a text dump.

diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c
index 7d895c46a38cecbb42a6d888461a1fce643abf29..d9edebb0f48308787bf263cd90504d3c5ed80e8b 100644 (file)
--- a/src/bin/pg_dump/pg_backup_archiver.c
+++ b/src/bin/pg_dump/pg_backup_archiver.c
@@ -77,6 +77,9 @@ typedef struct _parallel_slot
 
 #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 */
 typedef struct _outputContext
 {
@@ -1862,12 +1865,20 @@ _discoverArchiveFormat(ArchiveHandle *AH)
        else
        {
                /*
-                * *Maybe* we have a tar archive format file... So, read first 512
-                * byte header...
+                * *Maybe* we have a tar archive format file or a text dump ... 
+                * So, read first 512 byte header...
                 */
                cnt = fread(&AH->lookahead[AH->lookaheadLen], 1, 512 - AH->lookaheadLen, fh);
                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)
                        die_horribly(AH, modulename, "input file does not appear to be a valid archive (too short?)\n");