NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commitc5eb835

committed

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

The last version in which these options were documented is now EOL, soit's time to get rid of them for real. We now use GNU-style longoptions instead.

1 parent777e8c0 commitc5eb835Copy full SHA for c5eb835

File tree

3 files changed

-72

lines changed

src/bin/pg_dump

3 files changed

-72

lines changed

`‎src/bin/pg_dump/pg_dump.c`

Lines changed: 1 addition & 24 deletions

Original file line number	Diff line number	Diff line change
`@@ -468,35 +468,12 @@ main(int argc, char **argv)`
`468`	`468`	`aclsSkip= true;`
`469`	`469`	`break;`
`470`	`470`
`471`		`-case'X':`
`472`		`-/*`
`473`		`- *-X is a deprecated alternative to long options;`
`474`		`- *no new -X options are to be added.`
`475`		`- */`
`476`		`-if (strcmp(optarg,"disable-dollar-quoting")==0)`
`477`		`-disable_dollar_quoting=1;`
`478`		`-elseif (strcmp(optarg,"disable-triggers")==0)`
`479`		`-disable_triggers=1;`
`480`		`-elseif (strcmp(optarg,"no-tablespaces")==0)`
`481`		`-outputNoTablespaces=1;`
`482`		`-elseif (strcmp(optarg,"use-set-session-authorization")==0)`
`483`		`-use_setsessauth=1;`
`484`		`-else`
`485`		`-{`
`486`		`-fprintf(stderr,`
`487`		`-_("%s: invalid -X option -- %s\n"),`
`488`		`-progname,optarg);`
`489`		`-fprintf(stderr,_("Try \"%s --help\" for more information.\n"),progname);`
`490`		`-exit(1);`
`491`		`-}`
`492`		`-break;`
`493`		`-`
`494`	`471`	`case'Z':/* Compression Level */`
`495`	`472`	`compressLevel=atoi(optarg);`
`496`	`473`	`break;`
`497`	`474`
`498`	`475`	`case0:`
`499`		`-/* This covers the long options equivalent to -X xxx. */`
	`476`	`+/* This covers the long options. */`
`500`	`477`	`break;`
`501`	`478`
`502`	`479`	`case2:/* lock-wait-timeout */`

`‎src/bin/pg_dump/pg_dumpall.c`

Lines changed: 0 additions & 24 deletions

Original file line number	Diff line number	Diff line change
`@@ -280,30 +280,6 @@ main(int argc, char *argv[])`
`280`	`280`	`appendPQExpBuffer(pgdumpopts," -x");`
`281`	`281`	`break;`
`282`	`282`
`283`		`-case'X':`
`284`		`-/* -X is a deprecated alternative to long options */`
`285`		`-if (strcmp(optarg,"disable-dollar-quoting")==0)`
`286`		`-disable_dollar_quoting=1;`
`287`		`-elseif (strcmp(optarg,"disable-triggers")==0)`
`288`		`-disable_triggers=1;`
`289`		`-elseif (strcmp(optarg,"no-tablespaces")==0)`
`290`		`-no_tablespaces=1;`
`291`		`-elseif (strcmp(optarg,"use-set-session-authorization")==0)`
`292`		`-use_setsessauth=1;`
`293`		`-elseif (strcmp(optarg,"no-security-label")==0)`
`294`		`-no_security_label=1;`
`295`		`-elseif (strcmp(optarg,"no-unlogged-table-data")==0)`
`296`		`-no_unlogged_table_data=1;`
`297`		`-else`
`298`		`-{`
`299`		`-fprintf(stderr,`
`300`		`-_("%s: invalid -X option -- %s\n"),`
`301`		`-progname,optarg);`
`302`		`-fprintf(stderr,_("Try \"%s --help\" for more information.\n"),progname);`
`303`		`-exit(1);`
`304`		`-}`
`305`		`-break;`
`306`		`-`
`307`	`283`	`case0:`
`308`	`284`	`break;`
`309`	`285`

`‎src/bin/pg_dump/pg_restore.c`

Lines changed: 1 addition & 24 deletions

Original file line number	Diff line number	Diff line change
`@@ -254,28 +254,6 @@ main(int argc, char **argv)`
`254`	`254`	`opts->aclsSkip=1;`
`255`	`255`	`break;`
`256`	`256`
`257`		`-case'X':`
`258`		`-/* -X is a deprecated alternative to long options */`
`259`		`-if (strcmp(optarg,"disable-triggers")==0)`
`260`		`-disable_triggers=1;`
`261`		`-elseif (strcmp(optarg,"no-data-for-failed-tables")==0)`
`262`		`-no_data_for_failed_tables=1;`
`263`		`-elseif (strcmp(optarg,"no-tablespaces")==0)`
`264`		`-outputNoTablespaces=1;`
`265`		`-elseif (strcmp(optarg,"use-set-session-authorization")==0)`
`266`		`-use_setsessauth=1;`
`267`		`-elseif (strcmp(optarg,"no-security-label")==0)`
`268`		`-skip_seclabel=1;`
`269`		`-else`
`270`		`-{`
`271`		`-fprintf(stderr,`
`272`		`-_("%s: invalid -X option -- %s\n"),`
`273`		`-progname,optarg);`
`274`		`-fprintf(stderr,_("Try \"%s --help\" for more information.\n"),progname);`
`275`		`-exit(1);`
`276`		`-}`
`277`		`-break;`
`278`		`-`
`279`	`257`	`case'1':/* Restore data in a single transaction */`
`280`	`258`	`opts->single_txn= true;`
`281`	`259`	`opts->exit_on_error= true;`
`@@ -284,8 +262,7 @@ main(int argc, char **argv)`
`284`	`262`	`case0:`
`285`	`263`
`286`	`264`	`/*`
`287`		`- * This covers the long options without a short equivalent,`
`288`		`- * including those equivalent to -X xxx.`
	`265`	`+ * This covers the long options without a short equivalent.`
`289`	`266`	`*/`
`290`	`267`	`break;`
`291`	`268`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitc5eb835

File tree

3 files changed

3 files changed

`‎src/bin/pg_dump/pg_dump.c`

`‎src/bin/pg_dump/pg_dumpall.c`

`‎src/bin/pg_dump/pg_restore.c`

0 commit comments