Skip to content

Commit d16b476

Browse files
author
Thomas G. Lockhart
committed
Remove duplicate block of declarations. Must have been introduced recently
 since I've run ./duplicate_oids (and found no problems) in the last couple of months. Add and modify some DESCR() entries to describe functions.
1 parent abedcdd commit d16b476

File tree

1 file changed

+74
-73
lines changed

1 file changed

+74
-73
lines changed

‎src/include/catalog/pg_proc.h

Lines changed: 74 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Id: pg_proc.h,v 1.38 1997/11/24 13:43:29 momjian Exp $
9+
* $Id: pg_proc.h,v 1.39 1997/11/30 22:52:24 thomas Exp $
1010
*
1111
* NOTES
1212
* The script catalog/genbki.sh reads this file and generates .bki
@@ -1517,26 +1517,26 @@ DESCR("addition");
15171517
DATA(insert OID = 1170 ( timespan_mi PGUID 11 f t f 2 f 1186 "1186 1186" 100 0 0 100 foo bar ));
15181518
DESCR("subtract");
15191519
DATA(insert OID = 1171 ( datetime_part PGUID 11 f t f 2 f 701 "25 1184" 100 0 0 100 foo bar ));
1520-
DESCR("get part of datetime field");
1520+
DESCR("extract field from datetime");
15211521
DATA(insert OID = 1172 ( timespan_part PGUID 11 f t f 2 f 701 "25 1186" 100 0 0 100 foo bar ));
1522-
DESCR("get part of timespan field");
1522+
DESCR("extract field from timespan");
15231523

15241524
DATA(insert OID = 1173 ( abstime_datetime PGUID 11 f t f 1 f 1184 "702" 100 0 0 100 foo bar ));
1525-
DESCR("convert");
1525+
DESCR("convert abstime to datetime");
15261526
DATA(insert OID = 1174 ( date_datetime PGUID 11 f t f 1 f 1184 "1082" 100 0 0 100 foo bar ));
1527-
DESCR("convert");
1527+
DESCR("convert date to datetime");
15281528
DATA(insert OID = 1175 ( stamp_datetime PGUID 11 f t f 1 f 1184 "1296" 100 0 0 100 foo bar ));
1529-
DESCR("convert");
1529+
DESCR("convert timestamp to datetime");
15301530
DATA(insert OID = 1176 ( datet_datetime PGUID 11 f t f 2 f 1184 "1082 1083" 100 0 0 100 foo bar ));
1531-
DESCR("convert");
1531+
DESCR("convert date and time to datetime");
15321532
DATA(insert OID = 1177 ( reltime_timespan PGUID 11 f t f 1 f 1186 "703" 100 0 0 100 foo bar ));
1533-
DESCR("convert");
1533+
DESCR("convert reltime to timespan");
15341534
DATA(insert OID = 1178 ( datetime_date PGUID 11 f t f 1 f 1082 "1184" 100 0 0 100 foo bar ));
1535-
DESCR("convert");
1535+
DESCR("convert datetime to date");
15361536
DATA(insert OID = 1179 ( abstime_date PGUID 11 f t f 1 f 1082 "702" 100 0 0 100 foo bar ));
1537-
DESCR("convert");
1537+
DESCR("convert abstime to date");
15381538
DATA(insert OID = 1180 ( datetime_abstime PGUID 11 f t f 1 f 702 "1184" 100 0 0 100 foo bar ));
1539-
DESCR("convert");
1539+
DESCR("convert datetime to abstime");
15401540

15411541
DATA(insert OID = 1188 ( datetime_mi PGUID 11 f t f 2 f 1186 "1184 1184" 100 0 0 100 foo bar ));
15421542
DESCR("subtract");
@@ -1573,18 +1573,6 @@ DESCR("truncate datetime to specified units");
15731573
DATA(insert OID = 1218 ( timespan_trunc PGUID 11 f t f 2 f 1186 "25 1186" 100 0 0 100 foo bar ));
15741574
DESCR("truncate timespan to specified units");
15751575

1576-
DATA(insert OID = 1290 ( char2icregexeq PGUID 11 f t f 2 f 16 "409 25" 100 0 0 100 foo bar ));
1577-
DESCR("matches regex., case-insensitive");
1578-
DATA(insert OID = 1291 ( char2icregexne PGUID 11 f t f 2 f 16 "409 25" 100 0 0 100 foo bar ));
1579-
DESCR("does not match regex., case-insensitive");
1580-
DATA(insert OID = 1292 ( char4icregexeq PGUID 11 f t f 2 f 16 "410 25" 100 0 0 100 foo bar ));
1581-
DESCR("matches regex., case-insensitive");
1582-
DATA(insert OID = 1293 ( char4icregexne PGUID 11 f t f 2 f 16 "410 25" 100 0 0 100 foo bar ));
1583-
DESCR("does not match regex., case-insensitive");
1584-
DATA(insert OID = 1294 ( char8icregexeq PGUID 11 f t f 2 f 16 "411 25" 100 0 0 100 foo bar ));
1585-
DESCR("matches regex., case-insensitive");
1586-
DATA(insert OID = 1295 ( char8icregexne PGUID 11 f t f 2 f 16 "411 25" 100 0 0 100 foo bar ));
1587-
DESCR("does not match regex., case-insensitive");
15881576
DATA(insert OID = 1236 ( char16icregexeq PGUID 11 f t f 2 f 16 "20 25" 100 0 0 100 foo bar ));
15891577
DESCR("matches regex., case-insensitive");
15901578
DATA(insert OID = 1237 ( char16icregexne PGUID 11 f t f 2 f 16 "20 25" 100 0 0 100 foo bar ));
@@ -1598,12 +1586,25 @@ DESCR("matches regex., case-insensitive");
15981586
DATA(insert OID = 1241 ( nameicregexne PGUID 11 f t f 2 f 16 "19 25" 100 0 0 100 foo bar ));
15991587
DESCR("does not match regex., case-insensitive");
16001588

1589+
DATA(insert OID = 1290 ( char2icregexeq PGUID 11 f t f 2 f 16 "409 25" 100 0 0 100 foo bar ));
1590+
DESCR("matches regex., case-insensitive");
1591+
DATA(insert OID = 1291 ( char2icregexne PGUID 11 f t f 2 f 16 "409 25" 100 0 0 100 foo bar ));
1592+
DESCR("does not match regex., case-insensitive");
1593+
DATA(insert OID = 1292 ( char4icregexeq PGUID 11 f t f 2 f 16 "410 25" 100 0 0 100 foo bar ));
1594+
DESCR("matches regex., case-insensitive");
1595+
DATA(insert OID = 1293 ( char4icregexne PGUID 11 f t f 2 f 16 "410 25" 100 0 0 100 foo bar ));
1596+
DESCR("does not match regex., case-insensitive");
1597+
DATA(insert OID = 1294 ( char8icregexeq PGUID 11 f t f 2 f 16 "411 25" 100 0 0 100 foo bar ));
1598+
DESCR("matches regex., case-insensitive");
1599+
DATA(insert OID = 1295 ( char8icregexne PGUID 11 f t f 2 f 16 "411 25" 100 0 0 100 foo bar ));
1600+
DESCR("does not match regex., case-insensitive");
1601+
16011602
DATA(insert OID = 1297 ( timestamp_in PGUID 11 f t f 1 f 1296 "0" 100 0 0 100 foo bar ));
16021603
DESCR("(internal)");
16031604
DATA(insert OID = 1298 ( timestamp_out PGUID 11 f t f 1 f 23 "0" 100 0 0 100 foo bar ));
16041605
DESCR("(internal)");
16051606
DATA(insert OID = 1299 ( now PGUID 11 f t f 0 f 1296 "0" 100 0 0 100 foo bar ));
1606-
DESCR("(internal)");
1607+
DESCR("current transaction time");
16071608

16081609
/* OIDS 1300 - 1399 */
16091610

@@ -1697,25 +1698,25 @@ DATA(insert OID = 1370 ( timestamp PGUID 14 f t f 1 f 1296 "1184" 100 0 0 10
16971698
DESCR("convert");
16981699

16991700
DATA(insert OID = 1380 ( date_part PGUID 14 f t f 2 f 701 "25 1184" 100 0 0 100 "select datetime_part($1, $2)" - ));
1700-
DESCR("get part of date");
1701+
DESCR("extract field from datetime");
17011702
DATA(insert OID = 1381 ( date_part PGUID 14 f t f 2 f 701 "25 1186" 100 0 0 100 "select timespan_part($1, $2)" - ));
1702-
DESCR("get part of date");
1703+
DESCR("extract field from timespan");
17031704
DATA(insert OID = 1382 ( date_part PGUID 14 f t f 2 f 701 "25 702" 100 0 0 100 "select datetime_part($1, datetime($2))" - ));
1704-
DESCR("get part of date");
1705+
DESCR("extract field from abstime");
17051706
DATA(insert OID = 1383 ( date_part PGUID 14 f t f 2 f 701 "25 703" 100 0 0 100 "select timespan_part($1, timespan($2))" - ));
1706-
DESCR("get part of date");
1707+
DESCR("extract field from reltime");
17071708
DATA(insert OID = 1384 ( date_part PGUID 14 f t f 2 f 701 "25 1082" 100 0 0 100 "select datetime_part($1, datetime($2))" - ));
1708-
DESCR("get part of date");
1709+
DESCR("extract field from date");
17091710
DATA(insert OID = 1385 ( date_part PGUID 14 f t f 2 f 701 "25 1083" 100 0 0 100 "select timespan_part($1, timespan($2))" - ));
1710-
DESCR("get part of date");
1711+
DESCR("extract field from time");
17111712
DATA(insert OID = 1386 ( date_trunc PGUID 14 f t f 2 f 1184 "25 1184" 100 0 0 100 "select datetime_trunc($1, $2)" - ));
1712-
DESCR("truncate date");
1713+
DESCR("truncate datetime to field");
17131714
DATA(insert OID = 1387 ( date_trunc PGUID 14 f t f 2 f 1186 "25 1186" 100 0 0 100 "select timespan_trunc($1, $2)" - ));
1714-
DESCR("truncate date");
1715+
DESCR("truncate timespan to field");
17151716
DATA(insert OID = 1388 ( age PGUID 14 f t f 2 f 1186 "1184 1184" 100 0 0 100 "select datetime_age($1, $2)" - ));
1716-
DESCR("get difference");
1717+
DESCR("difference between datetimes but leave years and months unresolved");
17171718
DATA(insert OID = 1389 ( age PGUID 14 f t f 1 f 1186 "1184" 100 0 0 100 "select datetime_age(\'today\', $1)" - ));
1718-
DESCR("get difference");
1719+
DESCR("difference between datetime and today but leave years and months unresolved");
17191720

17201721
DATA(insert OID = 1390 ( isfinite PGUID 14 f t f 1 f 16 "1184" 100 0 0 100 "select datetime_finite($1)" - ));
17211722
DESCR("");
@@ -1728,65 +1729,65 @@ DESCR("");
17281729
/* OIDS 1400 - 1499 */
17291730

17301731
DATA(insert OID = 1400 ( float PGUID 14 f t f 1 f 701 "701" 100 0 0 100 "select $1" - ));
1731-
DESCR("convert");
1732+
DESCR("convert float8 to float8 (no-op)");
17321733
DATA(insert OID = 1401 ( float PGUID 14 f t f 1 f 701 "700" 100 0 0 100 "select ftod($1)" - ));
1733-
DESCR("convert");
1734+
DESCR("convert float4 to float8");
17341735
DATA(insert OID = 1402 ( float4 PGUID 14 f t f 1 f 700 "700" 100 0 0 100 "select $1" - ));
1735-
DESCR("convert");
1736+
DESCR("convert float4 to float4 (no-op)");
17361737
DATA(insert OID = 1403 ( float4 PGUID 14 f t f 1 f 700 "701" 100 0 0 100 "select dtof($1)" - ));
1737-
DESCR("convert");
1738+
DESCR("convert float8 to float4");
17381739
DATA(insert OID = 1404 ( int PGUID 14 f t f 1 f 23 "23" 100 0 0 100 "select $1" - ));
1739-
DESCR("convert");
1740+
DESCR("convert int4 to int4 (no-op)");
17401741
DATA(insert OID = 1405 ( int2 PGUID 14 f t f 1 f 21 "21" 100 0 0 100 "select $1" - ));
1741-
DESCR("convert");
1742+
DESCR("convert int2 to int2 (no-op)");
17421743

17431744
DATA(insert OID = 1406 ( float8 PGUID 14 f t f 1 f 701 "701" 100 0 0 100 "select $1" - ));
1744-
DESCR("convert");
1745+
DESCR("convert float8 to float8 (no-op)");
17451746
DATA(insert OID = 1407 ( float8 PGUID 14 f t f 1 f 701 "700" 100 0 0 100 "select ftod($1)" - ));
1746-
DESCR("convert");
1747+
DESCR("convert float4 to float8");
17471748
DATA(insert OID = 1408 ( float8 PGUID 14 f t f 1 f 701 "23" 100 0 0 100 "select i4tod($1)" - ));
1748-
DESCR("convert");
1749+
DESCR("convert int4 to float8");
17491750
DATA(insert OID = 1409 ( float8 PGUID 14 f t f 1 f 701 "21" 100 0 0 100 "select i2tod($1)" - ));
1750-
DESCR("convert");
1751+
DESCR("convert int2 to float8");
17511752
DATA(insert OID = 1410 ( float4 PGUID 14 f t f 1 f 700 "23" 100 0 0 100 "select i4tof($1)" - ));
1752-
DESCR("convert");
1753+
DESCR("convert int4 to float4");
17531754
DATA(insert OID = 1411 ( float4 PGUID 14 f t f 1 f 700 "21" 100 0 0 100 "select i2tof($1)" - ));
1754-
DESCR("convert");
1755+
DESCR("convert int2 to float4");
17551756
DATA(insert OID = 1412 ( int4 PGUID 14 f t f 1 f 23 "23" 100 0 0 100 "select $1" - ));
1756-
DESCR("convert");
1757+
DESCR("convert int4 to int4 (no-op)");
17571758
DATA(insert OID = 1413 ( int4 PGUID 14 f t f 1 f 23 "701" 100 0 0 100 "select dtoi4($1)" - ));
1758-
DESCR("convert");
1759+
DESCR("convert float8 to int4");
17591760
DATA(insert OID = 1414 ( int4 PGUID 14 f t f 1 f 23 "21" 100 0 0 100 "select i2toi4($1)" - ));
1760-
DESCR("convert");
1761+
DESCR("convert int2 to int4");
17611762
DATA(insert OID = 1415 ( int4 PGUID 14 f t f 1 f 23 "700" 100 0 0 100 "select ftoi4($1)" - ));
1762-
DESCR("convert");
1763+
DESCR("convert float4 to int4");
17631764
DATA(insert OID = 1416 ( int2 PGUID 14 f t f 1 f 21 "21" 100 0 0 100 "select $1" - ));
1764-
DESCR("convert");
1765+
DESCR("convert int2 to int2 (no-op)");
17651766
DATA(insert OID = 1417 ( int2 PGUID 14 f t f 1 f 21 "23" 100 0 0 100 "select i4toi2($1)" - ));
1766-
DESCR("convert");
1767+
DESCR("convert int4 to int2");
17671768
DATA(insert OID = 1418 ( int2 PGUID 14 f t f 1 f 21 "701" 100 0 0 100 "select dtoi2($1)" - ));
1768-
DESCR("convert");
1769+
DESCR("convert float8 to int2");
17691770
DATA(insert OID = 1419 ( int2 PGUID 14 f t f 1 f 21 "700" 100 0 0 100 "select ftoi2($1)" - ));
1770-
DESCR("convert");
1771+
DESCR("convert float4 to int2");
17711772

17721773
DATA(insert OID = 1421 ( box PGUID 11 f t f 2 f 603 "600 600" 100 0 0 100 foo bar ));
1773-
DESCR("convert");
1774+
DESCR("convert points to box");
17741775
DATA(insert OID = 1422 ( box_add PGUID 11 f t f 2 f 603 "603 600" 100 0 0 100 foo bar ));
1775-
DESCR("addition");
1776+
DESCR("add point to box (translate)");
17761777
DATA(insert OID = 1423 ( box_sub PGUID 11 f t f 2 f 603 "603 600" 100 0 0 100 foo bar ));
1777-
DESCR("subtract");
1778+
DESCR("subtract point from box (translate)");
17781779
DATA(insert OID = 1424 ( box_mul PGUID 11 f t f 2 f 603 "603 600" 100 0 0 100 foo bar ));
1779-
DESCR("multiply");
1780+
DESCR("multiply box by point (scale)");
17801781
DATA(insert OID = 1425 ( box_div PGUID 11 f t f 2 f 603 "603 600" 100 0 0 100 foo bar ));
1781-
DESCR("divide");
1782+
DESCR("divide box by point (scale)");
17821783
DATA(insert OID = 1426 ( path_contain_pt PGUID 11 f t f 2 f 16 "601 600" 100 0 0 100 foo bar ));
1783-
DESCR("contains");
1784+
DESCR("path contains point?");
17841785
DATA(insert OID = 1427 ( pt_contained_path PGUID 11 f t f 2 f 16 "600 601" 100 0 0 100 foo bar ));
1785-
DESCR("");
1786+
DESCR("point contained in path?");
17861787
DATA(insert OID = 1428 ( poly_contain_pt PGUID 11 f t f 2 f 16 "604 600" 100 0 0 100 foo bar ));
1787-
DESCR("contains");
1788+
DESCR("polygon contains point?");
17881789
DATA(insert OID = 1429 ( pt_contained_poly PGUID 11 f t f 2 f 16 "600 604" 100 0 0 100 foo bar ));
1789-
DESCR("");
1790+
DESCR("point contained by polygon?");
17901791

17911792
DATA(insert OID = 1430 ( path_isclosed PGUID 11 f t f 1 f 16 "602" 100 0 0 100 foo bar ));
17921793
DESCR("");
@@ -1810,26 +1811,26 @@ DATA(insert OID = 1439 ( path_div_pt PGUID 11 f t f 2 f 602 "602 600" 100 0 0
18101811
DESCR("divide");
18111812

18121813
DATA(insert OID = 1440 ( point PGUID 11 f t f 2 f 600 "701 701" 100 0 0 100 foo bar ));
1813-
DESCR("");
1814+
DESCR("convert x, y to point");
18141815
DATA(insert OID = 1441 ( point_add PGUID 11 f t f 2 f 600 "600 600" 100 0 0 100 foo bar ));
1815-
DESCR("addition");
1816+
DESCR("add points (translate)");
18161817
DATA(insert OID = 1442 ( point_sub PGUID 11 f t f 2 f 600 "600 600" 100 0 0 100 foo bar ));
1817-
DESCR("subtract");
1818+
DESCR("subtract points (translate)");
18181819
DATA(insert OID = 1443 ( point_mul PGUID 11 f t f 2 f 600 "600 600" 100 0 0 100 foo bar ));
1819-
DESCR("multiply");
1820+
DESCR("multiply points (scale/rotate)");
18201821
DATA(insert OID = 1444 ( point_div PGUID 11 f t f 2 f 600 "600 600" 100 0 0 100 foo bar ));
1821-
DESCR("divide");
1822+
DESCR("divide points (scale/rotate)");
18221823

18231824
DATA(insert OID = 1445 ( poly_npoints PGUID 11 f t f 1 f 23 "604" 100 0 0 100 foo bar ));
1824-
DESCR("");
1825+
DESCR("number of points in polygon");
18251826
DATA(insert OID = 1446 ( poly_box PGUID 11 f t f 1 f 603 "604" 100 0 0 100 foo bar ));
1826-
DESCR("");
1827+
DESCR("convert polygon to bounding box");
18271828
DATA(insert OID = 1447 ( poly_path PGUID 11 f t f 1 f 602 "604" 100 0 0 100 foo bar ));
1828-
DESCR("");
1829+
DESCR("convert polygon to path");
18291830
DATA(insert OID = 1448 ( box_poly PGUID 11 f t f 1 f 604 "603" 100 0 0 100 foo bar ));
1830-
DESCR("");
1831+
DESCR("convert box to polygon");
18311832
DATA(insert OID = 1449 ( path_poly PGUID 11 f t f 1 f 604 "602" 100 0 0 100 foo bar ));
1832-
DESCR("");
1833+
DESCR("convert path to polygon");
18331834

18341835
DATA(insert OID = 1450 ( circle_in PGUID 11 f t f 1 f 718 "0" 100 0 1 0 foo bar ));
18351836
DESCR("(internal)");

0 commit comments

Comments
 (0)