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

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.

diff --git a/doc/src/sgml/ref/pg_dump.sgml b/doc/src/sgml/ref/pg_dump.sgml
index a6e7b08e2e2f0b83e292aea1529579b92c7c32be..c78f71d9a7acb8551ceef4ca0ed3bf595cae1a5a 100644 (file)
--- a/doc/src/sgml/ref/pg_dump.sgml
+++ b/doc/src/sgml/ref/pg_dump.sgml
@@ -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>

diff --git a/doc/src/sgml/ref/pg_dumpall.sgml b/doc/src/sgml/ref/pg_dumpall.sgml
index 272af3eb0acd4dad7d1f850a4cb76dbffa4f44d7..6c34c257b3c35ee14357d122038f134c41ab83ad 100644 (file)
--- a/doc/src/sgml/ref/pg_dumpall.sgml
+++ b/doc/src/sgml/ref/pg_dumpall.sgml
@@ -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>

diff --git a/doc/src/sgml/ref/pg_restore.sgml b/doc/src/sgml/ref/pg_restore.sgml
index 9f8dc00480cbe6681d29325c669d65ad8d1fa44b..ebdf58020eed00194a280f0a98583116f75bd44b 100644 (file)
--- a/doc/src/sgml/ref/pg_restore.sgml
+++ b/doc/src/sgml/ref/pg_restore.sgml
@@ -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>

diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index 687cbaaf7c2dcde4ed7c305f1cb1c4bbce3b3143..a72dfe93da939d466fed007105cc3d408d229bf5 100644 (file)
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -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;

diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c
index c6b9326cb156b713f437aef6e8e71e04b11582f2..d98c83e099c6439b17e4a3f736470ea22d40ab98 100644 (file)
--- a/src/bin/pg_dump/pg_dumpall.c
+++ b/src/bin/pg_dump/pg_dumpall.c
@@ -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;

diff --git a/src/bin/pg_dump/pg_restore.c b/src/bin/pg_dump/pg_restore.c
index 9c6e533befaf6faa7f10ea59b7c5eabc42617aea..ec82d0b98d5ca9e2540d36623233ba64439437ef 100644 (file)
--- a/src/bin/pg_dump/pg_restore.c
+++ b/src/bin/pg_dump/pg_restore.c
@@ -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);