Make OIDs optional, per discussions in pghackers. WITH OIDS is still the

default, but OIDS are removed from many system catalogs that don't need them.
Some interesting side effects: TOAST pointers are 20 bytes not 32 now;
pg_description has a three-column key instead of one.

Bugs fixed in passing: BINARY cursors work again; pg_class.relhaspkey
has some usefulness; pg_dump dumps comments on indexes, rules, and
triggers in a valid order.

initdb forced.

1 files changed, 5 insertions, 20 deletions

diff --git a/contrib/intarray/_int.sql.in b/contrib/intarray/_int.sql.in
index a07013337b..697be30bde 100644
--- a/contrib/intarray/_int.sql.in
+++ b/contrib/intarray/_int.sql.in
@@ -11,42 +11,27 @@ BEGIN TRANSACTION;
 CREATE FUNCTION _int_contains(_int4, _int4) RETURNS bool
 	AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);
 
-INSERT INTO pg_description (objoid, description)
-   SELECT oid, 'contains'::text
-   FROM pg_proc
-   WHERE proname = '_int_contains'::name;
+COMMENT ON FUNCTION _int_contains(_int4, _int4) IS 'contains';
 
 CREATE FUNCTION _int_contained(_int4, _int4) RETURNS bool
 	AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);
 
-INSERT INTO pg_description (objoid, description)
-   SELECT oid, 'contained in'::text
-   FROM pg_proc
-   WHERE proname = '_int_contained'::name;
+COMMENT ON FUNCTION _int_contained(_int4, _int4) IS 'contained in';
 
 CREATE FUNCTION _int_overlap(_int4, _int4) RETURNS bool
 	AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);
 
-INSERT INTO pg_description (objoid, description)
-   SELECT oid, 'overlaps'::text
-   FROM pg_proc
-   WHERE proname = '_int_overlap'::name;
+COMMENT ON FUNCTION _int_overlap(_int4, _int4) IS 'overlaps';
 
 CREATE FUNCTION _int_same(_int4, _int4) RETURNS bool
 	AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);
 
-INSERT INTO pg_description (objoid, description)
-   SELECT oid, 'same as'::text
-   FROM pg_proc
-   WHERE proname = '_int_same'::name;
+COMMENT ON FUNCTION _int_same(_int4, _int4) IS 'same as';
 
 CREATE FUNCTION _int_different(_int4, _int4) RETURNS bool
 	AS 'MODULE_PATHNAME' LANGUAGE 'c' with (isstrict);
 
-INSERT INTO pg_description (objoid, description)
-   SELECT oid, 'different'::text
-   FROM pg_proc
-   WHERE proname = '_int_different'::name;
+COMMENT ON FUNCTION _int_different(_int4, _int4) IS 'different';
 
 -- support routines for indexing