mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-12-27 08:39:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Magnus Hagander 2009-01-13 11:45:01 +00:00
parent c165c25a66
commit 63ca96af30
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/bin/pg_dump/pg_backup_archiver.c
View File

@ -15,7 +15,7 @@
* *
* *
* IDENTIFICATION * 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) if (ropt->create && ropt->dropSchema)
die_horribly(AH, modulename, "-C and -c are incompatible options\n"); 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. * If we're using a DB connection, then connect it.