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

preserve pg_class oids since PG 9.0.

diff --git a/contrib/pg_upgrade/check.c b/contrib/pg_upgrade/check.c
index 419628c3a448d43864ee3bd9e01dec534b76bfc6..7aa5c28c47c4ce181e23ef206224ab5ba30ca84d 100644 (file)
--- a/contrib/pg_upgrade/check.c
+++ b/contrib/pg_upgrade/check.c
@@ -686,7 +686,7 @@ check_for_reg_data_type_usage(ClusterInfo *cluster)
                                                                "                       'pg_catalog.regprocedure'::pg_catalog.regtype, "
                  "                     'pg_catalog.regoper'::pg_catalog.regtype, "
                                                                "                       'pg_catalog.regoperator'::pg_catalog.regtype, "
-                "                      'pg_catalog.regclass'::pg_catalog.regtype, "
+/*     allow    "                      'pg_catalog.regclass'::pg_catalog.regtype, "*/
                /* regtype.oid is preserved, so 'regtype' is OK */
                "                       'pg_catalog.regconfig'::pg_catalog.regtype, "
                                                                "                       'pg_catalog.regdictionary'::pg_catalog.regtype) AND "

diff --git a/doc/src/sgml/pgupgrade.sgml b/doc/src/sgml/pgupgrade.sgml
index 3a6dbfd65acaf2b3f5156b1f813bdf9796d37ecf..cb4396aa01493a96d30d550a2896c3de5deddebd 100644 (file)
--- a/doc/src/sgml/pgupgrade.sgml
+++ b/doc/src/sgml/pgupgrade.sgml
@@ -541,7 +541,7 @@ psql --username postgres --file script.sql postgres
    <application>pg_upgrade</> does not support upgrading of databases
    containing these <type>reg*</> OID-referencing system data types:
    <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.)
   </para>