mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-10-03 15:47:17 +02:00
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.
This commit is contained in:
parent
7327cb6420
commit
eb013ede59
@ -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) )) "
|
||||||
|
@ -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");
|
||||||
|
Loading…
Reference in New Issue
Block a user