Commit 232cd63b authored by Fujii Masao's avatar Fujii Masao

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

The commit c22ed3d5 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.
parent 38d500ac
...@@ -279,16 +279,6 @@ PostgreSQL documentation ...@@ -279,16 +279,6 @@ PostgreSQL documentation
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry>
<term><option>-i</></term>
<term><option>--ignore-version</></term>
<listitem>
<para>
A deprecated option that is now ignored.
</para>
</listitem>
</varlistentry>
<varlistentry> <varlistentry>
<term><option>-j <replaceable class="parameter">njobs</replaceable></></term> <term><option>-j <replaceable class="parameter">njobs</replaceable></></term>
<term><option>--jobs=<replaceable class="parameter">njobs</replaceable></></term> <term><option>--jobs=<replaceable class="parameter">njobs</replaceable></></term>
......
...@@ -120,16 +120,6 @@ PostgreSQL documentation ...@@ -120,16 +120,6 @@ PostgreSQL documentation
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry>
<term><option>-i</></term>
<term><option>--ignore-version</></term>
<listitem>
<para>
A deprecated option that is now ignored.
</para>
</listitem>
</varlistentry>
<varlistentry> <varlistentry>
<term><option>-o</></term> <term><option>-o</></term>
<term><option>--oids</></term> <term><option>--oids</></term>
......
...@@ -216,16 +216,6 @@ ...@@ -216,16 +216,6 @@
</listitem> </listitem>
</varlistentry> </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> <varlistentry>
<term><option>-I <replaceable class="parameter">index</replaceable></option></term> <term><option>-I <replaceable class="parameter">index</replaceable></option></term>
<term><option>--index=<replaceable class="parameter">index</replaceable></option></term> <term><option>--index=<replaceable class="parameter">index</replaceable></option></term>
......
...@@ -291,7 +291,6 @@ main(int argc, char **argv) ...@@ -291,7 +291,6 @@ main(int argc, char **argv)
{"file", required_argument, NULL, 'f'}, {"file", required_argument, NULL, 'f'},
{"format", required_argument, NULL, 'F'}, {"format", required_argument, NULL, 'F'},
{"host", required_argument, NULL, 'h'}, {"host", required_argument, NULL, 'h'},
{"ignore-version", no_argument, NULL, 'i'},
{"jobs", 1, NULL, 'j'}, {"jobs", 1, NULL, 'j'},
{"no-reconnect", no_argument, NULL, 'R'}, {"no-reconnect", no_argument, NULL, 'R'},
{"oids", no_argument, NULL, 'o'}, {"oids", no_argument, NULL, 'o'},
...@@ -377,7 +376,7 @@ main(int argc, char **argv) ...@@ -377,7 +376,7 @@ main(int argc, char **argv)
InitDumpOptions(&dopt); 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) long_options, &optindex)) != -1)
{ {
switch (c) switch (c)
...@@ -418,10 +417,6 @@ main(int argc, char **argv) ...@@ -418,10 +417,6 @@ main(int argc, char **argv)
dopt.pghost = pg_strdup(optarg); dopt.pghost = pg_strdup(optarg);
break; break;
case 'i':
/* ignored, deprecated option */
break;
case 'j': /* number of dump jobs */ case 'j': /* number of dump jobs */
numWorkers = atoi(optarg); numWorkers = atoi(optarg);
break; break;
......
...@@ -95,7 +95,6 @@ main(int argc, char *argv[]) ...@@ -95,7 +95,6 @@ main(int argc, char *argv[])
{"file", required_argument, NULL, 'f'}, {"file", required_argument, NULL, 'f'},
{"globals-only", no_argument, NULL, 'g'}, {"globals-only", no_argument, NULL, 'g'},
{"host", required_argument, NULL, 'h'}, {"host", required_argument, NULL, 'h'},
{"ignore-version", no_argument, NULL, 'i'},
{"dbname", required_argument, NULL, 'd'}, {"dbname", required_argument, NULL, 'd'},
{"database", required_argument, NULL, 'l'}, {"database", required_argument, NULL, 'l'},
{"oids", no_argument, NULL, 'o'}, {"oids", no_argument, NULL, 'o'},
...@@ -195,7 +194,7 @@ main(int argc, char *argv[]) ...@@ -195,7 +194,7 @@ main(int argc, char *argv[])
pgdumpopts = createPQExpBuffer(); 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) switch (c)
{ {
...@@ -226,10 +225,6 @@ main(int argc, char *argv[]) ...@@ -226,10 +225,6 @@ main(int argc, char *argv[])
pghost = pg_strdup(optarg); pghost = pg_strdup(optarg);
break; break;
case 'i':
/* ignored, deprecated option */
break;
case 'l': case 'l':
pgdb = pg_strdup(optarg); pgdb = pg_strdup(optarg);
break; break;
......
...@@ -88,7 +88,6 @@ main(int argc, char **argv) ...@@ -88,7 +88,6 @@ main(int argc, char **argv)
{"format", 1, NULL, 'F'}, {"format", 1, NULL, 'F'},
{"function", 1, NULL, 'P'}, {"function", 1, NULL, 'P'},
{"host", 1, NULL, 'h'}, {"host", 1, NULL, 'h'},
{"ignore-version", 0, NULL, 'i'},
{"index", 1, NULL, 'I'}, {"index", 1, NULL, 'I'},
{"jobs", 1, NULL, 'j'}, {"jobs", 1, NULL, 'j'},
{"list", 0, NULL, 'l'}, {"list", 0, NULL, 'l'},
...@@ -147,7 +146,7 @@ main(int argc, char **argv) ...@@ -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) cmdopts, NULL)) != -1)
{ {
switch (c) switch (c)
...@@ -178,9 +177,6 @@ main(int argc, char **argv) ...@@ -178,9 +177,6 @@ main(int argc, char **argv)
if (strlen(optarg) != 0) if (strlen(optarg) != 0)
opts->pghost = pg_strdup(optarg); opts->pghost = pg_strdup(optarg);
break; break;
case 'i':
/* ignored, deprecated option */
break;
case 'j': /* number of restore jobs */ case 'j': /* number of restore jobs */
numWorkers = atoi(optarg); numWorkers = atoi(optarg);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment