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

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
index e33e617fb222414192b38bbc8578be1b76ef70a5..9a187e63744b1b7a2f50e2dce4a49a6c68312f4b 100644 (file)
--- a/src/bin/pg_dump/pg_dumpall.c
+++ b/src/bin/pg_dump/pg_dumpall.c
@@ -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));