diff options
| author | Bruce Momjian | 2011-08-26 04:12:32 +0000 |
|---|---|---|
| committer | Bruce Momjian | 2011-08-26 04:12:32 +0000 |
| commit | eb013ede590dc62ca5b52144ff41e7fd6e4c2251 (patch) | |
| tree | 29792d77fbc46a9eadf2c0559c6733bef94cc37a | |
| parent | 7327cb6420106d60d3a1a817648b145d602fbc52 (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.
| -rw-r--r-- | contrib/pg_upgrade/info.c | 7 | ||||
| -rw-r--r-- | contrib/pg_upgrade/version_old_8_3.c | 28 |
2 files changed, 20 insertions, 15 deletions
diff --git a/contrib/pg_upgrade/info.c b/contrib/pg_upgrade/info.c index 3ef342911e..10188ca0f5 100644 --- a/contrib/pg_upgrade/info.c +++ b/contrib/pg_upgrade/info.c @@ -266,9 +266,10 @@ get_rel_infos(ClusterInfo *cluster, DbInfo *dbinfo) " LEFT OUTER JOIN pg_catalog.pg_tablespace t " " ON c.reltablespace = t.oid " "WHERE relkind IN ('r','t', 'i'%s) AND " - /* exclude pg_catalog and pg_temp_ (could be orphaned tables) */ - " ((n.nspname !~ '^pg_' AND " - " n.nspname NOT IN ('information_schema', 'binary_upgrade') AND " + /* exclude possible orphaned temp tables */ + " ((n.nspname !~ '^pg_temp_' AND " + " n.nspname !~ '^pg_toast_temp_' AND " + " n.nspname NOT IN ('pg_catalog', 'information_schema', 'binary_upgrade') AND " " c.oid >= %u) " " OR (n.nspname = 'pg_catalog' AND " " relname IN ('pg_largeobject', 'pg_largeobject_loid_pn_index'%s) )) " diff --git a/contrib/pg_upgrade/version_old_8_3.c b/contrib/pg_upgrade/version_old_8_3.c index 1c736d256f..d63050c5b5 100644 --- a/contrib/pg_upgrade/version_old_8_3.c +++ b/contrib/pg_upgrade/version_old_8_3.c @@ -59,9 +59,10 @@ old_8_3_check_for_name_data_type_usage(ClusterInfo *cluster) " NOT a.attisdropped AND " " a.atttypid = 'pg_catalog.name'::pg_catalog.regtype AND " " c.relnamespace = n.oid AND " - /* exclude pg_catalog and pg_temp_ (could be orphaned tables) */ - " n.nspname !~ '^pg_' AND " - " n.nspname != 'information_schema'"); + /* exclude possible orphaned temp tables */ + " n.nspname !~ '^pg_temp_' AND " + " n.nspname !~ '^pg_toast_temp_' AND " + " n.nspname NOT IN ('pg_catalog', 'information_schema')"); ntups = PQntuples(res); i_nspname = PQfnumber(res, "nspname"); @@ -149,9 +150,10 @@ old_8_3_check_for_tsquery_usage(ClusterInfo *cluster) " NOT a.attisdropped AND " " a.atttypid = 'pg_catalog.tsquery'::pg_catalog.regtype AND " " c.relnamespace = n.oid AND " - /* exclude pg_catalog and pg_temp_ (could be orphaned tables) */ - " n.nspname !~ '^pg_' AND " - " n.nspname != 'information_schema'"); + /* exclude possible orphaned temp tables */ + " n.nspname !~ '^pg_temp_' AND " + " n.nspname !~ '^pg_toast_temp_' AND " + " n.nspname NOT IN ('pg_catalog', 'information_schema')"); ntups = PQntuples(res); i_nspname = PQfnumber(res, "nspname"); @@ -247,9 +249,10 @@ old_8_3_rebuild_tsvector_tables(ClusterInfo *cluster, bool check_mode) " NOT a.attisdropped AND " " a.atttypid = 'pg_catalog.tsvector'::pg_catalog.regtype AND " " c.relnamespace = n.oid AND " - /* exclude pg_catalog and pg_temp_ (could be orphaned tables) */ - " n.nspname !~ '^pg_' AND " - " n.nspname != 'information_schema'"); + /* exclude possible orphaned temp tables */ + " n.nspname !~ '^pg_temp_' AND " + " n.nspname !~ '^pg_toast_temp_' AND " + " n.nspname NOT IN ('pg_catalog', 'information_schema')"); /* * This macro is used below to avoid reindexing indexes already rebuilt @@ -619,9 +622,10 @@ old_8_3_create_sequence_script(ClusterInfo *cluster) " pg_catalog.pg_namespace n " "WHERE c.relkind = 'S' AND " " c.relnamespace = n.oid AND " - /* exclude pg_catalog and pg_temp_ (could be orphaned tables) */ - " n.nspname !~ '^pg_' AND " - " n.nspname != 'information_schema'"); + /* exclude possible orphaned temp tables */ + " n.nspname !~ '^pg_temp_' AND " + " n.nspname !~ '^pg_toast_temp_' AND " + " n.nspname NOT IN ('pg_catalog', 'information_schema')"); ntups = PQntuples(res); i_nspname = PQfnumber(res, "nspname"); |