From c34bca9ea55e1d7c207ebc30691a8d2b421100eb Mon Sep 17 00:00:00 2001 From: Michael Paquier Date: Tue, 30 Oct 2018 11:38:35 +0900 Subject: [PATCH] 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 --- src/bin/pg_dump/pg_backup_archiver.c | 9 --------- src/bin/pg_dump/pg_restore.c | 11 +++++++++++ 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 e976def42a..defa8a41b7 100644 --- a/src/bin/pg_dump/pg_backup_archiver.c +++ b/src/bin/pg_dump/pg_backup_archiver.c @@ -358,15 +358,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. */ diff --git a/src/bin/pg_dump/pg_restore.c b/src/bin/pg_dump/pg_restore.c index 34d93ab472..44012ff44d 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 17edf444b2..de00dbca39 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' +); -- 2.40.0