Add missing pg_description strings for pg_type entries.

I noticed that all non-composite, non-array entries in pg_type.dat
had descr strings, except for "json" and the pseudo-types.  The
lack for json seems certainly an oversight, and there's surely
little reason to not have entries for the pseudo-types either.
So add some.

"make reformat-dat-files" turned up some formatting issues in
pg_amop.dat, too, so fix those in passing.

No catversion bump since the backend doesn't care too much what is
in pg_description.

diff --git a/src/include/catalog/pg_amop.dat b/src/include/catalog/pg_amop.dat
index 5f85e9507ca08cef7d3fbb9325696a063d7e08ef..a1e57d75facb53b299483bbe5b24476029eb9afb 100644 (file)
--- a/src/include/catalog/pg_amop.dat
+++ b/src/include/catalog/pg_amop.dat
@@ -1402,8 +1402,8 @@
   amoprighttype => 'box', amopstrategy => '8', amopopr => '<@(point,box)',
   amopmethod => 'spgist' },
 { amopfamily => 'spgist/quad_point_ops', amoplefttype => 'point',
-  amoprighttype => 'point', amopstrategy => '15', amopopr => '<->(point,point)',
-  amopmethod => 'spgist', amoppurpose => 'o',
+  amoprighttype => 'point', amopstrategy => '15', amoppurpose => 'o',
+  amopopr => '<->(point,point)', amopmethod => 'spgist',
   amopsortfamily => 'btree/float_ops' },
 
 # SP-GiST kd_point_ops
@@ -1426,8 +1426,8 @@
   amoprighttype => 'box', amopstrategy => '8', amopopr => '<@(point,box)',
   amopmethod => 'spgist' },
 { amopfamily => 'spgist/kd_point_ops', amoplefttype => 'point',
-  amoprighttype => 'point', amopstrategy => '15', amopopr => '<->(point,point)',
-  amopmethod => 'spgist', amoppurpose => 'o',
+  amoprighttype => 'point', amopstrategy => '15', amoppurpose => 'o',
+  amopopr => '<->(point,point)', amopmethod => 'spgist',
   amopsortfamily => 'btree/float_ops' },
 
 # SP-GiST text_ops
@@ -1599,8 +1599,8 @@
   amoprighttype => 'polygon', amopstrategy => '12',
   amopopr => '|&>(polygon,polygon)', amopmethod => 'spgist' },
 { amopfamily => 'spgist/poly_ops', amoplefttype => 'polygon',
-  amoprighttype => 'point', amopstrategy => '15',
-  amopopr => '<->(polygon,point)', amoppurpose => 'o', amopmethod => 'spgist',
+  amoprighttype => 'point', amopstrategy => '15', amoppurpose => 'o',
+  amopopr => '<->(polygon,point)', amopmethod => 'spgist',
   amopsortfamily => 'btree/float_ops' },
 
 # GiST inet_ops

diff --git a/src/include/catalog/pg_type.dat b/src/include/catalog/pg_type.dat
index 67dd0ce8b336cafdb784284fe1234ce8cc2df06a..5840f989e51bca531f48b205f1a82fde445a204b 100644 (file)
--- a/src/include/catalog/pg_type.dat
+++ b/src/include/catalog/pg_type.dat
@@ -136,7 +136,7 @@
 
 # OIDS 100 - 199
 
-{ oid => '114', array_type_oid => '199',
+{ oid => '114', array_type_oid => '199', descr => 'JSON stored as text',
   typname => 'json', typlen => '-1', typbyval => 'f', typcategory => 'U',
   typinput => 'json_in', typoutput => 'json_out', typreceive => 'json_recv',
   typsend => 'json_send', typalign => 'i', typstorage => 'x' },
@@ -240,7 +240,7 @@
   typname => 'tinterval', typlen => '12', typbyval => 'f', typcategory => 'T',
   typinput => 'tintervalin', typoutput => 'tintervalout',
   typreceive => 'tintervalrecv', typsend => 'tintervalsend', typalign => 'i' },
-{ oid => '705',
+{ oid => '705', descr => 'pseudo-type representing an undetermined type',
   typname => 'unknown', typlen => '-2', typbyval => 'f', typtype => 'p',
   typcategory => 'X', typinput => 'unknownin', typoutput => 'unknownout',
   typreceive => 'unknownrecv', typsend => 'unknownsend', typalign => 'c' },
@@ -506,7 +506,7 @@
 # but there is now support for it in records and arrays.  Perhaps we should
 # just treat it as a regular base type?
 
-{ oid => '2249',
+{ oid => '2249', descr => 'pseudo-type representing any composite type',
   typname => 'record', typlen => '-1', typbyval => 'f', typtype => 'p',
   typcategory => 'P', typarray => '_record', typinput => 'record_in',
   typoutput => 'record_out', typreceive => 'record_recv',
@@ -517,76 +517,86 @@
   typcategory => 'P', typelem => 'record', typinput => 'array_in',
   typoutput => 'array_out', typreceive => 'array_recv', typsend => 'array_send',
   typanalyze => 'array_typanalyze', typalign => 'd', typstorage => 'x' },
-{ oid => '2275', array_type_oid => '1263',
+{ oid => '2275', array_type_oid => '1263', descr => 'C-style string',
   typname => 'cstring', typlen => '-2', typbyval => 'f', typtype => 'p',
   typcategory => 'P', typinput => 'cstring_in', typoutput => 'cstring_out',
   typreceive => 'cstring_recv', typsend => 'cstring_send', typalign => 'c' },
-{ oid => '2276',
+{ oid => '2276', descr => 'pseudo-type representing any type',
   typname => 'any', typlen => '4', typbyval => 't', typtype => 'p',
   typcategory => 'P', typinput => 'any_in', typoutput => 'any_out',
   typreceive => '-', typsend => '-', typalign => 'i' },
-{ oid => '2277',
+{ oid => '2277', descr => 'pseudo-type representing a polymorphic array type',
   typname => 'anyarray', typlen => '-1', typbyval => 'f', typtype => 'p',
   typcategory => 'P', typinput => 'anyarray_in', typoutput => 'anyarray_out',
   typreceive => 'anyarray_recv', typsend => 'anyarray_send', typalign => 'd',
   typstorage => 'x' },
 { oid => '2278',
+  descr => 'pseudo-type for the result of a function with no real result',
   typname => 'void', typlen => '4', typbyval => 't', typtype => 'p',
   typcategory => 'P', typinput => 'void_in', typoutput => 'void_out',
   typreceive => 'void_recv', typsend => 'void_send', typalign => 'i' },
-{ oid => '2279',
+{ oid => '2279', descr => 'pseudo-type for the result of a trigger function',
   typname => 'trigger', typlen => '4', typbyval => 't', typtype => 'p',
   typcategory => 'P', typinput => 'trigger_in', typoutput => 'trigger_out',
   typreceive => '-', typsend => '-', typalign => 'i' },
 { oid => '3838', oid_symbol => 'EVTTRIGGEROID',
+  descr => 'pseudo-type for the result of an event trigger function',
   typname => 'event_trigger', typlen => '4', typbyval => 't', typtype => 'p',
   typcategory => 'P', typinput => 'event_trigger_in',
   typoutput => 'event_trigger_out', typreceive => '-', typsend => '-',
   typalign => 'i' },
 { oid => '2280',
+  descr => 'pseudo-type for the result of a language handler function',
   typname => 'language_handler', typlen => '4', typbyval => 't', typtype => 'p',
   typcategory => 'P', typinput => 'language_handler_in',
   typoutput => 'language_handler_out', typreceive => '-', typsend => '-',
   typalign => 'i' },
 { oid => '2281',
+  descr => 'pseudo-type representing an internal data structure',
   typname => 'internal', typlen => 'SIZEOF_POINTER', typbyval => 't',
   typtype => 'p', typcategory => 'P', typinput => 'internal_in',
   typoutput => 'internal_out', typreceive => '-', typsend => '-',
   typalign => 'ALIGNOF_POINTER' },
-{ oid => '2282',
+{ oid => '2282', descr => 'obsolete, deprecated pseudo-type',
   typname => 'opaque', typlen => '4', typbyval => 't', typtype => 'p',
   typcategory => 'P', typinput => 'opaque_in', typoutput => 'opaque_out',
   typreceive => '-', typsend => '-', typalign => 'i' },
-{ oid => '2283',
+{ oid => '2283', descr => 'pseudo-type representing a polymorphic base type',
   typname => 'anyelement', typlen => '4', typbyval => 't', typtype => 'p',
   typcategory => 'P', typinput => 'anyelement_in',
   typoutput => 'anyelement_out', typreceive => '-', typsend => '-',
   typalign => 'i' },
 { oid => '2776',
+  descr => 'pseudo-type representing a polymorphic base type that is not an array',
   typname => 'anynonarray', typlen => '4', typbyval => 't', typtype => 'p',
   typcategory => 'P', typinput => 'anynonarray_in',
   typoutput => 'anynonarray_out', typreceive => '-', typsend => '-',
   typalign => 'i' },
 { oid => '3500',
+  descr => 'pseudo-type representing a polymorphic base type that is an enum',
   typname => 'anyenum', typlen => '4', typbyval => 't', typtype => 'p',
   typcategory => 'P', typinput => 'anyenum_in', typoutput => 'anyenum_out',
   typreceive => '-', typsend => '-', typalign => 'i' },
 { oid => '3115',
+  descr => 'pseudo-type for the result of an FDW handler function',
   typname => 'fdw_handler', typlen => '4', typbyval => 't', typtype => 'p',
   typcategory => 'P', typinput => 'fdw_handler_in',
   typoutput => 'fdw_handler_out', typreceive => '-', typsend => '-',
   typalign => 'i' },
 { oid => '325',
+  descr => 'pseudo-type for the result of an index AM handler function',
   typname => 'index_am_handler', typlen => '4', typbyval => 't', typtype => 'p',
   typcategory => 'P', typinput => 'index_am_handler_in',
   typoutput => 'index_am_handler_out', typreceive => '-', typsend => '-',
   typalign => 'i' },
 { oid => '3310',
+  descr => 'pseudo-type for the result of a tablesample method function',
   typname => 'tsm_handler', typlen => '4', typbyval => 't', typtype => 'p',
   typcategory => 'P', typinput => 'tsm_handler_in',
   typoutput => 'tsm_handler_out', typreceive => '-', typsend => '-',
   typalign => 'i' },
 { oid => '3831',
+  descr => 'pseudo-type representing a polymorphic base type that is a range',
   typname => 'anyrange', typlen => '-1', typbyval => 'f', typtype => 'p',
   typcategory => 'P', typinput => 'anyrange_in', typoutput => 'anyrange_out',
   typreceive => '-', typsend => '-', typalign => 'd', typstorage => 'x' },

diff --git a/src/tools/pgindent/README b/src/tools/pgindent/README
index dce80285970ea0772c24114c00f532a9cda8444c..044b380fed81a1a76d443562ade6d8c509ed10ac 100644 (file)
--- a/src/tools/pgindent/README
+++ b/src/tools/pgindent/README
@@ -48,6 +48,12 @@ DOING THE INDENT RUN:
    If you want to use some perltidy version that's not in your PATH,
    first set the PERLTIDY environment variable to point to it.
 
+5) Reformat the bootstrap catalog data files:
+
+       cd src/include/catalog
+       make reformat-dat-files
+       cd ../../..
+
 VALIDATION:
 
 1) Check for any newly-created files using "git status"; there shouldn't