summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane2008-03-20 17:42:51 +0000
committerTom Lane2008-03-20 17:42:51 +0000
commit27dfc11d676efdcc2f22be254bea9d92b854b673 (patch)
treedc55c49bb51e17919fbac0ea61380fd44b206752
parent68528d37bbfbb3ae8dc83418f3e1d343c4050f0a (diff)
Dept of second thoughts: --no-tablespaces had better also prevent
pg_dumpall from attaching TABLESPACE options to CREATE DATABASE commands.
-rw-r--r--src/bin/pg_dump/pg_dumpall.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c
index fb93cfa7b10..5d557a2dba8 100644
--- a/src/bin/pg_dump/pg_dumpall.c
+++ b/src/bin/pg_dump/pg_dumpall.c
@@ -6,7 +6,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
*
*
- * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.101 2008/03/20 17:36:57 tgl Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.102 2008/03/20 17:42:51 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -1020,7 +1020,7 @@ dumpCreateDB(PGconn *conn)
* would be to use 'SET default_tablespace' like we do in pg_dump
* for setting non-default database locations.
*/
- if (strcmp(dbtablespace, "pg_default") != 0)
+ if (strcmp(dbtablespace, "pg_default") != 0 && !no_tablespaces)
appendPQExpBuffer(buf, " TABLESPACE = %s",
fmtId(dbtablespace));