diff options
| author | Magnus Hagander <magnus@hagander.net> | 2009-01-13 11:44:56 +0000 |
|---|---|---|
| committer | Magnus Hagander <magnus@hagander.net> | 2009-01-13 11:44:56 +0000 |
| commit | 3a819b0780365f4c1a759a8c52403fa4bf16e5eb (patch) | |
| tree | c3ab2766865725fe264adf54ec5aea51aa7b5b3c | |
| parent | 64580224f90683b3cf7a46ee84a31bf01e54a0dc (diff) | |
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.
| -rw-r--r-- | src/bin/pg_dump/pg_backup_archiver.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c index 9153604edc6..9d877cb2d32 100644 --- a/src/bin/pg_dump/pg_backup_archiver.c +++ b/src/bin/pg_dump/pg_backup_archiver.c @@ -15,7 +15,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.160 2009/01/05 16:54:36 tgl Exp $ + * $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.161 2009/01/13 11:44:56 mha Exp $ * *------------------------------------------------------------------------- */ @@ -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. |