summaryrefslogtreecommitdiff
path: root/contrib/pg_upgrade/info.c
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2011-08-15 22:39:38 -0400
committerBruce Momjian <bruce@momjian.us>2011-08-15 22:39:38 -0400
commitf239ec57277b3fffe1c5bd2694a9d0d726d3a259 (patch)
treed3b38ef4309c520d66d18f8db834d4318ff35546 /contrib/pg_upgrade/info.c
parent5707f355593c91a6c866835a7c55eabaede23628 (diff)
In pg_upgrade, avoid dumping orphaned temporary tables. This makes the
pg_upgrade schema matching pattern match pg_dump/pg_dumpall. Fix for 9.0, 9.1, and 9.2.
Diffstat (limited to 'contrib/pg_upgrade/info.c')
-rw-r--r--contrib/pg_upgrade/info.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/contrib/pg_upgrade/info.c b/contrib/pg_upgrade/info.c
index 567c64e8b82..ca357e78924 100644
--- a/contrib/pg_upgrade/info.c
+++ b/contrib/pg_upgrade/info.c
@@ -326,7 +326,10 @@ get_rel_infos(migratorContext *ctx, const DbInfo *dbinfo,
" ON c.relnamespace = n.oid "
" LEFT OUTER JOIN pg_catalog.pg_tablespace t "
" ON c.reltablespace = t.oid "
- "WHERE (( n.nspname NOT IN ('pg_catalog', 'information_schema') "
+ "WHERE (( "
+ /* exclude pg_catalog and pg_temp_ (could be orphaned tables) */
+ " n.nspname !~ '^pg_' "
+ " AND n.nspname != 'information_schema' "
" AND c.oid >= %u "
" ) OR ( "
" n.nspname = 'pg_catalog' "