Skip to content

Commit dc9a9cd

Browse files
author
Thomas G. Lockhart
committed
Make lines and support routines/operators more visible.
Add #define's for remaining "builtin" types.
1 parent cb03826 commit dc9a9cd

File tree

3 files changed

+65
-5
lines changed

3 files changed

+65
-5
lines changed

‎src/include/catalog/pg_operator.h

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
* Copyright (c) 1994, Regents of the University of California
99
*
10-
* $Id: pg_operator.h,v 1.30 1998/04/26 04:09:06 momjian Exp $
10+
* $Id: pg_operator.h,v 1.31 1998/05/09 22:48:35 thomas Exp $
1111
*
1212
* NOTES
1313
* the genbki.sh script reads this file and generates .bki
@@ -606,6 +606,14 @@ DATA(insert OID = 1590 ( ">=" PGUID 0 b t f 601 601 16 1587 0 0 0 lseg_ge
606606

607607
DATA(insert OID = 1591 ( "@-@" PGUID 0 l t f 0 601 701 0 0 0 0 lseg_length - - ));
608608

609+
DATA(insert OID = 1611 ( "?#" PGUID 0 b t f 628 628 16 1611 0 0 0 line_intersect - - ));
610+
DATA(insert OID = 1612 ( "?||" PGUID 0 b t f 628 628 16 1612 0 0 0 line_parallel - - ));
611+
DATA(insert OID = 1613 ( "?-|" PGUID 0 b t f 628 628 16 1613 0 0 0 line_perp - - ));
612+
DATA(insert OID = 1614 ( "?-" PGUID 0 l t f 0 628 16 1614 0 0 0 line_horizontal - - ));
613+
DATA(insert OID = 1615 ( "?|" PGUID 0 l t f 0 628 16 1615 0 0 0 line_vertical - - ));
614+
DATA(insert OID = 1616 ( "=" PGUID 0 b t f 628 628 16 1616 0 0 0 line_eq intltsel - ));
615+
DATA(insert OID = 1617 ( "#" PGUID 0 b t f 628 628 600 1617 0 0 0 line_interpt - - ));
616+
609617
/*
610618
* function prototypes
611619
*/

‎src/include/catalog/pg_proc.h

Lines changed: 46 additions & 3 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.55 1998/04/29 12:39:32 scrappy Exp $
9+
* $Id: pg_proc.h,v 1.56 1998/05/09 22:48:36 thomas Exp $
1010
*
1111
* NOTES
1212
* The script catalog/genbki.sh reads this file and generates .bki
@@ -651,9 +651,9 @@ DESCR("greater-than");
651651
DATA(insert OID = 310 ( float84ge PGUID 11 f t f 2 f 16 "701 700" 100 0 0 100 foo bar ));
652652
DESCR("greater-than-or-equals");
653653

654-
DATA(insert OID = 311 ( ftod PGUID 11 f t f 2 f 701 "700" 100 0 0 100 foo bar ));
654+
DATA(insert OID = 311 ( ftod PGUID 11 f t f 1 f 701 "700" 100 0 0 100 foo bar ));
655655
DESCR("convert");
656-
DATA(insert OID = 312 ( dtof PGUID 11 f t f 2 f 700 "701" 100 0 0 100 foo bar ));
656+
DATA(insert OID = 312 ( dtof PGUID 11 f t f 1 f 700 "701" 100 0 0 100 foo bar ));
657657
DESCR("convert");
658658
DATA(insert OID = 313 ( i2toi4 PGUID 11 f t f 1 f 23 "21" 100 0 0 100 foo bar ));
659659
DESCR("convert");
@@ -842,6 +842,10 @@ DATA(insert OID = 658 ( namege PGUID 11 f t f 2 f 16 "19 19" 100 0 0 100
842842
DESCR("greater-than-or-equals");
843843
DATA(insert OID = 659 ( namene PGUID 11 f t f 2 f 16 "19 19" 100 0 0 100 foo bar ));
844844
DESCR("not equal");
845+
846+
DATA(insert OID = 668 ( bpchar PGUID 11 f t f 2 f 1042 "1042 23" 100 0 0 100 foo bar ));
847+
DATA(insert OID = 669 ( varchar PGUID 11 f t f 2 f 1043 "1043 23" 100 0 0 100 foo bar ));
848+
845849
DATA(insert OID = 682 ( mktinterval PGUID 11 f t f 2 f 704 "702 702" 100 0 0 100 foo bar ));
846850
DESCR("convert to interval");
847851
DATA(insert OID = 683 ( oid8eq PGUID 11 f t f 2 f 16 "30 30" 100 0 0 100 foo bar ));
@@ -1569,6 +1573,11 @@ DESCR("octet length");
15691573
DATA(insert OID = 1376 ( octet_length PGUID 14 f t f 1 f 23 "1043" 100 0 0 100 "select varcharoctetlen($1)" - ));
15701574
DESCR("octet length");
15711575

1576+
DATA(insert OID = 1374 ( char_bpchar PGUID 11 f t f 1 f 1042 "18" 100 0 0 100 foo bar ));
1577+
DATA(insert OID = 1375 ( bpchar PGUID 14 f t f 1 f 1042 "18" 100 0 0 100 "select char_bpchar($1)" - ));
1578+
DATA(insert OID = 1376 ( bpchar_char PGUID 11 f t f 1 f 18 "1042" 100 0 0 100 foo bar ));
1579+
DATA(insert OID = 1377 ( char PGUID 14 f t f 1 f 23 "1042" 100 0 0 100 "select bpchar_char($1)" - ));
1580+
15721581
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)" - ));
15731582
DESCR("extract field from datetime");
15741583
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)" - ));
@@ -1791,6 +1800,29 @@ DESCR("closest point to line on line segment");
17911800
DATA(insert OID = 1489 ( close_lseg PGUID 11 f t f 2 f 600 "601 601" 100 0 10 100 foo bar ));
17921801
DESCR("closest point to line segment on line segment");
17931802

1803+
DATA(insert OID = 1490 ( line_in PGUID 11 f t f 1 f 628 "0" 100 0 0 100 foo bar ));
1804+
DESCR("(internal)");
1805+
DATA(insert OID = 1491 ( line_out PGUID 11 f t f 1 f 23 "0" 100 0 0 100 foo bar ));
1806+
DESCR("(internal)");
1807+
DATA(insert OID = 1492 ( line_eq PGUID 11 f t f 2 f 16 "628 628" 100 0 0 100 foo bar ));
1808+
DESCR("lines equal?");
1809+
DATA(insert OID = 1493 ( line_construct_pp PGUID 11 f t f 2 f 628 "600 600" 100 0 0 100 foo bar ));
1810+
DESCR("line from points");
1811+
DATA(insert OID = 1494 ( line_interpt PGUID 11 f t f 2 f 600 "628 628" 100 0 0 100 foo bar ));
1812+
DESCR("intersection point");
1813+
DATA(insert OID = 1495 ( line_intersect PGUID 11 f t f 2 f 16 "628 628" 100 0 0 100 foo bar ));
1814+
DESCR("lines intersect?");
1815+
DATA(insert OID = 1496 ( line_parallel PGUID 11 f t f 2 f 16 "628 628" 100 0 0 100 foo bar ));
1816+
DESCR("lines parallel?");
1817+
DATA(insert OID = 1497 ( line_perp PGUID 11 f t f 2 f 16 "628 628" 100 0 0 100 foo bar ));
1818+
DESCR("lines perpendicular?");
1819+
DATA(insert OID = 1498 ( line_vertical PGUID 11 f t f 1 f 16 "628" 100 0 0 100 foo bar ));
1820+
DESCR("lines vertical?");
1821+
DATA(insert OID = 1499 ( line_horizontal PGUID 11 f t f 1 f 16 "628" 100 0 0 100 foo bar ));
1822+
DESCR("lines horizontal?");
1823+
1824+
/* OIDS 1500 - 1599 */
1825+
17941826
DATA(insert OID = 1530 ( point PGUID 14 f t f 2 f 600 "601 601" 100 0 0 100 "select lseg_interpt($1, $2)" - ));
17951827
DESCR("convert");
17961828
DATA(insert OID = 1531 ( point PGUID 14 f t f 1 f 600 "718" 100 0 0 100 "select circle_center($1)" - ));
@@ -1877,6 +1909,17 @@ DESCR("");
18771909
DATA(insert OID = 1584 ( area PGUID 14 f t f 1 f 701 "718" 100 0 0 100 "select circle_area($1)" - ));
18781910
DESCR("");
18791911

1912+
/* OIDS 1600 - 1699 */
1913+
1914+
DATA(insert OID = 1600 ( line PGUID 14 f t f 2 f 628 "600 600" 100 0 0 100 "select line_construct_pp($1, $2)" - ));
1915+
DESCR("");
1916+
DATA(insert OID = 1601 ( ishorizontal PGUID 14 f t f 1 f 16 "628" 100 0 0 100 "select line_horizontal($1)" - ));
1917+
DESCR("");
1918+
DATA(insert OID = 1602 ( isvertical PGUID 14 f t f 1 f 16 "628" 100 0 0 100 "select line_vertical($1)" - ));
1919+
DESCR("");
1920+
DATA(insert OID = 1603 ( isparallel PGUID 14 f t f 2 f 16 "628 628" 100 0 0 100 "select line_parallel($1, $2)" - ));
1921+
DESCR("");
1922+
18801923
/* Oracle Compatibility Related Functions - By Edmund Mergl <E.Mergl@bawue.de> */
18811924
DATA(insert OID = 868 ( strpos PGUID 14 f t f 2 f 23 "25 25" 100 0 0 100 "select textpos($1, $2)" - ));
18821925
DESCR("find position of substring");

‎src/include/catalog/pg_type.h

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
* Copyright (c) 1994, Regents of the University of California
99
*
10-
* $Id: pg_type.h,v 1.39 1998/04/27 03:19:10 momjian Exp $
10+
* $Id: pg_type.h,v 1.40 1998/05/09 22:48:37 thomas Exp $
1111
*
1212
* NOTES
1313
* the genbki.sh script reads this file and generates .bki
@@ -236,19 +236,25 @@ DESCR("storage manager");
236236
/* OIDS 600 - 699 */
237237
DATA(insert OID = 600 ( point PGUID 16 24 f b t \054 0 701 point_in point_out point_in point_out d _null_ ));
238238
DESCR("geometric point '(x, y)'");
239+
#define POINTOID 600
239240
DATA(insert OID = 601 ( lseg PGUID 32 48 f b t \054 0 600 lseg_in lseg_out lseg_in lseg_out d _null_ ));
240241
DESCR("geometric line segment '(pt1,pt2)'");
242+
#define LSEGOID 601
241243
DATA(insert OID = 602 ( path PGUID -1 -1 f b t \054 0 600 path_in path_out path_in path_out d _null_ ));
242244
DESCR("geometric path '(pt1,...)'");
245+
#define PATHOID 602
243246
DATA(insert OID = 603 ( box PGUID 32 100 f b t \073 0 600 box_in box_out box_in box_out d _null_ ));
244247
DESCR("geometric box '(lower left,upper right)'");
248+
#define BOXOID 603
245249
DATA(insert OID = 604 ( polygon PGUID -1 -1 f b t \054 0 -1 poly_in poly_out poly_in poly_out d _null_ ));
246250
DESCR("geometric polygon '(pt1,...)'");
251+
#define POLYGONOID 604
247252
DATA(insert OID = 605 ( filename PGUID 256 -1 f b t \054 0 18 filename_in filename_out filename_in filename_out i _null_ ));
248253
DESCR("filename used in system tables");
249254

250255
DATA(insert OID = 628 ( line PGUID 32 48 f b t \054 0 701 line_in line_out line_in line_out d _null_ ));
251256
DESCR("geometric line '(pt1,pt2)'");
257+
#define LINEOID 628
252258
DATA(insert OID = 629 ( _line PGUID -1 -1 f b t \054 0 628 array_in array_out array_in array_out d _null_ ));
253259
DESCR("");
254260

@@ -262,8 +268,10 @@ DESCR("double-precision floating point number, 8-byte");
262268
#define FLOAT8OID 701
263269
DATA(insert OID = 702 ( abstime PGUID 4 20 t b t \054 0 0 nabstimein nabstimeout nabstimein nabstimeout i _null_ ));
264270
DESCR("absolute, limited-range date and time (Unix system time)");
271+
#define ABSTIMEOID 702
265272
DATA(insert OID = 703 ( reltime PGUID 4 20 t b t \054 0 0 reltimein reltimeout reltimein reltimeout i _null_ ));
266273
DESCR("relative, limited-range time interval (Unix delta time)");
274+
#define RELTIMEOID 703
267275
DATA(insert OID = 704 ( tinterval PGUID 12 47 f b t \054 0 0 tintervalin tintervalout tintervalin tintervalout i _null_ ));
268276
DESCR("time interval '(abstime,abstime)'");
269277
DATA(insert OID = 705 ( unknown PGUID -1 -1 f b t \054 0 18 textin textout textin textout i _null_ ));
@@ -272,6 +280,7 @@ DESCR("");
272280

273281
DATA(insert OID = 718 ( circle PGUID 24 47 f b t \054 0 0 circle_in circle_out circle_in circle_out d _null_ ));
274282
DESCR("geometric circle '(center,radius)'");
283+
#define CIRCLEOID 718
275284
DATA(insert OID = 719 ( _circle PGUID -1 -1 f b t \054 0 718 array_in array_out array_in array_out d _null_ ));
276285
DATA(insert OID = 790 ( money PGUID 4 24 f b t \054 0 0 cash_in cash_out cash_in cash_out i _null_ ));
277286
DESCR("money '$d,ddd.cc'");

0 commit comments

Comments
 (0)