]> granicus.if.org Git - postgresql/commitdiff
Throw an error when using -C and -1 at the same time in pg_restore.
authorMagnus Hagander <magnus@hagander.net>
Tue, 13 Jan 2009 11:45:01 +0000 (11:45 +0000)
committerMagnus Hagander <magnus@hagander.net>
Tue, 13 Jan 2009 11:45:01 +0000 (11:45 +0000)
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.

src/bin/pg_dump/pg_backup_archiver.c

index dca87e94cf7cf88ca85dd6da8100b835edcdcfc2..67c72ab2df36f214966b762d5748468a8c9fc899 100644 (file)
@@ -15,7 +15,7 @@
  *
  *
  * IDENTIFICATION
- *             $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.138.2.2 2007/08/06 01:38:24 tgl Exp $
+ *             $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.138.2.3 2009/01/13 11:45:01 mha Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -147,6 +147,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.