1
0
mirror of https://github.com/postgres/postgres.git synced 2025-09-02 04:21:28 +03:00

Ensure that pg_restore -l will output DATABASE entries whether or not -C

is specified.  Per bug report from Russell Smith and ensuing discussion.
Since this is a corner case behavioral change, I'm going to be conservative
and not back-patch it.

In passing, also rename the RestoreOptions field for the -C switch to
something less generic than "create".
This commit is contained in:
Tom Lane
2010-05-15 21:41:16 +00:00
parent ea9968c331
commit bd823e11fa
4 changed files with 17 additions and 14 deletions

View File

@@ -25,7 +25,7 @@
* http://archives.postgresql.org/pgsql-bugs/2010-02/msg00187.php
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.579 2010/03/18 20:00:51 petere Exp $
* $PostgreSQL: pgsql/src/bin/pg_dump/pg_dump.c,v 1.580 2010/05/15 21:41:16 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -243,7 +243,7 @@ main(int argc, char **argv)
int compressLevel = -1;
int plainText = 0;
int outputClean = 0;
int outputCreate = 0;
int outputCreateDB = 0;
bool outputBlobs = false;
int outputNoOwner = 0;
char *outputSuperuser = NULL;
@@ -352,7 +352,7 @@ main(int argc, char **argv)
break;
case 'C': /* Create DB */
outputCreate = 1;
outputCreateDB = 1;
break;
case 'E': /* Dump encoding */
@@ -766,7 +766,7 @@ main(int argc, char **argv)
ropt->dropSchema = outputClean;
ropt->aclsSkip = aclsSkip;
ropt->superuser = outputSuperuser;
ropt->create = outputCreate;
ropt->createDB = outputCreateDB;
ropt->noOwner = outputNoOwner;
ropt->noTablespace = outputNoTablespaces;
ropt->disable_triggers = disable_triggers;