diff options
| author | Fujii Masao <fujii@postgresql.org> | 2015-06-04 19:54:43 +0900 |
|---|---|---|
| committer | Fujii Masao <fujii@postgresql.org> | 2015-06-04 19:54:43 +0900 |
| commit | 232cd63b1f26e2ee3b3e03da8fc7348f4b067946 (patch) | |
| tree | ed7ba992618a5fcd46e83a15a3f327da4f42aac7 /src | |
| parent | 38d500ac2e5d4d4f3468b505962fb85850c1ff4b (diff) | |
| download | postgresql-232cd63b1f26e2ee3b3e03da8fc7348f4b067946.tar.gz postgresql-232cd63b1f26e2ee3b3e03da8fc7348f4b067946.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/pg_dump/pg_dump.c | 7 | ||||
| -rw-r--r-- | src/bin/pg_dump/pg_dumpall.c | 7 | ||||
| -rw-r--r-- | src/bin/pg_dump/pg_restore.c | 6 |
3 files changed, 3 insertions, 17 deletions
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c index 687cbaaf7c2..a72dfe93da9 100644 --- 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 c6b9326cb15..d98c83e099c 100644 --- 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 9c6e533befa..ec82d0b98d5 100644 --- 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); |