Run reformat-dat-files to declutter the catalog data files.

Things had gotten pretty messy here, apparently mostly but not
entirely the fault of the multirange patch.  No functional changes.

src/include/catalog/pg_aggregate.dat

@@ -544,7 +544,8 @@
   aggcombinefn => 'range_intersect_agg_transfn', aggtranstype => 'anyrange' },
 { aggfnoid => 'range_intersect_agg(anymultirange)',
   aggtransfn => 'multirange_intersect_agg_transfn',
-  aggcombinefn => 'multirange_intersect_agg_transfn', aggtranstype => 'anymultirange' },
+  aggcombinefn => 'multirange_intersect_agg_transfn',
+  aggtranstype => 'anymultirange' },
 { aggfnoid => 'range_agg(anyrange)', aggtransfn => 'range_agg_transfn',
   aggfinalfn => 'range_agg_finalfn', aggfinalextra => 't',
   aggtranstype => 'internal' },

src/include/catalog/pg_amop.dat

@@ -981,8 +981,8 @@
 
 # record_ops
 { amopfamily => 'hash/record_ops', amoplefttype => 'record',
-  amoprighttype => 'record', amopstrategy => '1',
-  amopopr => '=(record,record)', amopmethod => 'hash' },
+  amoprighttype => 'record', amopstrategy => '1', amopopr => '=(record,record)',
+  amopmethod => 'hash' },
 
 # text_ops
 { amopfamily => 'hash/text_ops', amoplefttype => 'text',

src/include/catalog/pg_amproc.dat

@@ -286,7 +286,8 @@
 { amprocfamily => 'btree/range_ops', amproclefttype => 'anyrange',
   amprocrighttype => 'anyrange', amprocnum => '1', amproc => 'range_cmp' },
 { amprocfamily => 'btree/multirange_ops', amproclefttype => 'anymultirange',
-  amprocrighttype => 'anymultirange', amprocnum => '1', amproc => 'multirange_cmp' },
+  amprocrighttype => 'anymultirange', amprocnum => '1',
+  amproc => 'multirange_cmp' },
 { amprocfamily => 'btree/jsonb_ops', amproclefttype => 'jsonb',
   amprocrighttype => 'jsonb', amprocnum => '1', amproc => 'jsonb_cmp' },
 { amprocfamily => 'btree/xid8_ops', amproclefttype => 'xid8',
@@ -438,7 +439,8 @@
 { amprocfamily => 'hash/record_ops', amproclefttype => 'record',
   amprocrighttype => 'record', amprocnum => '1', amproc => 'hash_record' },
 { amprocfamily => 'hash/record_ops', amproclefttype => 'record',
-  amprocrighttype => 'record', amprocnum => '2', amproc => 'hash_record_extended' },
+  amprocrighttype => 'record', amprocnum => '2',
+  amproc => 'hash_record_extended' },
 { amprocfamily => 'hash/pg_lsn_ops', amproclefttype => 'pg_lsn',
   amprocrighttype => 'pg_lsn', amprocnum => '1', amproc => 'pg_lsn_hash' },
 { amprocfamily => 'hash/pg_lsn_ops', amproclefttype => 'pg_lsn',
@@ -460,7 +462,8 @@
   amprocrighttype => 'anyrange', amprocnum => '2',
   amproc => 'hash_range_extended' },
 { amprocfamily => 'hash/multirange_ops', amproclefttype => 'anymultirange',
-  amprocrighttype => 'anymultirange', amprocnum => '1', amproc => 'hash_multirange' },
+  amprocrighttype => 'anymultirange', amprocnum => '1',
+  amproc => 'hash_multirange' },
 { amprocfamily => 'hash/multirange_ops', amproclefttype => 'anymultirange',
   amprocrighttype => 'anymultirange', amprocnum => '2',
   amproc => 'hash_multirange_extended' },
@@ -492,7 +495,8 @@
 { amprocfamily => 'gist/point_ops', amproclefttype => 'point',
   amprocrighttype => 'point', amprocnum => '9', amproc => 'gist_point_fetch' },
 { amprocfamily => 'gist/point_ops', amproclefttype => 'point',
-  amprocrighttype => 'point', amprocnum => '11', amproc => 'gist_point_sortsupport' },
+  amprocrighttype => 'point', amprocnum => '11',
+  amproc => 'gist_point_sortsupport' },
 { amprocfamily => 'gist/box_ops', amproclefttype => 'box',
   amprocrighttype => 'box', amprocnum => '1', amproc => 'gist_box_consistent' },
 { amprocfamily => 'gist/box_ops', amproclefttype => 'box',
@@ -1311,7 +1315,8 @@
   amprocrighttype => 'anyrange', amprocnum => '13',
   amproc => 'range_contains' },
 { amprocfamily => 'brin/range_inclusion_ops', amproclefttype => 'anyrange',
-  amprocrighttype => 'anyrange', amprocnum => '14', amproc => 'isempty(anyrange)' },
+  amprocrighttype => 'anyrange', amprocnum => '14',
+  amproc => 'isempty(anyrange)' },
 
 # minmax pg_lsn
 { amprocfamily => 'brin/pg_lsn_minmax_ops', amproclefttype => 'pg_lsn',

src/include/catalog/pg_cast.dat

@@ -531,16 +531,21 @@
   castcontext => 'e', castmethod => 'f' },
 
 # range to multirange
-{ castsource => 'int4range', casttarget => 'int4multirange', castfunc => 'int4multirange(int4range)',
-  castcontext => 'e', castmethod => 'f' },
-{ castsource => 'int8range', casttarget => 'int8multirange', castfunc => 'int8multirange(int8range)',
-  castcontext => 'e', castmethod => 'f' },
-{ castsource => 'numrange', casttarget => 'nummultirange', castfunc => 'nummultirange(numrange)',
-  castcontext => 'e', castmethod => 'f' },
-{ castsource => 'daterange', casttarget => 'datemultirange', castfunc => 'datemultirange(daterange)',
-  castcontext => 'e', castmethod => 'f' },
-{ castsource => 'tsrange', casttarget => 'tsmultirange', castfunc => 'tsmultirange(tsrange)',
-  castcontext => 'e', castmethod => 'f' },
-{ castsource => 'tstzrange', casttarget => 'tstzmultirange', castfunc => 'tstzmultirange(tstzrange)',
-  castcontext => 'e', castmethod => 'f' },
+{ castsource => 'int4range', casttarget => 'int4multirange',
+  castfunc => 'int4multirange(int4range)', castcontext => 'e',
+  castmethod => 'f' },
+{ castsource => 'int8range', casttarget => 'int8multirange',
+  castfunc => 'int8multirange(int8range)', castcontext => 'e',
+  castmethod => 'f' },
+{ castsource => 'numrange', casttarget => 'nummultirange',
+  castfunc => 'nummultirange(numrange)', castcontext => 'e',
+  castmethod => 'f' },
+{ castsource => 'daterange', casttarget => 'datemultirange',
+  castfunc => 'datemultirange(daterange)', castcontext => 'e',
+  castmethod => 'f' },
+{ castsource => 'tsrange', casttarget => 'tsmultirange',
+  castfunc => 'tsmultirange(tsrange)', castcontext => 'e', castmethod => 'f' },
+{ castsource => 'tstzrange', casttarget => 'tstzmultirange',
+  castfunc => 'tstzmultirange(tstzrange)', castcontext => 'e',
+  castmethod => 'f' },
 ]

src/include/catalog/pg_collation.dat

@@ -15,7 +15,8 @@
 { oid => '100', oid_symbol => 'DEFAULT_COLLATION_OID',
   descr => 'database\'s default collation',
   collname => 'default', collnamespace => 'PGNSP', collowner => 'PGUID',
-  collprovider => 'd', collencoding => '-1', collcollate => '', collctype => '' },
+  collprovider => 'd', collencoding => '-1', collcollate => '',
+  collctype => '' },
 { oid => '950', oid_symbol => 'C_COLLATION_OID',
   descr => 'standard C collation',
   collname => 'C', collnamespace => 'PGNSP', collowner => 'PGUID',

src/include/catalog/pg_opclass.dat

@@ -114,8 +114,8 @@
   opcfamily => 'hash/oidvector_ops', opcintype => 'oidvector' },
 { opcmethod => 'btree', opcname => 'record_ops',
   opcfamily => 'btree/record_ops', opcintype => 'record' },
-{ opcmethod => 'hash', opcname => 'record_ops',
-  opcfamily => 'hash/record_ops', opcintype => 'record' },
+{ opcmethod => 'hash', opcname => 'record_ops', opcfamily => 'hash/record_ops',
+  opcintype => 'record' },
 { opcmethod => 'btree', opcname => 'record_image_ops',
   opcfamily => 'btree/record_image_ops', opcintype => 'record',
   opcdefault => 'f' },
@@ -232,12 +232,13 @@
   opcintype => 'anyrange' },
 { opcmethod => 'spgist', opcname => 'range_ops',
   opcfamily => 'spgist/range_ops', opcintype => 'anyrange' },
-{ opcmethod => 'btree', opcname => 'multirange_ops', opcfamily => 'btree/multirange_ops',
-  opcintype => 'anymultirange' },
-{ opcmethod => 'hash', opcname => 'multirange_ops', opcfamily => 'hash/multirange_ops',
-  opcintype => 'anymultirange' },
-{ opcmethod => 'gist', opcname => 'multirange_ops', opcfamily => 'gist/multirange_ops',
-  opcintype => 'anymultirange', opckeytype => 'anyrange' },
+{ opcmethod => 'btree', opcname => 'multirange_ops',
+  opcfamily => 'btree/multirange_ops', opcintype => 'anymultirange' },
+{ opcmethod => 'hash', opcname => 'multirange_ops',
+  opcfamily => 'hash/multirange_ops', opcintype => 'anymultirange' },
+{ opcmethod => 'gist', opcname => 'multirange_ops',
+  opcfamily => 'gist/multirange_ops', opcintype => 'anymultirange',
+  opckeytype => 'anyrange' },
 { opcmethod => 'spgist', opcname => 'box_ops', opcfamily => 'spgist/box_ops',
   opcintype => 'box' },
 { opcmethod => 'spgist', opcname => 'quad_point_ops',

src/include/catalog/pg_operator.dat

@@ -3009,8 +3009,8 @@
 
 # generic record comparison operators
 { oid => '2988', oid_symbol => 'RECORD_EQ_OP', descr => 'equal',
-  oprname => '=', oprcanmerge => 't', oprcanhash => 't', oprleft => 'record', oprright => 'record',
-  oprresult => 'bool', oprcom => '=(record,record)',
+  oprname => '=', oprcanmerge => 't', oprcanhash => 't', oprleft => 'record',
+  oprright => 'record', oprresult => 'bool', oprcom => '=(record,record)',
   oprnegate => '<>(record,record)', oprcode => 'record_eq', oprrest => 'eqsel',
   oprjoin => 'eqjoinsel' },
 { oid => '2989', descr => 'not equal',
@@ -3278,8 +3278,9 @@
   oprresult => 'bool', oprcode => 'jsonb_path_match_opr(jsonb,jsonpath)',
   oprrest => 'matchingsel', oprjoin => 'matchingjoinsel' },
 { oid => '2860', descr => 'equal',
-  oprname => '=', oprcanmerge => 't', oprcanhash => 't', oprleft => 'anymultirange',
-  oprright => 'anymultirange', oprresult => 'bool', oprcom => '=(anymultirange,anymultirange)',
+  oprname => '=', oprcanmerge => 't', oprcanhash => 't',
+  oprleft => 'anymultirange', oprright => 'anymultirange', oprresult => 'bool',
+  oprcom => '=(anymultirange,anymultirange)',
   oprnegate => '<>(anymultirange,anymultirange)', oprcode => 'multirange_eq',
   oprrest => 'eqsel', oprjoin => 'eqjoinsel' },
 { oid => '2861', descr => 'not equal',
@@ -3316,12 +3317,14 @@
   oprresult => 'bool', oprcom => '&&(anymultirange,anyrange)',
   oprcode => 'range_overlaps_multirange', oprrest => 'multirangesel',
   oprjoin => 'areajoinsel' },
-{ oid => '2867', oid_symbol => 'OID_MULTIRANGE_OVERLAPS_RANGE_OP', descr => 'contains',
+{ oid => '2867', oid_symbol => 'OID_MULTIRANGE_OVERLAPS_RANGE_OP',
+  descr => 'contains',
   oprname => '&&', oprleft => 'anymultirange', oprright => 'anyrange',
   oprresult => 'bool', oprcom => '&&(anyrange,anymultirange)',
   oprcode => 'multirange_overlaps_range', oprrest => 'multirangesel',
   oprjoin => 'areajoinsel' },
-{ oid => '2868', oid_symbol => 'OID_MULTIRANGE_OVERLAPS_MULTIRANGE_OP', descr => 'contains',
+{ oid => '2868', oid_symbol => 'OID_MULTIRANGE_OVERLAPS_MULTIRANGE_OP',
+  descr => 'contains',
   oprname => '&&', oprleft => 'anymultirange', oprright => 'anymultirange',
   oprresult => 'bool', oprcom => '&&(anymultirange,anymultirange)',
   oprcode => 'multirange_overlaps_multirange', oprrest => 'multirangesel',
@@ -3332,12 +3335,14 @@
   oprresult => 'bool', oprcom => '<@(anyelement,anymultirange)',
   oprcode => 'multirange_contains_elem', oprrest => 'multirangesel',
   oprjoin => 'contjoinsel' },
-{ oid => '2870', oid_symbol => 'OID_MULTIRANGE_CONTAINS_RANGE_OP', descr => 'contains',
+{ oid => '2870', oid_symbol => 'OID_MULTIRANGE_CONTAINS_RANGE_OP',
+  descr => 'contains',
   oprname => '@>', oprleft => 'anymultirange', oprright => 'anyrange',
   oprresult => 'bool', oprcom => '<@(anyrange,anymultirange)',
   oprcode => 'multirange_contains_range', oprrest => 'multirangesel',
   oprjoin => 'contjoinsel' },
-{ oid => '2871', oid_symbol => 'OID_MULTIRANGE_CONTAINS_MULTIRANGE_OP', descr => 'contains',
+{ oid => '2871', oid_symbol => 'OID_MULTIRANGE_CONTAINS_MULTIRANGE_OP',
+  descr => 'contains',
   oprname => '@>', oprleft => 'anymultirange', oprright => 'anymultirange',
   oprresult => 'bool', oprcom => '<@(anymultirange,anymultirange)',
   oprcode => 'multirange_contains_multirange', oprrest => 'multirangesel',
@@ -3375,44 +3380,47 @@
 { oid => '2875', oid_symbol => 'OID_RANGE_OVERLAPS_LEFT_MULTIRANGE_OP',
   descr => 'overlaps or is left of',
   oprname => '&<', oprleft => 'anyrange', oprright => 'anymultirange',
-  oprresult => 'bool', oprcode => 'range_overleft_multirange', oprrest => 'multirangesel',
-  oprjoin => 'scalarltjoinsel' },
+  oprresult => 'bool', oprcode => 'range_overleft_multirange',
+  oprrest => 'multirangesel', oprjoin => 'scalarltjoinsel' },
 { oid => '2876', oid_symbol => 'OID_MULTIRANGE_OVERLAPS_LEFT_RANGE_OP',
   descr => 'overlaps or is left of',
   oprname => '&<', oprleft => 'anymultirange', oprright => 'anyrange',
-  oprresult => 'bool', oprcode => 'multirange_overleft_range', oprrest => 'multirangesel',
-  oprjoin => 'scalarltjoinsel' },
+  oprresult => 'bool', oprcode => 'multirange_overleft_range',
+  oprrest => 'multirangesel', oprjoin => 'scalarltjoinsel' },
 { oid => '2877', oid_symbol => 'OID_MULTIRANGE_OVERLAPS_LEFT_MULTIRANGE_OP',
   descr => 'overlaps or is left of',
   oprname => '&<', oprleft => 'anymultirange', oprright => 'anymultirange',
-  oprresult => 'bool', oprcode => 'multirange_overleft_multirange', oprrest => 'multirangesel',
-  oprjoin => 'scalargtjoinsel' },
+  oprresult => 'bool', oprcode => 'multirange_overleft_multirange',
+  oprrest => 'multirangesel', oprjoin => 'scalargtjoinsel' },
 { oid => '3585', oid_symbol => 'OID_RANGE_OVERLAPS_RIGHT_MULTIRANGE_OP',
   descr => 'overlaps or is right of',
   oprname => '&>', oprleft => 'anyrange', oprright => 'anymultirange',
-  oprresult => 'bool', oprcode => 'range_overright_multirange', oprrest => 'multirangesel',
-  oprjoin => 'scalargtjoinsel' },
+  oprresult => 'bool', oprcode => 'range_overright_multirange',
+  oprrest => 'multirangesel', oprjoin => 'scalargtjoinsel' },
 { oid => '4035', oid_symbol => 'OID_MULTIRANGE_OVERLAPS_RIGHT_RANGE_OP',
   descr => 'overlaps or is right of',
   oprname => '&>', oprleft => 'anymultirange', oprright => 'anyrange',
-  oprresult => 'bool', oprcode => 'multirange_overright_range', oprrest => 'multirangesel',
-  oprjoin => 'scalargtjoinsel' },
+  oprresult => 'bool', oprcode => 'multirange_overright_range',
+  oprrest => 'multirangesel', oprjoin => 'scalargtjoinsel' },
 { oid => '4142', oid_symbol => 'OID_MULTIRANGE_OVERLAPS_RIGHT_MULTIRANGE_OP',
   descr => 'overlaps or is right of',
   oprname => '&>', oprleft => 'anymultirange', oprright => 'anymultirange',
-  oprresult => 'bool', oprcode => 'multirange_overright_multirange', oprrest => 'multirangesel',
-  oprjoin => 'scalargtjoinsel' },
-{ oid => '4179', oid_symbol => 'OID_RANGE_ADJACENT_MULTIRANGE_OP', descr => 'is adjacent to',
+  oprresult => 'bool', oprcode => 'multirange_overright_multirange',
+  oprrest => 'multirangesel', oprjoin => 'scalargtjoinsel' },
+{ oid => '4179', oid_symbol => 'OID_RANGE_ADJACENT_MULTIRANGE_OP',
+  descr => 'is adjacent to',
   oprname => '-|-', oprleft => 'anyrange', oprright => 'anymultirange',
   oprresult => 'bool', oprcom => '-|-(anymultirange,anyrange)',
   oprcode => 'range_adjacent_multirange', oprrest => 'matchingsel',
   oprjoin => 'matchingjoinsel' },
-{ oid => '4180', oid_symbol => 'OID_MULTIRANGE_ADJACENT_RANGE_OP', descr => 'is adjacent to',
+{ oid => '4180', oid_symbol => 'OID_MULTIRANGE_ADJACENT_RANGE_OP',
+  descr => 'is adjacent to',
   oprname => '-|-', oprleft => 'anymultirange', oprright => 'anyrange',
   oprresult => 'bool', oprcom => '-|-(anyrange,anymultirange)',
   oprcode => 'multirange_adjacent_range', oprrest => 'matchingsel',
   oprjoin => 'matchingjoinsel' },
-{ oid => '4198', oid_symbol => 'OID_MULTIRANGE_ADJACENT_MULTIRANGE_OP', descr => 'is adjacent to',
+{ oid => '4198', oid_symbol => 'OID_MULTIRANGE_ADJACENT_MULTIRANGE_OP',
+  descr => 'is adjacent to',
   oprname => '-|-', oprleft => 'anymultirange', oprright => 'anymultirange',
   oprresult => 'bool', oprcom => '-|-(anymultirange,anymultirange)',
   oprcode => 'multirange_adjacent_multirange', oprrest => 'matchingsel',
@@ -3428,32 +3436,38 @@
   oprname => '*', oprleft => 'anymultirange', oprright => 'anymultirange',
   oprresult => 'anymultirange', oprcom => '*(anymultirange,anymultirange)',
   oprcode => 'multirange_intersect' },
-{ oid => '4395', oid_symbol => 'OID_RANGE_LEFT_MULTIRANGE_OP', descr => 'is left of',
+{ oid => '4395', oid_symbol => 'OID_RANGE_LEFT_MULTIRANGE_OP',
+  descr => 'is left of',
   oprname => '<<', oprleft => 'anyrange', oprright => 'anymultirange',
   oprresult => 'bool', oprcom => '>>(anymultirange,anyrange)',
   oprcode => 'range_before_multirange', oprrest => 'multirangesel',
   oprjoin => 'scalarltjoinsel' },
-{ oid => '4396', oid_symbol => 'OID_MULTIRANGE_LEFT_RANGE_OP', descr => 'is left of',
+{ oid => '4396', oid_symbol => 'OID_MULTIRANGE_LEFT_RANGE_OP',
+  descr => 'is left of',
   oprname => '<<', oprleft => 'anymultirange', oprright => 'anyrange',
   oprresult => 'bool', oprcom => '>>(anyrange,anymultirange)',
   oprcode => 'multirange_before_range', oprrest => 'multirangesel',
   oprjoin => 'scalarltjoinsel' },
-{ oid => '4397', oid_symbol => 'OID_MULTIRANGE_LEFT_MULTIRANGE_OP', descr => 'is left of',
+{ oid => '4397', oid_symbol => 'OID_MULTIRANGE_LEFT_MULTIRANGE_OP',
+  descr => 'is left of',
   oprname => '<<', oprleft => 'anymultirange', oprright => 'anymultirange',
   oprresult => 'bool', oprcom => '>>(anymultirange,anymultirange)',
   oprcode => 'multirange_before_multirange', oprrest => 'multirangesel',
   oprjoin => 'scalarltjoinsel' },
-{ oid => '4398', oid_symbol => 'OID_RANGE_RIGHT_MULTIRANGE_OP', descr => 'is right of',
+{ oid => '4398', oid_symbol => 'OID_RANGE_RIGHT_MULTIRANGE_OP',
+  descr => 'is right of',
   oprname => '>>', oprleft => 'anyrange', oprright => 'anymultirange',
   oprresult => 'bool', oprcom => '<<(anymultirange,anyrange)',
   oprcode => 'range_after_multirange', oprrest => 'multirangesel',
   oprjoin => 'scalargtjoinsel' },
-{ oid => '4399', oid_symbol => 'OID_MULTIRANGE_RIGHT_RANGE_OP', descr => 'is right of',
+{ oid => '4399', oid_symbol => 'OID_MULTIRANGE_RIGHT_RANGE_OP',
+  descr => 'is right of',
   oprname => '>>', oprleft => 'anymultirange', oprright => 'anyrange',
   oprresult => 'bool', oprcom => '<<(anyrange,anymultirange)',
   oprcode => 'multirange_after_range', oprrest => 'multirangesel',
   oprjoin => 'scalargtjoinsel' },
-{ oid => '4400', oid_symbol => 'OID_MULTIRANGE_RIGHT_MULTIRANGE_OP', descr => 'is right of',
+{ oid => '4400', oid_symbol => 'OID_MULTIRANGE_RIGHT_MULTIRANGE_OP',
+  descr => 'is right of',
   oprname => '>>', oprleft => 'anymultirange', oprright => 'anymultirange',
   oprresult => 'bool', oprcom => '<<(anymultirange,anymultirange)',
   oprcode => 'multirange_after_multirange', oprrest => 'multirangesel',

src/include/catalog/pg_range.dat

@@ -12,23 +12,23 @@
 
 [
 
-{ rngtypid => 'int4range', rngsubtype => 'int4', rngsubopc => 'btree/int4_ops',
-  rngcanonical => 'int4range_canonical', rngsubdiff => 'int4range_subdiff',
-  rngmultitypid => 'int4multirange' },
+{ rngtypid => 'int4range', rngsubtype => 'int4',
+  rngmultitypid => 'int4multirange', rngsubopc => 'btree/int4_ops',
+  rngcanonical => 'int4range_canonical', rngsubdiff => 'int4range_subdiff' },
 { rngtypid => 'numrange', rngsubtype => 'numeric',
-  rngsubopc => 'btree/numeric_ops', rngcanonical => '-',
-  rngsubdiff => 'numrange_subdiff', rngmultitypid => 'nummultirange' },
+  rngmultitypid => 'nummultirange', rngsubopc => 'btree/numeric_ops',
+  rngcanonical => '-', rngsubdiff => 'numrange_subdiff' },
 { rngtypid => 'tsrange', rngsubtype => 'timestamp',
-  rngsubopc => 'btree/timestamp_ops', rngcanonical => '-',
-  rngsubdiff => 'tsrange_subdiff', rngmultitypid => 'tsmultirange' },
+  rngmultitypid => 'tsmultirange', rngsubopc => 'btree/timestamp_ops',
+  rngcanonical => '-', rngsubdiff => 'tsrange_subdiff' },
 { rngtypid => 'tstzrange', rngsubtype => 'timestamptz',
-  rngsubopc => 'btree/timestamptz_ops', rngcanonical => '-',
-  rngsubdiff => 'tstzrange_subdiff', rngmultitypid => 'tstzmultirange' },
-{ rngtypid => 'daterange', rngsubtype => 'date', rngsubopc => 'btree/date_ops',
-  rngcanonical => 'daterange_canonical', rngsubdiff => 'daterange_subdiff',
-  rngmultitypid => 'datemultirange' },
-{ rngtypid => 'int8range', rngsubtype => 'int8', rngsubopc => 'btree/int8_ops',
-  rngcanonical => 'int8range_canonical', rngsubdiff => 'int8range_subdiff',
-  rngmultitypid => 'int8multirange' },
+  rngmultitypid => 'tstzmultirange', rngsubopc => 'btree/timestamptz_ops',
+  rngcanonical => '-', rngsubdiff => 'tstzrange_subdiff' },
+{ rngtypid => 'daterange', rngsubtype => 'date',
+  rngmultitypid => 'datemultirange', rngsubopc => 'btree/date_ops',
+  rngcanonical => 'daterange_canonical', rngsubdiff => 'daterange_subdiff' },
+{ rngtypid => 'int8range', rngsubtype => 'int8',
+  rngmultitypid => 'int8multirange', rngsubopc => 'btree/int8_ops',
+  rngcanonical => 'int8range_canonical', rngsubdiff => 'int8range_subdiff' },
 
 ]

src/include/catalog/pg_type.dat

@@ -499,36 +499,42 @@
 # multirange types
 { oid => '4451', array_type_oid => '8010', descr => 'multirange of integers',
   typname => 'int4multirange', typlen => '-1', typbyval => 'f', typtype => 'm',
-  typcategory => 'R', typinput => 'multirange_in', typoutput => 'multirange_out',
-  typreceive => 'multirange_recv', typsend => 'multirange_send',
-  typanalyze => 'multirange_typanalyze', typalign => 'i', typstorage => 'x' },
+  typcategory => 'R', typinput => 'multirange_in',
+  typoutput => 'multirange_out', typreceive => 'multirange_recv',
+  typsend => 'multirange_send', typanalyze => 'multirange_typanalyze',
+  typalign => 'i', typstorage => 'x' },
 { oid => '4532', array_type_oid => '8012', descr => 'multirange of numerics',
   typname => 'nummultirange', typlen => '-1', typbyval => 'f', typtype => 'm',
-  typcategory => 'R', typinput => 'multirange_in', typoutput => 'multirange_out',
-  typreceive => 'multirange_recv', typsend => 'multirange_send',
-  typanalyze => 'multirange_typanalyze', typalign => 'i', typstorage => 'x' },
+  typcategory => 'R', typinput => 'multirange_in',
+  typoutput => 'multirange_out', typreceive => 'multirange_recv',
+  typsend => 'multirange_send', typanalyze => 'multirange_typanalyze',
+  typalign => 'i', typstorage => 'x' },
 { oid => '4533', array_type_oid => '8014',
   descr => 'multirange of timestamps without time zone',
   typname => 'tsmultirange', typlen => '-1', typbyval => 'f', typtype => 'm',
-  typcategory => 'R', typinput => 'multirange_in', typoutput => 'multirange_out',
-  typreceive => 'multirange_recv', typsend => 'multirange_send',
-  typanalyze => 'multirange_typanalyze', typalign => 'd', typstorage => 'x' },
+  typcategory => 'R', typinput => 'multirange_in',
+  typoutput => 'multirange_out', typreceive => 'multirange_recv',
+  typsend => 'multirange_send', typanalyze => 'multirange_typanalyze',
+  typalign => 'd', typstorage => 'x' },
 { oid => '4534', array_type_oid => '8016',
   descr => 'multirange of timestamps with time zone',
   typname => 'tstzmultirange', typlen => '-1', typbyval => 'f', typtype => 'm',
-  typcategory => 'R', typinput => 'multirange_in', typoutput => 'multirange_out',
-  typreceive => 'multirange_recv', typsend => 'multirange_send',
-  typanalyze => 'multirange_typanalyze', typalign => 'd', typstorage => 'x' },
+  typcategory => 'R', typinput => 'multirange_in',
+  typoutput => 'multirange_out', typreceive => 'multirange_recv',
+  typsend => 'multirange_send', typanalyze => 'multirange_typanalyze',
+  typalign => 'd', typstorage => 'x' },
 { oid => '4535', array_type_oid => '8018', descr => 'multirange of dates',
   typname => 'datemultirange', typlen => '-1', typbyval => 'f', typtype => 'm',
-  typcategory => 'R', typinput => 'multirange_in', typoutput => 'multirange_out',
-  typreceive => 'multirange_recv', typsend => 'multirange_send',
-  typanalyze => 'multirange_typanalyze', typalign => 'i', typstorage => 'x' },
+  typcategory => 'R', typinput => 'multirange_in',
+  typoutput => 'multirange_out', typreceive => 'multirange_recv',
+  typsend => 'multirange_send', typanalyze => 'multirange_typanalyze',
+  typalign => 'i', typstorage => 'x' },
 { oid => '4536', array_type_oid => '8020', descr => 'multirange of bigints',
   typname => 'int8multirange', typlen => '-1', typbyval => 'f', typtype => 'm',
-  typcategory => 'R', typinput => 'multirange_in', typoutput => 'multirange_out',
-  typreceive => 'multirange_recv', typsend => 'multirange_send',
-  typanalyze => 'multirange_typanalyze', typalign => 'd', typstorage => 'x' },
+  typcategory => 'R', typinput => 'multirange_in',
+  typoutput => 'multirange_out', typreceive => 'multirange_recv',
+  typsend => 'multirange_send', typanalyze => 'multirange_typanalyze',
+  typalign => 'd', typstorage => 'x' },
 
 # pseudo-types
 # types with typtype='p' represent various special cases in the type system.
@@ -663,8 +669,9 @@
 { oid => '4537',
   descr => 'pseudo-type representing a polymorphic base type that is a multirange',
   typname => 'anymultirange', typlen => '-1', typbyval => 'f', typtype => 'p',
-  typcategory => 'P', typinput => 'anymultirange_in', typoutput => 'anymultirange_out',
-  typreceive => '-', typsend => '-', typalign => 'd', typstorage => 'x' },
+  typcategory => 'P', typinput => 'anymultirange_in',
+  typoutput => 'anymultirange_out', typreceive => '-', typsend => '-',
+  typalign => 'd', typstorage => 'x' },
 { oid => '4538',
   descr => 'pseudo-type representing a multirange over a polymorphic common type',
   typname => 'anycompatiblemultirange', typlen => '-1', typbyval => 'f',