summaryrefslogtreecommitdiff
path: root/contrib/pg_upgrade/info.c
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2011-08-26 00:12:39 -0400
committerBruce Momjian <bruce@momjian.us>2011-08-26 00:12:39 -0400
commitdf957a79cc2600e9e172500939c82bcf100b4dfd (patch)
tree091ef65f31ccc1f48dae680c48201b509ce131ae /contrib/pg_upgrade/info.c
parent9354f5b76acf37c96ed0173ff8ab3e415bae2b04 (diff)
In pg_upgrade, limit schema name filter to include toast tables. Bug
introduced recently when trying to filter out temp tables. Backpatch to 9.0 and 9.1.
Diffstat (limited to 'contrib/pg_upgrade/info.c')
-rw-r--r--contrib/pg_upgrade/info.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/contrib/pg_upgrade/info.c b/contrib/pg_upgrade/info.c
index ca357e78924..1f5b7ae70bf 100644
--- a/contrib/pg_upgrade/info.c
+++ b/contrib/pg_upgrade/info.c
@@ -328,9 +328,11 @@ get_rel_infos(migratorContext *ctx, const DbInfo *dbinfo,
" ON c.reltablespace = t.oid "
"WHERE (( "
/* exclude pg_catalog and pg_temp_ (could be orphaned tables) */
- " n.nspname !~ '^pg_' "
- " AND n.nspname != 'information_schema' "
- " AND c.oid >= %u "
+ " n.nspname != 'pg_catalog' "
+ " AND n.nspname !~ '^pg_temp_' "
+ " AND n.nspname !~ '^pg_toast_temp_' "
+ " AND n.nspname != 'information_schema' "
+ " AND c.oid >= %u "
" ) OR ( "
" n.nspname = 'pg_catalog' "
" AND relname IN "