From f7c91eaf6915fcb852321496553b719bab26adf5 Mon Sep 17 00:00:00 2001 From: Justin Pryzby Date: Sat, 5 Dec 2020 22:43:12 -0600 Subject: [PATCH 03/21] pg_restore: "must be specified" and --list This was discussed here, but the idea got lost. https://www.postgresql.org/message-id/flat/20190612170201.GA11881%40alvherre.pgsql#2984347ab074e6f198bd294fa41884df --- src/bin/pg_dump/pg_restore.c | 2 +- src/bin/pg_dump/t/001_basic.pl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bin/pg_dump/pg_restore.c b/src/bin/pg_dump/pg_restore.c index 589b4aed53..f6e6e41329 100644 --- a/src/bin/pg_dump/pg_restore.c +++ b/src/bin/pg_dump/pg_restore.c @@ -305,7 +305,7 @@ main(int argc, char **argv) /* Complain if neither -f nor -d was specified (except if dumping TOC) */ if (!opts->cparams.dbname && !opts->filename && !opts->tocSummary) { - pg_log_error("one of -d/--dbname and -f/--file must be specified"); + pg_log_error("one of -d/--dbname, -f/--file, or -l/--list must be specified"); exit_nicely(1); } diff --git a/src/bin/pg_dump/t/001_basic.pl b/src/bin/pg_dump/t/001_basic.pl index 083fb3ad08..8280914c2a 100644 --- a/src/bin/pg_dump/t/001_basic.pl +++ b/src/bin/pg_dump/t/001_basic.pl @@ -63,8 +63,8 @@ command_fails_like( command_fails_like( ['pg_restore'], - qr{\Qpg_restore: error: one of -d/--dbname and -f/--file must be specified\E}, - 'pg_restore: error: one of -d/--dbname and -f/--file must be specified'); + qr{\Qpg_restore: error: one of -d/--dbname, -f/--file, or -l/--list must be specified\E}, + 'pg_restore: error: one of -d/--dbname, -f/--file, or -l/--list must be specified'); command_fails_like( [ 'pg_restore', '-s', '-a', '-f -' ], -- 2.17.0