1berry/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

In pg_upgrade, allow tables using regclass to be upgraded because we

Browse Source 
preserve pg_class oids since PG 9.0.
This commit is contained in:
Bruce Momjian 2011-12-05 16:45:19 -05:00
parent ff68b256a5
commit 0e8f6bf0e7
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
contrib/pg_upgrade/check.c
View File

@ -611,11 +611,11 @@ check_for_isn_and_int8_passing_mismatch(ClusterInfo *cluster)
/* /*
* check_for_reg_data_type_usage() * check_for_reg_data_type_usage()
* pg_upgrade only preserves these system values: * pg_upgrade only preserves these system values:
* pg_class.relfilenode * pg_class.oid
* pg_type.oid * pg_type.oid
* pg_enum.oid * pg_enum.oid
* *
* Most of the reg* data types reference system catalog info that is * Many of the reg* data types reference system catalog info that is
* not preserved, and hence these data types cannot be used in user * not preserved, and hence these data types cannot be used in user
* tables upgraded by pg_upgrade. * tables upgraded by pg_upgrade.
*/ */
@ -653,16 +653,16 @@ check_for_reg_data_type_usage(ClusterInfo *cluster)
" NOT a.attisdropped AND " " NOT a.attisdropped AND "
" a.atttypid IN ( " " a.atttypid IN ( "
" 'pg_catalog.regproc'::pg_catalog.regtype, " " 'pg_catalog.regproc'::pg_catalog.regtype, "
" 'pg_catalog.regprocedure'::pg_catalog.regtype, " " 'pg_catalog.regprocedure'::pg_catalog.regtype, "
" 'pg_catalog.regoper'::pg_catalog.regtype, " " 'pg_catalog.regoper'::pg_catalog.regtype, "
" 'pg_catalog.regoperator'::pg_catalog.regtype, " " 'pg_catalog.regoperator'::pg_catalog.regtype, "
" 'pg_catalog.regclass'::pg_catalog.regtype, " /* regclass.oid is preserved, so 'regclass' is OK */
/* regtype.oid is preserved, so 'regtype' is OK */ /* regtype.oid is preserved, so 'regtype' is OK */
" 'pg_catalog.regconfig'::pg_catalog.regtype, " " 'pg_catalog.regconfig'::pg_catalog.regtype, "
" 'pg_catalog.regdictionary'::pg_catalog.regtype) AND " " 'pg_catalog.regdictionary'::pg_catalog.regtype) AND "
" c.relnamespace = n.oid AND " " c.relnamespace = n.oid AND "
" n.nspname != 'pg_catalog' AND " " n.nspname != 'pg_catalog' AND "
" n.nspname != 'information_schema'"); " n.nspname != 'information_schema'");
ntups = PQntuples(res); ntups = PQntuples(res);
i_nspname = PQfnumber(res, "nspname"); i_nspname = PQfnumber(res, "nspname");

2
doc/src/sgml/pgupgrade.sgml
View File

@ -557,7 +557,7 @@ psql --username postgres --file script.sql postgres
<application>pg_upgrade</> does not support upgrading of databases <application>pg_upgrade</> does not support upgrading of databases
containing these <type>reg*</> OID-referencing system data types: containing these <type>reg*</> OID-referencing system data types:
<type>regproc</>, <type>regprocedure</>, <type>regoper</>, <type>regproc</>, <type>regprocedure</>, <type>regoper</>,
<type>regoperator</>, <type>regclass</>, <type>regconfig</>, and <type>regoperator</>, <type>regconfig</>, and
<type>regdictionary</>. (<type>regtype</> can be upgraded.) <type>regdictionary</>. (<type>regtype</> can be upgraded.)
</para> </para>