Dept of second thoughts: --no-tablespaces had better also prevent

tglsfdc · tglsfdc · commit 27dfc11d676e · 2008-03-20T17:42:51.000Z
pg_dumpall from attaching TABLESPACE options to CREATE DATABASE commands.
diff --git 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));
 

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* Portions Copyright (c) 1994, Regents of the University of California`
`7`	`7`	`*`
`8`	`8`	`*`
`9`		`- * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.101 2008/03/20 17:36:57 tgl Exp $`
	`9`	`+ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_dumpall.c,v 1.102 2008/03/20 17:42:51 tgl Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -1020,7 +1020,7 @@ dumpCreateDB(PGconn *conn)`
`1020`	`1020`	`* would be to use 'SET default_tablespace' like we do in pg_dump`
`1021`	`1021`	`* for setting non-default database locations.`
`1022`	`1022`	`*/`
`1023`		`- if (strcmp(dbtablespace, "pg_default") != 0)`
	`1023`	`+ if (strcmp(dbtablespace, "pg_default") != 0 && !no_tablespaces)`
`1024`	`1024`	`appendPQExpBuffer(buf, " TABLESPACE = %s",`
`1025`	`1025`	`fmtId(dbtablespace));`
`1026`	`1026`