Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitb09a64d

Browse files
committed
Add missing pg_description strings for pg_type entries.
I noticed that all non-composite, non-array entries in pg_type.dathad descr strings, except for "json" and the pseudo-types. Thelack for json seems certainly an oversight, and there's surelylittle reason to not have entries for the pseudo-types either.So add some."make reformat-dat-files" turned up some formatting issues inpg_amop.dat, too, so fix those in passing.No catversion bump since the backend doesn't care too much what isin pg_description.
1 parent3dc820c commitb09a64d

File tree

3 files changed

+31
-15
lines changed

3 files changed

+31
-15
lines changed

‎src/include/catalog/pg_amop.dat

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1402,8 +1402,8 @@
14021402
amoprighttype => 'box', amopstrategy => '8', amopopr => '<@(point,box)',
14031403
amopmethod => 'spgist' },
14041404
{ amopfamily => 'spgist/quad_point_ops', amoplefttype => 'point',
1405-
amoprighttype => 'point', amopstrategy => '15',amopopr => '<->(point,point)',
1406-
amopmethod => 'spgist',amoppurpose => 'o',
1405+
amoprighttype => 'point', amopstrategy => '15',amoppurpose => 'o',
1406+
amopopr => '<->(point,point)',amopmethod => 'spgist',
14071407
amopsortfamily => 'btree/float_ops' },
14081408

14091409
# SP-GiST kd_point_ops
@@ -1426,8 +1426,8 @@
14261426
amoprighttype => 'box', amopstrategy => '8', amopopr => '<@(point,box)',
14271427
amopmethod => 'spgist' },
14281428
{ amopfamily => 'spgist/kd_point_ops', amoplefttype => 'point',
1429-
amoprighttype => 'point', amopstrategy => '15',amopopr => '<->(point,point)',
1430-
amopmethod => 'spgist',amoppurpose => 'o',
1429+
amoprighttype => 'point', amopstrategy => '15',amoppurpose => 'o',
1430+
amopopr => '<->(point,point)',amopmethod => 'spgist',
14311431
amopsortfamily => 'btree/float_ops' },
14321432

14331433
# SP-GiST text_ops
@@ -1599,8 +1599,8 @@
15991599
amoprighttype => 'polygon', amopstrategy => '12',
16001600
amopopr => '|&>(polygon,polygon)', amopmethod => 'spgist' },
16011601
{ amopfamily => 'spgist/poly_ops', amoplefttype => 'polygon',
1602-
amoprighttype => 'point', amopstrategy => '15',
1603-
amopopr => '<->(polygon,point)',amoppurpose => 'o',amopmethod => 'spgist',
1602+
amoprighttype => 'point', amopstrategy => '15', amoppurpose => 'o',
1603+
amopopr => '<->(polygon,point)', amopmethod => 'spgist',
16041604
amopsortfamily => 'btree/float_ops' },
16051605

16061606
# GiST inet_ops

‎src/include/catalog/pg_type.dat

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136

137137
# OIDS 100 - 199
138138

139-
{ oid => '114', array_type_oid => '199',
139+
{ oid => '114', array_type_oid => '199', descr => 'JSON stored as text',
140140
typname => 'json', typlen => '-1', typbyval => 'f', typcategory => 'U',
141141
typinput => 'json_in', typoutput => 'json_out', typreceive => 'json_recv',
142142
typsend => 'json_send', typalign => 'i', typstorage => 'x' },
@@ -240,7 +240,7 @@
240240
typname => 'tinterval', typlen => '12', typbyval => 'f', typcategory => 'T',
241241
typinput => 'tintervalin', typoutput => 'tintervalout',
242242
typreceive => 'tintervalrecv', typsend => 'tintervalsend', typalign => 'i' },
243-
{ oid => '705',
243+
{ oid => '705', descr => 'pseudo-type representing an undetermined type',
244244
typname => 'unknown', typlen => '-2', typbyval => 'f', typtype => 'p',
245245
typcategory => 'X', typinput => 'unknownin', typoutput => 'unknownout',
246246
typreceive => 'unknownrecv', typsend => 'unknownsend', typalign => 'c' },
@@ -506,7 +506,7 @@
506506
# but there is now support for it in records and arrays. Perhaps we should
507507
# just treat it as a regular base type?
508508

509-
{ oid => '2249',
509+
{ oid => '2249', descr => 'pseudo-type representing any composite type',
510510
typname => 'record', typlen => '-1', typbyval => 'f', typtype => 'p',
511511
typcategory => 'P', typarray => '_record', typinput => 'record_in',
512512
typoutput => 'record_out', typreceive => 'record_recv',
@@ -517,76 +517,86 @@
517517
typcategory => 'P', typelem => 'record', typinput => 'array_in',
518518
typoutput => 'array_out', typreceive => 'array_recv', typsend => 'array_send',
519519
typanalyze => 'array_typanalyze', typalign => 'd', typstorage => 'x' },
520-
{ oid => '2275', array_type_oid => '1263',
520+
{ oid => '2275', array_type_oid => '1263', descr => 'C-style string',
521521
typname => 'cstring', typlen => '-2', typbyval => 'f', typtype => 'p',
522522
typcategory => 'P', typinput => 'cstring_in', typoutput => 'cstring_out',
523523
typreceive => 'cstring_recv', typsend => 'cstring_send', typalign => 'c' },
524-
{ oid => '2276',
524+
{ oid => '2276', descr => 'pseudo-type representing any type',
525525
typname => 'any', typlen => '4', typbyval => 't', typtype => 'p',
526526
typcategory => 'P', typinput => 'any_in', typoutput => 'any_out',
527527
typreceive => '-', typsend => '-', typalign => 'i' },
528-
{ oid => '2277',
528+
{ oid => '2277', descr => 'pseudo-type representing a polymorphic array type',
529529
typname => 'anyarray', typlen => '-1', typbyval => 'f', typtype => 'p',
530530
typcategory => 'P', typinput => 'anyarray_in', typoutput => 'anyarray_out',
531531
typreceive => 'anyarray_recv', typsend => 'anyarray_send', typalign => 'd',
532532
typstorage => 'x' },
533533
{ oid => '2278',
534+
descr => 'pseudo-type for the result of a function with no real result',
534535
typname => 'void', typlen => '4', typbyval => 't', typtype => 'p',
535536
typcategory => 'P', typinput => 'void_in', typoutput => 'void_out',
536537
typreceive => 'void_recv', typsend => 'void_send', typalign => 'i' },
537-
{ oid => '2279',
538+
{ oid => '2279', descr => 'pseudo-type for the result of a trigger function',
538539
typname => 'trigger', typlen => '4', typbyval => 't', typtype => 'p',
539540
typcategory => 'P', typinput => 'trigger_in', typoutput => 'trigger_out',
540541
typreceive => '-', typsend => '-', typalign => 'i' },
541542
{ oid => '3838', oid_symbol => 'EVTTRIGGEROID',
543+
descr => 'pseudo-type for the result of an event trigger function',
542544
typname => 'event_trigger', typlen => '4', typbyval => 't', typtype => 'p',
543545
typcategory => 'P', typinput => 'event_trigger_in',
544546
typoutput => 'event_trigger_out', typreceive => '-', typsend => '-',
545547
typalign => 'i' },
546548
{ oid => '2280',
549+
descr => 'pseudo-type for the result of a language handler function',
547550
typname => 'language_handler', typlen => '4', typbyval => 't', typtype => 'p',
548551
typcategory => 'P', typinput => 'language_handler_in',
549552
typoutput => 'language_handler_out', typreceive => '-', typsend => '-',
550553
typalign => 'i' },
551554
{ oid => '2281',
555+
descr => 'pseudo-type representing an internal data structure',
552556
typname => 'internal', typlen => 'SIZEOF_POINTER', typbyval => 't',
553557
typtype => 'p', typcategory => 'P', typinput => 'internal_in',
554558
typoutput => 'internal_out', typreceive => '-', typsend => '-',
555559
typalign => 'ALIGNOF_POINTER' },
556-
{ oid => '2282',
560+
{ oid => '2282', descr => 'obsolete, deprecated pseudo-type',
557561
typname => 'opaque', typlen => '4', typbyval => 't', typtype => 'p',
558562
typcategory => 'P', typinput => 'opaque_in', typoutput => 'opaque_out',
559563
typreceive => '-', typsend => '-', typalign => 'i' },
560-
{ oid => '2283',
564+
{ oid => '2283', descr => 'pseudo-type representing a polymorphic base type',
561565
typname => 'anyelement', typlen => '4', typbyval => 't', typtype => 'p',
562566
typcategory => 'P', typinput => 'anyelement_in',
563567
typoutput => 'anyelement_out', typreceive => '-', typsend => '-',
564568
typalign => 'i' },
565569
{ oid => '2776',
570+
descr => 'pseudo-type representing a polymorphic base type that is not an array',
566571
typname => 'anynonarray', typlen => '4', typbyval => 't', typtype => 'p',
567572
typcategory => 'P', typinput => 'anynonarray_in',
568573
typoutput => 'anynonarray_out', typreceive => '-', typsend => '-',
569574
typalign => 'i' },
570575
{ oid => '3500',
576+
descr => 'pseudo-type representing a polymorphic base type that is an enum',
571577
typname => 'anyenum', typlen => '4', typbyval => 't', typtype => 'p',
572578
typcategory => 'P', typinput => 'anyenum_in', typoutput => 'anyenum_out',
573579
typreceive => '-', typsend => '-', typalign => 'i' },
574580
{ oid => '3115',
581+
descr => 'pseudo-type for the result of an FDW handler function',
575582
typname => 'fdw_handler', typlen => '4', typbyval => 't', typtype => 'p',
576583
typcategory => 'P', typinput => 'fdw_handler_in',
577584
typoutput => 'fdw_handler_out', typreceive => '-', typsend => '-',
578585
typalign => 'i' },
579586
{ oid => '325',
587+
descr => 'pseudo-type for the result of an index AM handler function',
580588
typname => 'index_am_handler', typlen => '4', typbyval => 't', typtype => 'p',
581589
typcategory => 'P', typinput => 'index_am_handler_in',
582590
typoutput => 'index_am_handler_out', typreceive => '-', typsend => '-',
583591
typalign => 'i' },
584592
{ oid => '3310',
593+
descr => 'pseudo-type for the result of a tablesample method function',
585594
typname => 'tsm_handler', typlen => '4', typbyval => 't', typtype => 'p',
586595
typcategory => 'P', typinput => 'tsm_handler_in',
587596
typoutput => 'tsm_handler_out', typreceive => '-', typsend => '-',
588597
typalign => 'i' },
589598
{ oid => '3831',
599+
descr => 'pseudo-type representing a polymorphic base type that is a range',
590600
typname => 'anyrange', typlen => '-1', typbyval => 'f', typtype => 'p',
591601
typcategory => 'P', typinput => 'anyrange_in', typoutput => 'anyrange_out',
592602
typreceive => '-', typsend => '-', typalign => 'd', typstorage => 'x' },

‎src/tools/pgindent/README

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,12 @@ DOING THE INDENT RUN:
4848
If you want to use some perltidy version that's not in your PATH,
4949
first set the PERLTIDY environment variable to point to it.
5050

51+
5) Reformat the bootstrap catalog data files:
52+
53+
cd src/include/catalog
54+
make reformat-dat-files
55+
cd ../../..
56+
5157
VALIDATION:
5258

5359
1) Check for any newly-created files using "git status"; there shouldn't

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp