>From 5330eea78029f9cb689fd3c53722cb02217f47df Mon Sep 17 00:00:00 2001 From: Craig Ringer Date: Fri, 17 Oct 2014 11:54:29 +0800 Subject: [PATCH 1/2] Emit an error when psql is used to load a custom-format dump file Users tend to get confused between psql and pg_restore, and will use psql to try to restore a dump from pg_dump -Fc, or use pg_restore to try to restore an SQL format dump. pg_restore complains if it sees an SQL format dump, but psql doesn't complain if it sees a custom-format dump. Fix that by emitting an error if you try to run a custom format dump: The input is a PostgreSQL custom-format dump. Use the pg_restore command-line client to restore this dump to a database. --- src/bin/psql/mainloop.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/bin/psql/mainloop.c b/src/bin/psql/mainloop.c index 98211dc..1e057a6 100644 --- a/src/bin/psql/mainloop.c +++ b/src/bin/psql/mainloop.c @@ -175,6 +175,17 @@ MainLoop(FILE *source) if (pset.lineno == 1 && pset.encoding == PG_UTF8 && strncmp(line, "\xef\xbb\xbf", 3) == 0) memmove(line, line + 3, strlen(line + 3) + 1); + /* Detect attempts to run custom-format dumps as SQL scripts */ + if (pset.lineno == 1 && !pset.cur_cmd_interactive && strncmp(line, "PGDMP", 5) == 0) + { + free(line); + puts(_("The input is a PostgreSQL custom-format dump. Use the pg_restore \n" + "command-line client to restore this dump to a database.\n")); + fflush(stdout); + successResult = EXIT_FAILURE; + break; + } + /* nothing left on line? then ignore */ if (line[0] == '\0' && !psql_scan_in_quote(scan_state)) { -- 1.9.3