v2-0002-pg_restore-Refactor-handling-of-conflicting-options.patch

From b091bb909d210c86cc3d44db96617f02c1387071 Mon Sep 17 00:00:00 2001
From: jian he <jian.universality@gmail.com>
Date: Mon, 9 Mar 2026 16:07:34 +0800
Subject: [PATCH v2 2/2] pg_restore: Refactor handling of conflicting options

In the spirit of https://git.postgresql.org/cgit/postgresql.git/commit/?id=b2898baaf7e40a187de5b0134d53d944b38209cd

discussion: https://postgr.es/m/CACJufxHDYn+3-2jR_kwYB0U7UrNP+0EPvAWzBBD5EfUzzr1uiw@mail.gmail.com
---
 src/bin/pg_dump/pg_restore.c   | 144 +++++++++++----------------------
 src/bin/pg_dump/t/001_basic.pl |  10 +--
 2 files changed, 54 insertions(+), 100 deletions(-)

diff --git a/src/bin/pg_dump/pg_restore.c b/src/bin/pg_dump/pg_restore.c
index 752d859e264..98e1d06b36d 100644
--- a/src/bin/pg_dump/pg_restore.c
+++ b/src/bin/pg_dump/pg_restore.c
@@ -385,31 +385,18 @@ main(int argc, char **argv)
 	if (!opts->cparams.dbname && !opts->filename && !opts->tocSummary)
 		pg_fatal("one of -d/--dbname and -f/--file must be specified");
 
-	if (db_exclude_patterns.head != NULL && globals_only)
-	{
-		pg_log_error("option %s cannot be used together with %s",
-					 "--exclude-database", "-g/--globals-only");
-		pg_log_error_hint("Try \"%s --help\" for more information.", progname);
-		exit_nicely(1);
-	}
+	check_mut_excl_opts(db_exclude_patterns.head, "--exclude-database",
+						globals_only, "-g/--globals-only");
 
 	/* Should get at most one of -d and -f, else user is confused */
+	check_mut_excl_opts(opts->cparams.dbname, "-d/--dbname",
+						opts->filename, "-f/--file");
+
+	check_mut_excl_opts(opts->cparams.dbname, "-d/--dbname",
+						opts->restrict_key, "--restrict-key");
+
 	if (opts->cparams.dbname)
-	{
-		if (opts->filename)
-		{
-			pg_log_error("options %s and %s cannot be used together",
-						 "-d/--dbname", "-f/--file");
-			pg_log_error_hint("Try \"%s --help\" for more information.", progname);
-			exit_nicely(1);
-		}
-
-		if (opts->restrict_key)
-			pg_fatal("options %s and %s cannot be used together",
-					 "-d/--dbname", "--restrict-key");
-
 		opts->useDB = 1;
-	}
 	else
 	{
 		/*
@@ -423,85 +410,52 @@ main(int argc, char **argv)
 			pg_fatal("invalid restrict key");
 	}
 
-	/* reject conflicting "-only" options */
-	if (data_only && schema_only)
-		pg_fatal("options %s and %s cannot be used together",
-				 "-s/--schema-only", "-a/--data-only");
-	if (schema_only && statistics_only)
-		pg_fatal("options %s and %s cannot be used together",
-				 "-s/--schema-only", "--statistics-only");
-	if (data_only && statistics_only)
-		pg_fatal("options %s and %s cannot be used together",
-				 "-a/--data-only", "--statistics-only");
-
-	/* reject conflicting "-only" and "no-" options */
-	if (data_only && no_data)
-		pg_fatal("options %s and %s cannot be used together",
-				 "-a/--data-only", "--no-data");
-	if (schema_only && no_schema)
-		pg_fatal("options %s and %s cannot be used together",
-				 "-s/--schema-only", "--no-schema");
-	if (statistics_only && no_statistics)
-		pg_fatal("options %s and %s cannot be used together",
-				 "--statistics-only", "--no-statistics");
-
-	/* reject conflicting "no-" options */
-	if (with_statistics && no_statistics)
-		pg_fatal("options %s and %s cannot be used together",
-				 "--statistics", "--no-statistics");
-
-	/* reject conflicting "only-" options */
-	if (data_only && with_statistics)
-		pg_fatal("options %s and %s cannot be used together",
-				 "-a/--data-only", "--statistics");
-	if (schema_only && with_statistics)
-		pg_fatal("options %s and %s cannot be used together",
-				 "-s/--schema-only", "--statistics");
-
-	if (data_only && opts->dropSchema)
-		pg_fatal("options %s and %s cannot be used together",
-				 "-c/--clean", "-a/--data-only");
-
-	if (opts->single_txn && opts->txn_size > 0)
-		pg_fatal("options %s and %s cannot be used together",
-				 "-1/--single-transaction", "--transaction-size");
-
-	if (opts->single_txn && globals_only)
-		pg_fatal("options %s and %s cannot be used together when restoring an archive created by pg_dumpall",
-				 "--single-transaction", "-g/--globals-only");
-
-	if (opts->txn_size && globals_only)
-		pg_fatal("options %s and %s cannot be used together when restoring an archive created by pg_dumpall",
-				 "--transaction-size", "-g/--globals-only");
-
-	if (opts->exit_on_error && globals_only)
-		pg_fatal("options %s and %s cannot be used together when restoring an archive created by pg_dumpall",
-				 "--exit-on-error", "-g/--globals-only");
-
-	if (data_only && globals_only)
-		pg_fatal("options %s and %s cannot be used together",
-				 "-a/--data-only", "-g/--globals-only");
-	if (schema_only && globals_only)
-		pg_fatal("options %s and %s cannot be used together",
-				 "-s/--schema-only", "-g/--globals-only");
-	if (statistics_only && globals_only)
-		pg_fatal("options %s and %s cannot be used together",
-				 "--statistics-only", "-g/--globals-only");
-	if (with_statistics && globals_only)
-		pg_fatal("options %s and %s cannot be used together",
-				 "--statistics", "-g/--globals-only");
-
-	if (no_globals && globals_only)
-		pg_fatal("options %s and %s cannot be used together",
-				 "--no-globals", "-g/--globals-only");
+	/* *-only options are incompatible with each other */
+	check_mut_excl_opts(data_only, "-a/--data-only",
+						schema_only, "-s/--schema-only",
+						statistics_only, "--statistics-only",
+						globals_only, "-g/--globals-only");
+
+	/* --no-* and *-only for same thing are incompatible */
+	check_mut_excl_opts(data_only, "-a/--data-only",
+						no_data, "--no-data");
+	check_mut_excl_opts(schema_only, "-s/--schema-only",
+						no_schema, "--no-schema");
+	check_mut_excl_opts(statistics_only, "--statistics-only",
+						no_statistics, "--no-statistics");
+	check_mut_excl_opts(globals_only, "-g/--globals-only",
+						no_globals, "--no-globals");
+
+	/* --statistics and --no-statistics are incompatible */
+	check_mut_excl_opts(with_statistics, "--statistics",
+						no_statistics, "--no-statistics");
+
+	/* --statistics is incompatible with *-only (except --statistics-only) */
+	check_mut_excl_opts(with_statistics, "--statistics",
+						data_only, "-a/--data-only",
+						schema_only, "-s/--schema-only",
+						globals_only, "-g/--globals-only");
+
+	check_mut_excl_opts(data_only, "-c/--clean",
+						opts->dropSchema, "-a/--data-only");
+
+	check_mut_excl_opts(opts->single_txn, "-1/--single-transaction",
+						(opts->txn_size > 0), "--transaction-size");
+
+	/* some options are incompatible with -g/--globals-only */
+	check_mut_excl_opts(opts->single_txn, "--single-transaction",
+						globals_only, "-g/--globals-only");
+	check_mut_excl_opts(opts->txn_size, "--transaction-size",
+						globals_only, "-g/--globals-only");
+	check_mut_excl_opts(opts->exit_on_error, "--exit-on-error",
+						globals_only, "-g/--globals-only");
 
 	/*
 	 * -C is not compatible with -1, because we can't create a database inside
 	 * a transaction block.
 	 */
-	if (opts->createDB && opts->single_txn)
-		pg_fatal("options %s and %s cannot be used together",
-				 "-C/--create", "-1/--single-transaction");
+	check_mut_excl_opts(opts->createDB, "-C/--create",
+						opts->single_txn, "-1/--single-transaction");
 
 	/* Can't do single-txn mode with multiple connections */
 	if (opts->single_txn && numWorkers > 1)
diff --git a/src/bin/pg_dump/t/001_basic.pl b/src/bin/pg_dump/t/001_basic.pl
index e5542833d77..b5922f3a131 100644
--- a/src/bin/pg_dump/t/001_basic.pl
+++ b/src/bin/pg_dump/t/001_basic.pl
@@ -87,8 +87,8 @@ command_fails_like(
 
 command_fails_like(
 	[ 'pg_restore', '-s', '-a', '-f -' ],
-	qr/\Qpg_restore: error: options -s\/--schema-only and -a\/--data-only cannot be used together\E/,
-	'pg_restore: options -s/--schema-only and -a/--data-only cannot be used together'
+	qr/\Qpg_restore: error: options -a\/--data-only and -s\/--schema-only cannot be used together\E/,
+	'pg_restore: options -a/--data-only and -s/--schema-only cannot be used together'
 );
 
 command_fails_like(
@@ -300,8 +300,8 @@ command_fails_like(
 
 command_fails_like(
 	[ 'pg_restore', '--exclude-database=foo', '--globals-only', '-d', 'xxx' ],
-	qr/\Qpg_restore: error: option --exclude-database cannot be used together with -g\/--globals-only\E/,
-	'pg_restore: option --exclude-database cannot be used together with -g/--globals-only'
+	qr/\Qpg_restore: error: options --exclude-database and -g\/--globals-only cannot be used together\E/,
+	'pg_restore: options --exclude-database and -g/--globals-only cannot be used together'
 );
 
 command_fails_like(
@@ -339,6 +339,6 @@ command_fails_like(
 		'pg_restore', '--globals-only', '--no-globals', '-d', 'xxx',
 		'dumpdir'
 	],
-	qr/\Qpg_restore: error: options --no-globals and -g\/--globals-only cannot be used together\E/,
+	qr/\Qpg_restore: error: options -g\/--globals-only and --no-globals cannot be used together\E/,
 	'options --no-globals and --globals-only cannot be used together');
 done_testing();
-- 
2.34.1