Skip to content

Commit f279241

Browse files
committed
psql: improve description consistency of \dTS data types
This was done particularly for geometric data types. Reported-by: Christoph Berg Discussion: https://postgr.es/m/[email protected] Co-authored-by: Kyotaro Horiguchi Backpatch-through: master
1 parent 7539a1b commit f279241

File tree

2 files changed

+24
-22
lines changed

2 files changed

+24
-22
lines changed

doc/src/sgml/datatype.sgml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3366,13 +3366,13 @@ SELECT person.name, holidays.num_weeks FROM person, holidays
33663366
<entry><type>lseg</type></entry>
33673367
<entry>32 bytes</entry>
33683368
<entry>Finite line segment</entry>
3369-
<entry>((x1,y1),(x2,y2))</entry>
3369+
<entry>[(x1,y1),(x2,y2)]</entry>
33703370
</row>
33713371
<row>
33723372
<entry><type>box</type></entry>
33733373
<entry>32 bytes</entry>
33743374
<entry>Rectangular box</entry>
3375-
<entry>((x1,y1),(x2,y2))</entry>
3375+
<entry>(x1,y1),(x2,y2)</entry>
33763376
</row>
33773377
<row>
33783378
<entry><type>path</type></entry>

src/include/catalog/pg_type.dat

+22-20
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
# OIDS 1 - 99
3333

3434
{ oid => '16', array_type_oid => '1000',
35-
descr => 'boolean, \'true\'/\'false\'',
35+
descr => 'boolean, format \'t\'/\'f\'',
3636
typname => 'bool', typlen => '1', typbyval => 't', typcategory => 'B',
3737
typispreferred => 't', typinput => 'boolin', typoutput => 'boolout',
3838
typreceive => 'boolrecv', typsend => 'boolsend', typalign => 'c' },
@@ -90,7 +90,7 @@
9090
typispreferred => 't', typinput => 'oidin', typoutput => 'oidout',
9191
typreceive => 'oidrecv', typsend => 'oidsend', typalign => 'i' },
9292
{ oid => '27', array_type_oid => '1010',
93-
descr => '(block, offset), physical location of tuple',
93+
descr => 'tuple physical location, format \'(block,offset)\'',
9494
typname => 'tid', typlen => '6', typbyval => 'f', typcategory => 'U',
9595
typinput => 'tidin', typoutput => 'tidout', typreceive => 'tidrecv',
9696
typsend => 'tidsend', typalign => 's' },
@@ -179,34 +179,34 @@
179179
# OIDS 600 - 699
180180

181181
{ oid => '600', array_type_oid => '1017',
182-
descr => 'geometric point \'(x, y)\'',
182+
descr => 'geometric point, format \'(x,y)\'',
183183
typname => 'point', typlen => '16', typbyval => 'f', typcategory => 'G',
184184
typsubscript => 'raw_array_subscript_handler', typelem => 'float8',
185185
typinput => 'point_in', typoutput => 'point_out', typreceive => 'point_recv',
186186
typsend => 'point_send', typalign => 'd' },
187187
{ oid => '601', array_type_oid => '1018',
188-
descr => 'geometric line segment \'(pt1,pt2)\'',
188+
descr => 'geometric line segment, format \'[point1,point2]\'',
189189
typname => 'lseg', typlen => '32', typbyval => 'f', typcategory => 'G',
190190
typsubscript => 'raw_array_subscript_handler', typelem => 'point',
191191
typinput => 'lseg_in', typoutput => 'lseg_out', typreceive => 'lseg_recv',
192192
typsend => 'lseg_send', typalign => 'd' },
193193
{ oid => '602', array_type_oid => '1019',
194-
descr => 'geometric path \'(pt1,...)\'',
194+
descr => 'geometric path, format \'(point1,...)\'',
195195
typname => 'path', typlen => '-1', typbyval => 'f', typcategory => 'G',
196196
typinput => 'path_in', typoutput => 'path_out', typreceive => 'path_recv',
197197
typsend => 'path_send', typalign => 'd', typstorage => 'x' },
198198
{ oid => '603', array_type_oid => '1020',
199-
descr => 'geometric box \'(lower left,upper right)\'',
199+
descr => 'geometric box, format \'lower left point,upper right point\'',
200200
typname => 'box', typlen => '32', typbyval => 'f', typcategory => 'G',
201201
typdelim => ';', typsubscript => 'raw_array_subscript_handler',
202202
typelem => 'point', typinput => 'box_in', typoutput => 'box_out',
203203
typreceive => 'box_recv', typsend => 'box_send', typalign => 'd' },
204204
{ oid => '604', array_type_oid => '1027',
205-
descr => 'geometric polygon \'(pt1,...)\'',
205+
descr => 'geometric polygon, format \'(point1,...)\'',
206206
typname => 'polygon', typlen => '-1', typbyval => 'f', typcategory => 'G',
207207
typinput => 'poly_in', typoutput => 'poly_out', typreceive => 'poly_recv',
208208
typsend => 'poly_send', typalign => 'd', typstorage => 'x' },
209-
{ oid => '628', array_type_oid => '629', descr => 'geometric line',
209+
{ oid => '628', array_type_oid => '629', descr => 'geometric line, formats \'{A,B,C}\'/\'[point1,point2]\'',
210210
typname => 'line', typlen => '24', typbyval => 'f', typcategory => 'G',
211211
typsubscript => 'raw_array_subscript_handler', typelem => 'float8',
212212
typinput => 'line_in', typoutput => 'line_out', typreceive => 'line_recv',
@@ -230,7 +230,7 @@
230230
typcategory => 'X', typinput => 'unknownin', typoutput => 'unknownout',
231231
typreceive => 'unknownrecv', typsend => 'unknownsend', typalign => 'c' },
232232
{ oid => '718', array_type_oid => '719',
233-
descr => 'geometric circle \'(center,radius)\'',
233+
descr => 'geometric circle, format \'<center point,radius>\'',
234234
typname => 'circle', typlen => '24', typbyval => 'f', typcategory => 'G',
235235
typinput => 'circle_in', typoutput => 'circle_out',
236236
typreceive => 'circle_recv', typsend => 'circle_send', typalign => 'd' },
@@ -271,14 +271,14 @@
271271
typinput => 'aclitemin', typoutput => 'aclitemout', typreceive => '-',
272272
typsend => '-', typalign => 'd' },
273273
{ oid => '1042', array_type_oid => '1014',
274-
descr => 'char(length), blank-padded string, fixed storage length',
274+
descr => '\'char(length)\' blank-padded string, fixed storage length',
275275
typname => 'bpchar', typlen => '-1', typbyval => 'f', typcategory => 'S',
276276
typinput => 'bpcharin', typoutput => 'bpcharout', typreceive => 'bpcharrecv',
277277
typsend => 'bpcharsend', typmodin => 'bpchartypmodin',
278278
typmodout => 'bpchartypmodout', typalign => 'i', typstorage => 'x',
279279
typcollation => 'default' },
280280
{ oid => '1043', array_type_oid => '1015',
281-
descr => 'varchar(length), non-blank-padded string, variable storage length',
281+
descr => '\'varchar(length)\' non-blank-padded string, variable storage length',
282282
typname => 'varchar', typlen => '-1', typbyval => 'f', typcategory => 'S',
283283
typinput => 'varcharin', typoutput => 'varcharout',
284284
typreceive => 'varcharrecv', typsend => 'varcharsend',
@@ -310,7 +310,7 @@
310310
typsend => 'timestamptz_send', typmodin => 'timestamptztypmodin',
311311
typmodout => 'timestamptztypmodout', typalign => 'd' },
312312
{ oid => '1186', array_type_oid => '1187',
313-
descr => '@ <number> <units>, time interval',
313+
descr => 'time interval, format \'number units ...\'',
314314
typname => 'interval', typlen => '16', typbyval => 'f', typcategory => 'T',
315315
typispreferred => 't', typinput => 'interval_in', typoutput => 'interval_out',
316316
typreceive => 'interval_recv', typsend => 'interval_send',
@@ -345,7 +345,7 @@
345345
# OIDS 1700 - 1799
346346

347347
{ oid => '1700', array_type_oid => '1231',
348-
descr => 'numeric(precision, decimal), arbitrary precision number',
348+
descr => '\'numeric(precision, scale)\' arbitrary precision number',
349349
typname => 'numeric', typlen => '-1', typbyval => 'f', typcategory => 'N',
350350
typinput => 'numeric_in', typoutput => 'numeric_out',
351351
typreceive => 'numeric_recv', typsend => 'numeric_send',
@@ -400,13 +400,13 @@
400400
typalign => 'i' },
401401

402402
# uuid
403-
{ oid => '2950', array_type_oid => '2951', descr => 'UUID datatype',
403+
{ oid => '2950', array_type_oid => '2951', descr => 'UUID',
404404
typname => 'uuid', typlen => '16', typbyval => 'f', typcategory => 'U',
405405
typinput => 'uuid_in', typoutput => 'uuid_out', typreceive => 'uuid_recv',
406406
typsend => 'uuid_send', typalign => 'c' },
407407

408408
# pg_lsn
409-
{ oid => '3220', array_type_oid => '3221', descr => 'PostgreSQL LSN datatype',
409+
{ oid => '3220', array_type_oid => '3221', descr => 'PostgreSQL LSN',
410410
typname => 'pg_lsn', typlen => '8', typbyval => 'FLOAT8PASSBYVAL',
411411
typcategory => 'U', typinput => 'pg_lsn_in', typoutput => 'pg_lsn_out',
412412
typreceive => 'pg_lsn_recv', typsend => 'pg_lsn_send', typalign => 'd' },
@@ -452,12 +452,12 @@
452452
typreceive => 'jsonpath_recv', typsend => 'jsonpath_send', typalign => 'i',
453453
typstorage => 'x' },
454454

455-
{ oid => '2970', array_type_oid => '2949', descr => 'txid snapshot',
455+
{ oid => '2970', array_type_oid => '2949', descr => 'transaction snapshot',
456456
typname => 'txid_snapshot', typlen => '-1', typbyval => 'f',
457457
typcategory => 'U', typinput => 'txid_snapshot_in',
458458
typoutput => 'txid_snapshot_out', typreceive => 'txid_snapshot_recv',
459459
typsend => 'txid_snapshot_send', typalign => 'd', typstorage => 'x' },
460-
{ oid => '5038', array_type_oid => '5039', descr => 'snapshot',
460+
{ oid => '5038', array_type_oid => '5039', descr => 'transaction snapshot',
461461
typname => 'pg_snapshot', typlen => '-1', typbyval => 'f', typcategory => 'U',
462462
typinput => 'pg_snapshot_in', typoutput => 'pg_snapshot_out',
463463
typreceive => 'pg_snapshot_recv', typsend => 'pg_snapshot_send',
@@ -633,7 +633,9 @@
633633
typoutput => 'tsm_handler_out', typreceive => '-', typsend => '-',
634634
typalign => 'i' },
635635
{ oid => '269',
636-
typname => 'table_am_handler', typlen => '4', typbyval => 't', typtype => 'p',
636+
typname => 'table_am_handler',
637+
descr => 'pseudo-type for the result of a table AM handler function',
638+
typlen => '4', typbyval => 't', typtype => 'p',
637639
typcategory => 'P', typinput => 'table_am_handler_in',
638640
typoutput => 'table_am_handler_out', typreceive => '-', typsend => '-',
639641
typalign => 'i' },
@@ -679,13 +681,13 @@
679681
typtype => 'p', typcategory => 'P', typinput => 'anycompatiblemultirange_in',
680682
typoutput => 'anycompatiblemultirange_out', typreceive => '-', typsend => '-',
681683
typalign => 'd', typstorage => 'x' },
682-
{ oid => '4600', descr => 'BRIN bloom summary',
684+
{ oid => '4600', descr => 'pseudo-type representing BRIN bloom summary',
683685
typname => 'pg_brin_bloom_summary', typlen => '-1', typbyval => 'f',
684686
typcategory => 'Z', typinput => 'brin_bloom_summary_in',
685687
typoutput => 'brin_bloom_summary_out',
686688
typreceive => 'brin_bloom_summary_recv', typsend => 'brin_bloom_summary_send',
687689
typalign => 'i', typstorage => 'x', typcollation => 'default' },
688-
{ oid => '4601', descr => 'BRIN minmax-multi summary',
690+
{ oid => '4601', descr => 'pseudo-type representing BRIN minmax-multi summary',
689691
typname => 'pg_brin_minmax_multi_summary', typlen => '-1', typbyval => 'f',
690692
typcategory => 'Z', typinput => 'brin_minmax_multi_summary_in',
691693
typoutput => 'brin_minmax_multi_summary_out',

0 commit comments

Comments
 (0)