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 /src/bin/pg_dump/t/001_basic.pl | |
| parent | d5eec4eefde70414c9929b32c411cb4f0900a2a9 (diff) | |
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
Diffstat (limited to 'src/bin/pg_dump/t/001_basic.pl')
| -rw-r--r-- | src/bin/pg_dump/t/001_basic.pl | 8 |
1 files changed, 7 insertions, 1 deletions
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' +); |