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

Remove ancient -X options to pg_dump, pg_dumpall, pg_restore.

Browse Source 
The last version in which these options were documented is now EOL, so
it's time to get rid of them for real.  We now use GNU-style long
options instead.
This commit is contained in:
Robert Haas 2011-03-18 09:44:44 -04:00
parent 777e8c0015
commit c5eb835bbf
3 changed files with 2 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -468,35 +468,12 @@ main(int argc, char **argv)
aclsSkip = true; aclsSkip = true;
break; break;
case 'X':
/*
* -X is a deprecated alternative to long options;
* no new -X options are to be added.
*/
if (strcmp(optarg, "disable-dollar-quoting") == 0)
disable_dollar_quoting = 1;
else if (strcmp(optarg, "disable-triggers") == 0)
disable_triggers = 1;
else if (strcmp(optarg, "no-tablespaces") == 0)
outputNoTablespaces = 1;
else if (strcmp(optarg, "use-set-session-authorization") == 0)
use_setsessauth = 1;
else
{
fprintf(stderr,
_("%s: invalid -X option -- %s\n"),
progname, optarg);
fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);
exit(1);
}
break;
case 'Z': /* Compression Level */ case 'Z': /* Compression Level */
compressLevel = atoi(optarg); compressLevel = atoi(optarg);
break; break;
case 0: case 0:
/* This covers the long options equivalent to -X xxx. */ /* This covers the long options. */
break; break;
case 2: /* lock-wait-timeout */ case 2: /* lock-wait-timeout */

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

@ -280,30 +280,6 @@ main(int argc, char *argv[])
appendPQExpBuffer(pgdumpopts, " -x"); appendPQExpBuffer(pgdumpopts, " -x");
break; break;
case 'X':
/* -X is a deprecated alternative to long options */
if (strcmp(optarg, "disable-dollar-quoting") == 0)
disable_dollar_quoting = 1;
else if (strcmp(optarg, "disable-triggers") == 0)
disable_triggers = 1;
else if (strcmp(optarg, "no-tablespaces") == 0)
no_tablespaces = 1;
else if (strcmp(optarg, "use-set-session-authorization") == 0)
use_setsessauth = 1;
else if (strcmp(optarg, "no-security-label") == 0)
no_security_label = 1;
else if (strcmp(optarg, "no-unlogged-table-data") == 0)
no_unlogged_table_data = 1;
else
{
fprintf(stderr,
_("%s: invalid -X option -- %s\n"),
progname, optarg);
fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);
exit(1);
}
break;
case 0: case 0:
break; break;

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

@ -254,28 +254,6 @@ main(int argc, char **argv)
opts->aclsSkip = 1; opts->aclsSkip = 1;
break; break;
case 'X':
/* -X is a deprecated alternative to long options */
if (strcmp(optarg, "disable-triggers") == 0)
disable_triggers = 1;
else if (strcmp(optarg, "no-data-for-failed-tables") == 0)
no_data_for_failed_tables = 1;
else if (strcmp(optarg, "no-tablespaces") == 0)
outputNoTablespaces = 1;
else if (strcmp(optarg, "use-set-session-authorization") == 0)
use_setsessauth = 1;
else if (strcmp(optarg, "no-security-label") == 0)
skip_seclabel = 1;
else
{
fprintf(stderr,
_("%s: invalid -X option -- %s\n"),
progname, optarg);
fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);
exit(1);
}
break;
case '1': /* Restore data in a single transaction */ case '1': /* Restore data in a single transaction */
opts->single_txn = true; opts->single_txn = true;
opts->exit_on_error = true; opts->exit_on_error = true;
@ -284,8 +262,7 @@ main(int argc, char **argv)
case 0: case 0:
/* /*
* This covers the long options without a short equivalent, * This covers the long options without a short equivalent.
* including those equivalent to -X xxx.
*/ */
break; break;