diff options
| author | Michael Paquier <michael@paquier.xyz> | 2018-10-30 11:38:35 +0900 |
|---|---|---|
| committer | Michael Paquier <michael@paquier.xyz> | 2018-10-30 11:38:35 +0900 |
| commit | c34bca9ea55e1d7c207ebc30691a8d2b421100eb (patch) | |
| tree | f698d2a307c0b158aa1ac019cc6cb4fb5ebbc10a | |
| parent | d5eec4eefde70414c9929b32c411cb4f0900a2a9 (diff) | |
| download | postgresql-c34bca9ea55e1d7c207ebc30691a8d2b421100eb.tar.gz postgresql-c34bca9ea55e1d7c207ebc30691a8d2b421100eb.zip | |
Consolidate cross-option checks in pg_restore
This moves one check for conflicting options from the archive restore
code to the main function where other similar checks are performed.
Also reword the error message to be consistent with other messages.
The only option combination impacted is --create specified with
--single-transaction, and informing the caller at an early step saves
from opening the archive worked on. A TAP test is added for this
combination.
Author: Daniel Gustafsson
Reviewed-by: Fabien Coelho
Discussion: https://postgr.es/m/616808BD-4B59-4E6C-97A9-7317F62D5570@yesql.se
| -rw-r--r-- | src/bin/pg_dump/pg_backup_archiver.c | 9 | ||||
| -rw-r--r-- | src/bin/pg_dump/pg_restore.c | 11 | ||||
| -rw-r--r-- | src/bin/pg_dump/t/001_basic.pl | 8 |
3 files changed, 18 insertions, 10 deletions
diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c index e976def42aa..defa8a41b77 100644 --- a/src/bin/pg_dump/pg_backup_archiver.c +++ b/src/bin/pg_dump/pg_backup_archiver.c @@ -359,15 +359,6 @@ RestoreArchive(Archive *AHX) AH->stage = STAGE_INITIALIZING; /* - * Check for nonsensical option combinations. - * - * -C is not compatible with -1, because we can't create a database inside - * a transaction block. - */ - if (ropt->createDB && ropt->single_txn) - exit_horribly(modulename, "-C and -1 are incompatible options\n"); - - /* * If we're going to do parallel restore, there are some restrictions. */ parallel_mode = (AH->public.numWorkers > 1 && ropt->useDB); diff --git a/src/bin/pg_dump/pg_restore.c b/src/bin/pg_dump/pg_restore.c index 34d93ab472b..44012ff44d1 100644 --- a/src/bin/pg_dump/pg_restore.c +++ b/src/bin/pg_dump/pg_restore.c @@ -331,6 +331,17 @@ main(int argc, char **argv) exit_nicely(1); } + /* + * -C is not compatible with -1, because we can't create a database inside + * a transaction block. + */ + if (opts->createDB && opts->single_txn) + { + fprintf(stderr, _("%s: options -C/--create and -1/--single-transaction cannot be used together\n"), + progname); + exit_nicely(1); + } + if (numWorkers <= 0) { fprintf(stderr, _("%s: invalid number of parallel jobs\n"), progname); diff --git a/src/bin/pg_dump/t/001_basic.pl b/src/bin/pg_dump/t/001_basic.pl index 17edf444b25..de00dbca392 100644 --- a/src/bin/pg_dump/t/001_basic.pl +++ b/src/bin/pg_dump/t/001_basic.pl @@ -4,7 +4,7 @@ use warnings; use Config; use PostgresNode; use TestLib; -use Test::More tests => 70; +use Test::More tests => 72; my $tempdir = TestLib::tempdir; my $tempdir_short = TestLib::tempdir_short; @@ -150,3 +150,9 @@ command_fails_like( [ 'pg_dumpall', '--if-exists' ], qr/\Qpg_dumpall: option --if-exists requires option -c\/--clean\E/, 'pg_dumpall: option --if-exists requires option -c/--clean'); + +command_fails_like( + [ 'pg_restore', '-C', '-1' ], + qr/\Qpg_restore: options -C\/--create and -1\/--single-transaction cannot be used together\E/, + 'pg_restore: options -C\/--create and -1\/--single-transaction cannot be used together' +); |