|
15 | 15 | * |
16 | 16 | * |
17 | 17 | * IDENTIFICATION |
18 | | - *$PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.160 2009/01/05 16:54:36 tgl Exp $ |
| 18 | + *$PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.161 2009/01/13 11:44:56 mha Exp $ |
19 | 19 | * |
20 | 20 | *------------------------------------------------------------------------- |
21 | 21 | */ |
@@ -146,6 +146,12 @@ RestoreArchive(Archive *AHX, RestoreOptions *ropt) |
146 | 146 | */ |
147 | 147 | if (ropt->create&&ropt->dropSchema) |
148 | 148 | die_horribly(AH,modulename,"-C and -c are incompatible options\n"); |
| 149 | +/* |
| 150 | + * -1 is not compatible with -C, because we can't create a database |
| 151 | + * inside a transaction block. |
| 152 | + */ |
| 153 | +if (ropt->create&&ropt->single_txn) |
| 154 | +die_horribly(AH,modulename,"-C and -1 are incompatible options\n"); |
149 | 155 |
|
150 | 156 | /* |
151 | 157 | * If we're using a DB connection, then connect it. |
|