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

Remove -i/--ignore-version option from pg_dump, pg_dumpall and pg_restore.

Browse Source 
The commit c22ed3d523782c43836c163c16fa5a7bb3912826 turned
the -i/--ignore-version options into no-ops and marked as deprecated.
Considering we shipped that in 8.4, it's time to remove all trace of
those switches, per discussion. We'd still have to wait a couple releases
before it'd be safe to use -i for something else, but it'd be a start.
This commit is contained in:
Fujii Masao 2015-06-04 19:54:43 +09:00
parent 38d500ac2e
commit 232cd63b1f
6 changed files with 3 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doc/src/sgml/ref/pg_dump.sgml
View File

@ -279,16 +279,6 @@ PostgreSQL documentation
</listitem>
</varlistentry>
<varlistentry>
<term><option>-i</></term>
<term><option>--ignore-version</></term>
<listitem>
<para>
A deprecated option that is now ignored.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>-j <replaceable class="parameter">njobs</replaceable></></term>
<term><option>--jobs=<replaceable class="parameter">njobs</replaceable></></term>

10
doc/src/sgml/ref/pg_dumpall.sgml
View File

@ -120,16 +120,6 @@ PostgreSQL documentation
</listitem>
</varlistentry>
<varlistentry>
<term><option>-i</></term>
<term><option>--ignore-version</></term>
<listitem>
<para>
A deprecated option that is now ignored.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>-o</></term>
<term><option>--oids</></term>

10
doc/src/sgml/ref/pg_restore.sgml
View File

@ -216,16 +216,6 @@
</listitem>
</varlistentry>
<varlistentry>
<term><option>-i</option></term>
<term><option>--ignore-version</option></term>
<listitem>
<para>
A deprecated option that is now ignored.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>-I <replaceable class="parameter">index</replaceable></option></term>
<term><option>--index=<replaceable class="parameter">index</replaceable></option></term>

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

@ -291,7 +291,6 @@ main(int argc, char **argv)
{"file", required_argument, NULL, 'f'},
{"format", required_argument, NULL, 'F'},
{"host", required_argument, NULL, 'h'},
{"ignore-version", no_argument, NULL, 'i'},
{"jobs", 1, NULL, 'j'},
{"no-reconnect", no_argument, NULL, 'R'},
{"oids", no_argument, NULL, 'o'},
@ -377,7 +376,7 @@ main(int argc, char **argv)
InitDumpOptions(&dopt);
while ((c = getopt_long(argc, argv, "abcCd:E:f:F:h:ij:n:N:oOp:RsS:t:T:U:vwWxZ:",
while ((c = getopt_long(argc, argv, "abcCd:E:f:F:h:j:n:N:oOp:RsS:t:T:U:vwWxZ:",
long_options, &optindex)) != -1)
{
switch (c)
@ -418,10 +417,6 @@ main(int argc, char **argv)
dopt.pghost = pg_strdup(optarg);
break;
case 'i':
/* ignored, deprecated option */
break;
case 'j': /* number of dump jobs */
numWorkers = atoi(optarg);
break;

7
src/bin/pg_dump/pg_dumpall.c
View File

@ -95,7 +95,6 @@ main(int argc, char *argv[])
{"file", required_argument, NULL, 'f'},
{"globals-only", no_argument, NULL, 'g'},
{"host", required_argument, NULL, 'h'},
{"ignore-version", no_argument, NULL, 'i'},
{"dbname", required_argument, NULL, 'd'},
{"database", required_argument, NULL, 'l'},
{"oids", no_argument, NULL, 'o'},
@ -195,7 +194,7 @@ main(int argc, char *argv[])
pgdumpopts = createPQExpBuffer();
while ((c = getopt_long(argc, argv, "acd:f:gh:il:oOp:rsS:tU:vwWx", long_options, &optindex)) != -1)
while ((c = getopt_long(argc, argv, "acd:f:gh:l:oOp:rsS:tU:vwWx", long_options, &optindex)) != -1)
{
switch (c)
{
@ -226,10 +225,6 @@ main(int argc, char *argv[])
pghost = pg_strdup(optarg);
break;
case 'i':
/* ignored, deprecated option */
break;
case 'l':
pgdb = pg_strdup(optarg);
break;

6
src/bin/pg_dump/pg_restore.c
View File

@ -88,7 +88,6 @@ main(int argc, char **argv)
{"format", 1, NULL, 'F'},
{"function", 1, NULL, 'P'},
{"host", 1, NULL, 'h'},
{"ignore-version", 0, NULL, 'i'},
{"index", 1, NULL, 'I'},
{"jobs", 1, NULL, 'j'},
{"list", 0, NULL, 'l'},
@ -147,7 +146,7 @@ main(int argc, char **argv)
}
}
while ((c = getopt_long(argc, argv, "acCd:ef:F:h:iI:j:lL:n:Op:P:RsS:t:T:U:vwWx1",
while ((c = getopt_long(argc, argv, "acCd:ef:F:h:I:j:lL:n:Op:P:RsS:t:T:U:vwWx1",
cmdopts, NULL)) != -1)
{
switch (c)
@ -178,9 +177,6 @@ main(int argc, char **argv)
if (strlen(optarg) != 0)
opts->pghost = pg_strdup(optarg);
break;
case 'i':
/* ignored, deprecated option */
break;
case 'j': /* number of restore jobs */
numWorkers = atoi(optarg);