database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-18 17:42:25 +03:00
Code 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.
This commit is contained in:
Bruce Momjian
2011-08-26 00:12:39 -04:00
parent 9354f5b76a
commit df957a79cc
2 changed files with 30 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/pg_upgrade/info.c
View File

@ -328,9 +328,11 @@ get_rel_infos(migratorContext *ctx, const DbInfo *dbinfo,
" ON c.reltablespace = t.oid " " ON c.reltablespace = t.oid "
"WHERE (( " "WHERE (( "
/* exclude pg_catalog and pg_temp_ (could be orphaned tables) */ /* exclude pg_catalog and pg_temp_ (could be orphaned tables) */
" n.nspname !~ '^pg_' " " n.nspname != 'pg_catalog' "
" AND n.nspname != 'information_schema' " " AND n.nspname !~ '^pg_temp_' "
" AND c.oid >= %u " " AND n.nspname !~ '^pg_toast_temp_' "
" AND n.nspname != 'information_schema' "
" AND c.oid >= %u "
" ) OR ( " " ) OR ( "
" n.nspname = 'pg_catalog' " " n.nspname = 'pg_catalog' "
" AND relname IN " " AND relname IN "

39
contrib/pg_upgrade/version_old_8_3.c
View File

@ -61,9 +61,11 @@ old_8_3_check_for_name_data_type_usage(migratorContext *ctx, Cluster whichCluste
" 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 possibly orphaned temp tables */
" n.nspname !~ '^pg_' AND " " n.nspname != 'pg_catalog' AND "
" n.nspname != 'information_schema'"); " n.nspname !~ '^pg_temp_' AND "
" n.nspname !~ '^pg_toast_temp_' AND "
" n.nspname != 'information_schema' ");
ntups = PQntuples(res); ntups = PQntuples(res);
i_nspname = PQfnumber(res, "nspname"); i_nspname = PQfnumber(res, "nspname");
@ -152,9 +154,11 @@ old_8_3_check_for_tsquery_usage(migratorContext *ctx, Cluster whichCluster)
" 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 possibly orphaned temp tables */
" n.nspname !~ '^pg_' AND " " n.nspname != 'pg_catalog' AND "
" n.nspname != 'information_schema'"); " n.nspname !~ '^pg_temp_' AND "
" n.nspname !~ '^pg_toast_temp_' AND "
" n.nspname != 'information_schema' ");
ntups = PQntuples(res); ntups = PQntuples(res);
i_nspname = PQfnumber(res, "nspname"); i_nspname = PQfnumber(res, "nspname");
@ -252,9 +256,11 @@ old_8_3_rebuild_tsvector_tables(migratorContext *ctx, 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 possibly orphaned temp tables */
" n.nspname !~ '^pg_' AND " " n.nspname != 'pg_catalog' AND "
" n.nspname != 'information_schema'"); " n.nspname !~ '^pg_temp_' AND "
" n.nspname !~ '^pg_toast_temp_' AND "
" n.nspname != 'information_schema' ");
/* /*
* This macro is used below to avoid reindexing indexes already rebuilt * This macro is used below to avoid reindexing indexes already rebuilt
@ -271,8 +277,10 @@ old_8_3_rebuild_tsvector_tables(migratorContext *ctx, 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 " \
" n.nspname !~ '^pg_' AND " \ " n.nspname != 'pg_catalog' AND " \
" n.nspname != 'information_schema') " " n.nspname !~ '^pg_temp_' AND " \
" n.nspname !~ '^pg_toast_temp_' AND " \
" n.nspname != 'information_schema')"
ntups = PQntuples(res); ntups = PQntuples(res);
i_nspname = PQfnumber(res, "nspname"); i_nspname = PQfnumber(res, "nspname");
@ -641,9 +649,12 @@ old_8_3_create_sequence_script(migratorContext *ctx, Cluster whichCluster)
" 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 possibly orphaned temp tables */
" n.nspname !~ '^pg_' AND " " n.nspname != 'pg_catalog' AND "
" n.nspname != 'information_schema'"); " n.nspname !~ '^pg_temp_' AND "
" n.nspname !~ '^pg_toast_temp_' AND "
" n.nspname != 'information_schema' ");
ntups = PQntuples(res); ntups = PQntuples(res);
i_nspname = PQfnumber(res, "nspname"); i_nspname = PQfnumber(res, "nspname");