Remove TOAST table from pg_database

The only toastable column now is datacl, but we don't really support
long ACLs anyway.  The TOAST table should have been removed when the
pg_db_role_setting catalog was introduced in commit
2eda8dfb52ed9962920282d8384da8bb4c22514d, but I forgot to do that.

Per -hackers discussion on March 2011.

diff --git a/src/backend/catalog/catalog.c b/src/backend/catalog/catalog.c
index c1f1db9a3291f2b72034983ce91c47d2bcc9e7f8..2547f33552ea681584fb56bcccd994c7beb4ccaf 100644 (file)
--- a/src/backend/catalog/catalog.c
+++ b/src/backend/catalog/catalog.c
@@ -402,9 +402,7 @@ IsSharedRelation(Oid relationId)
                relationId == DbRoleSettingDatidRolidIndexId)
                return true;
        /* These are their toast tables and toast indexes (see toasting.h) */
-       if (relationId == PgDatabaseToastTable ||
-               relationId == PgDatabaseToastIndex ||
-               relationId == PgShdescriptionToastTable ||
+       if (relationId == PgShdescriptionToastTable ||
                relationId == PgShdescriptionToastIndex ||
                relationId == PgDbRoleSettingToastTable ||
                relationId == PgDbRoleSettingToastIndex)

diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h
index 8451dfde040a34d2c107d3735e123105783feca7..e5fbbfc8fda6a730a76d733356001db4504d5e78 100644 (file)
--- a/src/include/catalog/catversion.h
+++ b/src/include/catalog/catversion.h
@@ -53,6 +53,6 @@
  */
 
 /*                                                     yyyymmddN */
-#define CATALOG_VERSION_NO     201202271
+#define CATALOG_VERSION_NO     201203011
 
 #endif

diff --git a/src/include/catalog/toasting.h b/src/include/catalog/toasting.h
index a4f1718a2d80783be87edb9b97cb7f466a43767e..22211cbe3f375622e2ed4cbeffcadb6588c299e1 100644 (file)
--- a/src/include/catalog/toasting.h
+++ b/src/include/catalog/toasting.h
@@ -50,9 +50,6 @@ DECLARE_TOAST(pg_statistic, 2840, 2841);
 DECLARE_TOAST(pg_trigger, 2336, 2337);
 
 /* shared catalogs */
-DECLARE_TOAST(pg_database, 2844, 2845);
-#define PgDatabaseToastTable 2844
-#define PgDatabaseToastIndex 2845
 DECLARE_TOAST(pg_shdescription, 2846, 2847);
 #define PgShdescriptionToastTable 2846
 #define PgShdescriptionToastIndex 2847