open-dsi
/
postgres
mirror of https://github.com/postgres/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

In pg_upgrade, limit schema name filter to include toast tables. Bug

Browse Source 
introduced recently when trying to filter out temp tables.

Backpatch to 9.0 and 9.1.
pull/1/head
Bruce Momjian 14 years ago
parent 7327cb6420
commit eb013ede59
2 changed files with 20 additions and 15 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 7
      contrib/pg_upgrade/info.c
  2. 28
      contrib/pg_upgrade/version_old_8_3.c

7
contrib/pg_upgrade/info.c
Unescape View File

@ -266,9 +266,10 @@ get_rel_infos(ClusterInfo *cluster, DbInfo *dbinfo)
" LEFT OUTER JOIN pg_catalog.pg_tablespace t " " LEFT OUTER JOIN pg_catalog.pg_tablespace t "
" ON c.reltablespace = t.oid " " ON c.reltablespace = t.oid "
"WHERE relkind IN ('r','t', 'i'%s) AND " "WHERE relkind IN ('r','t', 'i'%s) AND "
/* exclude pg_catalog and pg_temp_ (could be orphaned tables) */ /* exclude possible orphaned temp tables */
" ((n.nspname !~ '^pg_' AND " " ((n.nspname !~ '^pg_temp_' AND "
" n.nspname NOT IN ('information_schema', 'binary_upgrade') AND " " n.nspname !~ '^pg_toast_temp_' AND "
" n.nspname NOT IN ('pg_catalog', 'information_schema', 'binary_upgrade') AND "
" c.oid >= %u) " " c.oid >= %u) "
" OR (n.nspname = 'pg_catalog' AND " " OR (n.nspname = 'pg_catalog' AND "
" relname IN ('pg_largeobject', 'pg_largeobject_loid_pn_index'%s) )) " " relname IN ('pg_largeobject', 'pg_largeobject_loid_pn_index'%s) )) "

28
contrib/pg_upgrade/version_old_8_3.c
Unescape View File

@ -59,9 +59,10 @@ old_8_3_check_for_name_data_type_usage(ClusterInfo *cluster)
" NOT a.attisdropped AND " " NOT a.attisdropped AND "
" a.atttypid = 'pg_catalog.name'::pg_catalog.regtype AND " " a.atttypid = 'pg_catalog.name'::pg_catalog.regtype AND "
" c.relnamespace = n.oid AND " " c.relnamespace = n.oid AND "
/* exclude pg_catalog and pg_temp_ (could be orphaned tables) */ /* exclude possible orphaned temp tables */
" n.nspname !~ '^pg_' AND " " n.nspname !~ '^pg_temp_' AND "
" n.nspname != 'information_schema'"); " n.nspname !~ '^pg_toast_temp_' AND "
" n.nspname NOT IN ('pg_catalog', 'information_schema')");
ntups = PQntuples(res); ntups = PQntuples(res);
i_nspname = PQfnumber(res, "nspname"); i_nspname = PQfnumber(res, "nspname");
@ -149,9 +150,10 @@ old_8_3_check_for_tsquery_usage(ClusterInfo *cluster)
" NOT a.attisdropped AND " " NOT a.attisdropped AND "
" a.atttypid = 'pg_catalog.tsquery'::pg_catalog.regtype AND " " a.atttypid = 'pg_catalog.tsquery'::pg_catalog.regtype AND "
" c.relnamespace = n.oid AND " " c.relnamespace = n.oid AND "
/* exclude pg_catalog and pg_temp_ (could be orphaned tables) */ /* exclude possible orphaned temp tables */
" n.nspname !~ '^pg_' AND " " n.nspname !~ '^pg_temp_' AND "
" n.nspname != 'information_schema'"); " n.nspname !~ '^pg_toast_temp_' AND "
" n.nspname NOT IN ('pg_catalog', 'information_schema')");
ntups = PQntuples(res); ntups = PQntuples(res);
i_nspname = PQfnumber(res, "nspname"); i_nspname = PQfnumber(res, "nspname");
@ -247,9 +249,10 @@ old_8_3_rebuild_tsvector_tables(ClusterInfo *cluster, bool check_mode)
" NOT a.attisdropped AND " " NOT a.attisdropped AND "
" a.atttypid = 'pg_catalog.tsvector'::pg_catalog.regtype AND " " a.atttypid = 'pg_catalog.tsvector'::pg_catalog.regtype AND "
" c.relnamespace = n.oid AND " " c.relnamespace = n.oid AND "
/* exclude pg_catalog and pg_temp_ (could be orphaned tables) */ /* exclude possible orphaned temp tables */
" n.nspname !~ '^pg_' AND " " n.nspname !~ '^pg_temp_' AND "
" n.nspname != 'information_schema'"); " 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 * 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 " " pg_catalog.pg_namespace n "
"WHERE c.relkind = 'S' AND " "WHERE c.relkind = 'S' AND "
" c.relnamespace = n.oid AND " " c.relnamespace = n.oid AND "
/* exclude pg_catalog and pg_temp_ (could be orphaned tables) */ /* exclude possible orphaned temp tables */
" n.nspname !~ '^pg_' AND " " n.nspname !~ '^pg_temp_' AND "
" n.nspname != 'information_schema'"); " n.nspname !~ '^pg_toast_temp_' AND "
" n.nspname NOT IN ('pg_catalog', 'information_schema')");
ntups = PQntuples(res); ntups = PQntuples(res);
i_nspname = PQfnumber(res, "nspname"); i_nspname = PQfnumber(res, "nspname");

Write Preview
Loading…
Cancel
Save