open-dsi
/
postgres
mirror of https://github.com/postgres/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Strengthen warnings about using pg_dump's -i option.

Browse Source
REL8_5_ALPHA1_BRANCH
Bruce Momjian 18 years ago
parent 530659fac8
commit c22de3989b
5 changed files with 21 additions and 22 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 17
      doc/src/sgml/ref/pg_dump.sgml
  2. 7
      src/bin/pg_dump/pg_backup_db.c
  3. 5
      src/bin/pg_dump/pg_dump.c
  4. 10
      src/bin/pg_dump/pg_dumpall.c
  5. 4
      src/bin/pg_dump/pg_restore.c

17
doc/src/sgml/ref/pg_dump.sgml
Unescape View File

@ -1,5 +1,5 @@
<!--
$PostgreSQL: pgsql/doc/src/sgml/ref/pg_dump.sgml,v 1.99 2008/03/20 17:36:57 tgl Exp $
$PostgreSQL: pgsql/doc/src/sgml/ref/pg_dump.sgml,v 1.100 2008/03/26 14:32:22 momjian Exp $
PostgreSQL documentation
-->
@ -296,19 +296,18 @@ PostgreSQL documentation
<term><option>--ignore-version</></term>
<listitem>
<para>
Ignore version mismatch between
Ignore incompatible version check between
<application>pg_dump</application> and the database server.
</para>
<para>
<application>pg_dump</application> can dump from servers running
previous releases of <productname>PostgreSQL</>, but very old
versions are not supported anymore (currently, those prior to 7.0).
Dumping from a server newer than <application>pg_dump</application>
is likely not to work at all.
Use this option if you need to override the version check (and
if <application>pg_dump</application> then fails, don't say
you weren't warned).
is likely fail and is disabled by default.
Also, while <application>pg_dump</application> can dump from servers running
previous releases of <productname>PostgreSQL</>, some very old
versions are not supported (currently, pre-7.0).
Use this option if you need to override the version check, but
be prepared for <application>pg_dump</application> to fail.
</para>
</listitem>
</varlistentry>

7
src/bin/pg_dump/pg_backup_db.c
Unescape View File

@ -5,7 +5,7 @@
* Implements the basic DB functions used by the archiver.
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_db.c,v 1.77 2007/12/09 19:01:40 tgl Exp $
* $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_db.c,v 1.78 2008/03/26 14:32:22 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -72,9 +72,10 @@ _check_database_version(ArchiveHandle *AH, bool ignoreVersion)
write_msg(NULL, "server version: %s; %s version: %s\n",
remoteversion_str, progname, PG_VERSION);
if (ignoreVersion)
write_msg(NULL, "proceeding despite version mismatch\n");
write_msg(NULL, "ignoring server version mismatch\n");
else
die_horribly(AH, NULL, "aborting because of version mismatch (Use the -i option to proceed anyway.)\n");
die_horribly(AH, NULL, "aborting because of server version mismatch\n"
"Use the -i option to bypass server version check, but be prepared for failure.\n");
}
}

5
src/bin/pg_dump/pg_dump.c
Unescape View File

@ -12,7 +12,7 @@
* by PostgreSQL
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.483 2008/03/20 17:36:57 tgl Exp $
* $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.484 2008/03/26 14:32:22 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -745,8 +745,7 @@ help(const char *progname)
printf(_("\nGeneral options:\n"));
printf(_(" -f, --file=FILENAME output file name\n"));
printf(_(" -F, --format=c|t|p output file format (custom, tar, plain text)\n"));
printf(_(" -i, --ignore-version proceed even when server version mismatches\n"
" pg_dump version\n"));
printf(_(" -i, --ignore-version ignore server version mismatch\n"));
printf(_(" -v, --verbose verbose mode\n"));
printf(_(" -Z, --compress=0-9 compression level for compressed formats\n"));
printf(_(" --help show this help, then exit\n"));

10
src/bin/pg_dump/pg_dumpall.c
Unescape View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
*
*
* $PostgreSQL: pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.102 2008/03/20 17:42:51 tgl Exp $
* $PostgreSQL: pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.103 2008/03/26 14:32:22 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -488,8 +488,7 @@ help(void)
printf(_("\nGeneral options:\n"));
printf(_(" -f, --file=FILENAME output file name\n"));
printf(_(" -i, --ignore-version proceed even when server version mismatches\n"
" pg_dumpall version\n"));
printf(_(" -i, --ignore-version ignore server version mismatch\n"));
printf(_(" --help show this help, then exit\n"));
printf(_(" --version output version information, then exit\n"));
printf(_("\nOptions controlling the output content:\n"));
@ -1399,10 +1398,11 @@ connectDatabase(const char *dbname, const char *pghost, const char *pgport,
fprintf(stderr, _("server version: %s; %s version: %s\n"),
remoteversion_str, progname, PG_VERSION);
if (ignoreVersion)
fprintf(stderr, _("proceeding despite version mismatch\n"));
fprintf(stderr, _("ignoring server version mismatch\n"));
else
{
fprintf(stderr, _("aborting because of version mismatch (Use the -i option to proceed anyway.)\n"));
fprintf(stderr, _("aborting because of server version mismatch\n"
"Use the -i option to bypass server version check, but be prepared for failure.\n"));
exit(1);
}
}

4
src/bin/pg_dump/pg_restore.c
Unescape View File

@ -34,7 +34,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/bin/pg_dump/pg_restore.c,v 1.86 2008/03/20 17:36:58 tgl Exp $
* $PostgreSQL: pgsql/src/bin/pg_dump/pg_restore.c,v 1.87 2008/03/26 14:32:22 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -378,7 +378,7 @@ usage(const char *progname)
printf(_(" -d, --dbname=NAME connect to database name\n"));
printf(_(" -f, --file=FILENAME output file name\n"));
printf(_(" -F, --format=c|t specify backup file format\n"));
printf(_(" -i, --ignore-version proceed even when server version mismatches\n"));
printf(_(" -i, --ignore-version ignore server version mismatch\n"));
printf(_(" -l, --list print summarized TOC of the archive\n"));
printf(_(" -v, --verbose verbose mode\n"));
printf(_(" --help show this help, then exit\n"));

Write Preview
Loading…
Cancel
Save