Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 232cd63

Browse files
committed
Remove -i/--ignore-version option from pg_dump, pg_dumpall and pg_restore.
The commit c22ed3d 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.
1 parent 38d500a commit 232cd63

File tree

6 files changed

+3
-47
lines changed

6 files changed

+3
-47
lines changed

doc/src/sgml/ref/pg_dump.sgml

-10
Original file line numberDiff line numberDiff line change
@@ -279,16 +279,6 @@ PostgreSQL documentation
279279
</listitem>
280280
</varlistentry>
281281

282-
<varlistentry>
283-
<term><option>-i</></term>
284-
<term><option>--ignore-version</></term>
285-
<listitem>
286-
<para>
287-
A deprecated option that is now ignored.
288-
</para>
289-
</listitem>
290-
</varlistentry>
291-
292282
<varlistentry>
293283
<term><option>-j <replaceable class="parameter">njobs</replaceable></></term>
294284
<term><option>--jobs=<replaceable class="parameter">njobs</replaceable></></term>

doc/src/sgml/ref/pg_dumpall.sgml

-10
Original file line numberDiff line numberDiff line change
@@ -120,16 +120,6 @@ PostgreSQL documentation
120120
</listitem>
121121
</varlistentry>
122122

123-
<varlistentry>
124-
<term><option>-i</></term>
125-
<term><option>--ignore-version</></term>
126-
<listitem>
127-
<para>
128-
A deprecated option that is now ignored.
129-
</para>
130-
</listitem>
131-
</varlistentry>
132-
133123
<varlistentry>
134124
<term><option>-o</></term>
135125
<term><option>--oids</></term>

doc/src/sgml/ref/pg_restore.sgml

-10
Original file line numberDiff line numberDiff line change
@@ -216,16 +216,6 @@
216216
</listitem>
217217
</varlistentry>
218218

219-
<varlistentry>
220-
<term><option>-i</option></term>
221-
<term><option>--ignore-version</option></term>
222-
<listitem>
223-
<para>
224-
A deprecated option that is now ignored.
225-
</para>
226-
</listitem>
227-
</varlistentry>
228-
229219
<varlistentry>
230220
<term><option>-I <replaceable class="parameter">index</replaceable></option></term>
231221
<term><option>--index=<replaceable class="parameter">index</replaceable></option></term>

src/bin/pg_dump/pg_dump.c

+1-6
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,6 @@ main(int argc, char **argv)
291291
{"file", required_argument, NULL, 'f'},
292292
{"format", required_argument, NULL, 'F'},
293293
{"host", required_argument, NULL, 'h'},
294-
{"ignore-version", no_argument, NULL, 'i'},
295294
{"jobs", 1, NULL, 'j'},
296295
{"no-reconnect", no_argument, NULL, 'R'},
297296
{"oids", no_argument, NULL, 'o'},
@@ -377,7 +376,7 @@ main(int argc, char **argv)
377376

378377
InitDumpOptions(&dopt);
379378

380-
while ((c = getopt_long(argc, argv, "abcCd:E:f:F:h:ij:n:N:oOp:RsS:t:T:U:vwWxZ:",
379+
while ((c = getopt_long(argc, argv, "abcCd:E:f:F:h:j:n:N:oOp:RsS:t:T:U:vwWxZ:",
381380
long_options, &optindex)) != -1)
382381
{
383382
switch (c)
@@ -418,10 +417,6 @@ main(int argc, char **argv)
418417
dopt.pghost = pg_strdup(optarg);
419418
break;
420419

421-
case 'i':
422-
/* ignored, deprecated option */
423-
break;
424-
425420
case 'j': /* number of dump jobs */
426421
numWorkers = atoi(optarg);
427422
break;

src/bin/pg_dump/pg_dumpall.c

+1-6
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ main(int argc, char *argv[])
9595
{"file", required_argument, NULL, 'f'},
9696
{"globals-only", no_argument, NULL, 'g'},
9797
{"host", required_argument, NULL, 'h'},
98-
{"ignore-version", no_argument, NULL, 'i'},
9998
{"dbname", required_argument, NULL, 'd'},
10099
{"database", required_argument, NULL, 'l'},
101100
{"oids", no_argument, NULL, 'o'},
@@ -195,7 +194,7 @@ main(int argc, char *argv[])
195194

196195
pgdumpopts = createPQExpBuffer();
197196

198-
while ((c = getopt_long(argc, argv, "acd:f:gh:il:oOp:rsS:tU:vwWx", long_options, &optindex)) != -1)
197+
while ((c = getopt_long(argc, argv, "acd:f:gh:l:oOp:rsS:tU:vwWx", long_options, &optindex)) != -1)
199198
{
200199
switch (c)
201200
{
@@ -226,10 +225,6 @@ main(int argc, char *argv[])
226225
pghost = pg_strdup(optarg);
227226
break;
228227

229-
case 'i':
230-
/* ignored, deprecated option */
231-
break;
232-
233228
case 'l':
234229
pgdb = pg_strdup(optarg);
235230
break;

src/bin/pg_dump/pg_restore.c

+1-5
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ main(int argc, char **argv)
8888
{"format", 1, NULL, 'F'},
8989
{"function", 1, NULL, 'P'},
9090
{"host", 1, NULL, 'h'},
91-
{"ignore-version", 0, NULL, 'i'},
9291
{"index", 1, NULL, 'I'},
9392
{"jobs", 1, NULL, 'j'},
9493
{"list", 0, NULL, 'l'},
@@ -147,7 +146,7 @@ main(int argc, char **argv)
147146
}
148147
}
149148

150-
while ((c = getopt_long(argc, argv, "acCd:ef:F:h:iI:j:lL:n:Op:P:RsS:t:T:U:vwWx1",
149+
while ((c = getopt_long(argc, argv, "acCd:ef:F:h:I:j:lL:n:Op:P:RsS:t:T:U:vwWx1",
151150
cmdopts, NULL)) != -1)
152151
{
153152
switch (c)
@@ -178,9 +177,6 @@ main(int argc, char **argv)
178177
if (strlen(optarg) != 0)
179178
opts->pghost = pg_strdup(optarg);
180179
break;
181-
case 'i':
182-
/* ignored, deprecated option */
183-
break;
184180

185181
case 'j': /* number of restore jobs */
186182
numWorkers = atoi(optarg);

0 commit comments

Comments
 (0)