From: Magnus Hagander <magnus@hagander.net>
Date: Tue, 13 Jan 2009 11:44:56 +0000 (+0000)
Subject: Throw an error when using -C and -1 at the same time in pg_restore.
X-Git-Tag: recoveryinfrav9~53
X-Git-Url: http://waps.l3s.uni-hannover.de/gitweb/?a=commitdiff_plain;h=168ede6b26c010ae101e7cbb4bc3c6a10d37d500;p=users%2Fsimon%2Fpostgres.git

Throw an error when using -C and -1 at the same time in pg_restore.

It's not possible to do CREATE DATABASE inside a transaction, so previously
we just got a server error instead.

Backpatch to 8.2, which is where the -1 feature appeared.
---

diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c
index 114df88180..15945fb428 100644
--- a/src/bin/pg_dump/pg_backup_archiver.c
+++ b/src/bin/pg_dump/pg_backup_archiver.c
@@ -146,6 +146,12 @@ RestoreArchive(Archive *AHX, RestoreOptions *ropt)
 	 */
 	if (ropt->create && ropt->dropSchema)
 		die_horribly(AH, modulename, "-C and -c are incompatible options\n");
+	/*
+	 * -1 is not compatible with -C, because we can't create a database
+	 *  inside a transaction block.
+	 */
+	if (ropt->create && ropt->single_txn)
+		die_horribly(AH, modulename, "-C and -1 are incompatible options\n");
 
 	/*
 	 * If we're using a DB connection, then connect it.