From dc9a9cdfb9d5f823e69f30a6b7a13cf57531e32d Mon Sep 17 00:00:00 2001 From: "Thomas G. Lockhart" Date: Sat, 9 May 1998 22:48:37 +0000 Subject: [PATCH] Make lines and support routines/operators more visible. Add #define's for remaining "builtin" types. --- src/include/catalog/pg_operator.h | 10 ++++++- src/include/catalog/pg_proc.h | 49 +++++++++++++++++++++++++++++-- src/include/catalog/pg_type.h | 11 ++++++- 3 files changed, 65 insertions(+), 5 deletions(-) diff --git a/src/include/catalog/pg_operator.h b/src/include/catalog/pg_operator.h index 0293fe7598..ccb7089bea 100644 --- a/src/include/catalog/pg_operator.h +++ b/src/include/catalog/pg_operator.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pg_operator.h,v 1.30 1998/04/26 04:09:06 momjian Exp $ + * $Id: pg_operator.h,v 1.31 1998/05/09 22:48:35 thomas Exp $ * * NOTES * 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 DATA(insert OID = 1591 ( "@-@" PGUID 0 l t f 0 601 701 0 0 0 0 lseg_length - - )); +DATA(insert OID = 1611 ( "?#" PGUID 0 b t f 628 628 16 1611 0 0 0 line_intersect - - )); +DATA(insert OID = 1612 ( "?||" PGUID 0 b t f 628 628 16 1612 0 0 0 line_parallel - - )); +DATA(insert OID = 1613 ( "?-|" PGUID 0 b t f 628 628 16 1613 0 0 0 line_perp - - )); +DATA(insert OID = 1614 ( "?-" PGUID 0 l t f 0 628 16 1614 0 0 0 line_horizontal - - )); +DATA(insert OID = 1615 ( "?|" PGUID 0 l t f 0 628 16 1615 0 0 0 line_vertical - - )); +DATA(insert OID = 1616 ( "=" PGUID 0 b t f 628 628 16 1616 0 0 0 line_eq intltsel - )); +DATA(insert OID = 1617 ( "#" PGUID 0 b t f 628 628 600 1617 0 0 0 line_interpt - - )); + /* * function prototypes */ diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h index 12d6ff91d1..40f7d01e35 100644 --- a/src/include/catalog/pg_proc.h +++ b/src/include/catalog/pg_proc.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pg_proc.h,v 1.55 1998/04/29 12:39:32 scrappy Exp $ + * $Id: pg_proc.h,v 1.56 1998/05/09 22:48:36 thomas Exp $ * * NOTES * The script catalog/genbki.sh reads this file and generates .bki @@ -651,9 +651,9 @@ DESCR("greater-than"); DATA(insert OID = 310 ( float84ge PGUID 11 f t f 2 f 16 "701 700" 100 0 0 100 foo bar )); DESCR("greater-than-or-equals"); -DATA(insert OID = 311 ( ftod PGUID 11 f t f 2 f 701 "700" 100 0 0 100 foo bar )); +DATA(insert OID = 311 ( ftod PGUID 11 f t f 1 f 701 "700" 100 0 0 100 foo bar )); DESCR("convert"); -DATA(insert OID = 312 ( dtof PGUID 11 f t f 2 f 700 "701" 100 0 0 100 foo bar )); +DATA(insert OID = 312 ( dtof PGUID 11 f t f 1 f 700 "701" 100 0 0 100 foo bar )); DESCR("convert"); DATA(insert OID = 313 ( i2toi4 PGUID 11 f t f 1 f 23 "21" 100 0 0 100 foo bar )); 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 DESCR("greater-than-or-equals"); DATA(insert OID = 659 ( namene PGUID 11 f t f 2 f 16 "19 19" 100 0 0 100 foo bar )); DESCR("not equal"); + +DATA(insert OID = 668 ( bpchar PGUID 11 f t f 2 f 1042 "1042 23" 100 0 0 100 foo bar )); +DATA(insert OID = 669 ( varchar PGUID 11 f t f 2 f 1043 "1043 23" 100 0 0 100 foo bar )); + DATA(insert OID = 682 ( mktinterval PGUID 11 f t f 2 f 704 "702 702" 100 0 0 100 foo bar )); DESCR("convert to interval"); 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"); DATA(insert OID = 1376 ( octet_length PGUID 14 f t f 1 f 23 "1043" 100 0 0 100 "select varcharoctetlen($1)" - )); DESCR("octet length"); +DATA(insert OID = 1374 ( char_bpchar PGUID 11 f t f 1 f 1042 "18" 100 0 0 100 foo bar )); +DATA(insert OID = 1375 ( bpchar PGUID 14 f t f 1 f 1042 "18" 100 0 0 100 "select char_bpchar($1)" - )); +DATA(insert OID = 1376 ( bpchar_char PGUID 11 f t f 1 f 18 "1042" 100 0 0 100 foo bar )); +DATA(insert OID = 1377 ( char PGUID 14 f t f 1 f 23 "1042" 100 0 0 100 "select bpchar_char($1)" - )); + 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)" - )); DESCR("extract field from datetime"); 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"); DATA(insert OID = 1489 ( close_lseg PGUID 11 f t f 2 f 600 "601 601" 100 0 10 100 foo bar )); DESCR("closest point to line segment on line segment"); +DATA(insert OID = 1490 ( line_in PGUID 11 f t f 1 f 628 "0" 100 0 0 100 foo bar )); +DESCR("(internal)"); +DATA(insert OID = 1491 ( line_out PGUID 11 f t f 1 f 23 "0" 100 0 0 100 foo bar )); +DESCR("(internal)"); +DATA(insert OID = 1492 ( line_eq PGUID 11 f t f 2 f 16 "628 628" 100 0 0 100 foo bar )); +DESCR("lines equal?"); +DATA(insert OID = 1493 ( line_construct_pp PGUID 11 f t f 2 f 628 "600 600" 100 0 0 100 foo bar )); +DESCR("line from points"); +DATA(insert OID = 1494 ( line_interpt PGUID 11 f t f 2 f 600 "628 628" 100 0 0 100 foo bar )); +DESCR("intersection point"); +DATA(insert OID = 1495 ( line_intersect PGUID 11 f t f 2 f 16 "628 628" 100 0 0 100 foo bar )); +DESCR("lines intersect?"); +DATA(insert OID = 1496 ( line_parallel PGUID 11 f t f 2 f 16 "628 628" 100 0 0 100 foo bar )); +DESCR("lines parallel?"); +DATA(insert OID = 1497 ( line_perp PGUID 11 f t f 2 f 16 "628 628" 100 0 0 100 foo bar )); +DESCR("lines perpendicular?"); +DATA(insert OID = 1498 ( line_vertical PGUID 11 f t f 1 f 16 "628" 100 0 0 100 foo bar )); +DESCR("lines vertical?"); +DATA(insert OID = 1499 ( line_horizontal PGUID 11 f t f 1 f 16 "628" 100 0 0 100 foo bar )); +DESCR("lines horizontal?"); + +/* OIDS 1500 - 1599 */ + DATA(insert OID = 1530 ( point PGUID 14 f t f 2 f 600 "601 601" 100 0 0 100 "select lseg_interpt($1, $2)" - )); DESCR("convert"); 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(""); DATA(insert OID = 1584 ( area PGUID 14 f t f 1 f 701 "718" 100 0 0 100 "select circle_area($1)" - )); DESCR(""); +/* OIDS 1600 - 1699 */ + +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)" - )); +DESCR(""); +DATA(insert OID = 1601 ( ishorizontal PGUID 14 f t f 1 f 16 "628" 100 0 0 100 "select line_horizontal($1)" - )); +DESCR(""); +DATA(insert OID = 1602 ( isvertical PGUID 14 f t f 1 f 16 "628" 100 0 0 100 "select line_vertical($1)" - )); +DESCR(""); +DATA(insert OID = 1603 ( isparallel PGUID 14 f t f 2 f 16 "628 628" 100 0 0 100 "select line_parallel($1, $2)" - )); +DESCR(""); + /* Oracle Compatibility Related Functions - By Edmund Mergl */ DATA(insert OID = 868 ( strpos PGUID 14 f t f 2 f 23 "25 25" 100 0 0 100 "select textpos($1, $2)" - )); DESCR("find position of substring"); diff --git a/src/include/catalog/pg_type.h b/src/include/catalog/pg_type.h index 646581564c..7130ba2a9e 100644 --- a/src/include/catalog/pg_type.h +++ b/src/include/catalog/pg_type.h @@ -7,7 +7,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: pg_type.h,v 1.39 1998/04/27 03:19:10 momjian Exp $ + * $Id: pg_type.h,v 1.40 1998/05/09 22:48:37 thomas Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -236,19 +236,25 @@ DESCR("storage manager"); /* OIDS 600 - 699 */ DATA(insert OID = 600 ( point PGUID 16 24 f b t \054 0 701 point_in point_out point_in point_out d _null_ )); DESCR("geometric point '(x, y)'"); +#define POINTOID 600 DATA(insert OID = 601 ( lseg PGUID 32 48 f b t \054 0 600 lseg_in lseg_out lseg_in lseg_out d _null_ )); DESCR("geometric line segment '(pt1,pt2)'"); +#define LSEGOID 601 DATA(insert OID = 602 ( path PGUID -1 -1 f b t \054 0 600 path_in path_out path_in path_out d _null_ )); DESCR("geometric path '(pt1,...)'"); +#define PATHOID 602 DATA(insert OID = 603 ( box PGUID 32 100 f b t \073 0 600 box_in box_out box_in box_out d _null_ )); DESCR("geometric box '(lower left,upper right)'"); +#define BOXOID 603 DATA(insert OID = 604 ( polygon PGUID -1 -1 f b t \054 0 -1 poly_in poly_out poly_in poly_out d _null_ )); DESCR("geometric polygon '(pt1,...)'"); +#define POLYGONOID 604 DATA(insert OID = 605 ( filename PGUID 256 -1 f b t \054 0 18 filename_in filename_out filename_in filename_out i _null_ )); DESCR("filename used in system tables"); DATA(insert OID = 628 ( line PGUID 32 48 f b t \054 0 701 line_in line_out line_in line_out d _null_ )); DESCR("geometric line '(pt1,pt2)'"); +#define LINEOID 628 DATA(insert OID = 629 ( _line PGUID -1 -1 f b t \054 0 628 array_in array_out array_in array_out d _null_ )); DESCR(""); @@ -262,8 +268,10 @@ DESCR("double-precision floating point number, 8-byte"); #define FLOAT8OID 701 DATA(insert OID = 702 ( abstime PGUID 4 20 t b t \054 0 0 nabstimein nabstimeout nabstimein nabstimeout i _null_ )); DESCR("absolute, limited-range date and time (Unix system time)"); +#define ABSTIMEOID 702 DATA(insert OID = 703 ( reltime PGUID 4 20 t b t \054 0 0 reltimein reltimeout reltimein reltimeout i _null_ )); DESCR("relative, limited-range time interval (Unix delta time)"); +#define RELTIMEOID 703 DATA(insert OID = 704 ( tinterval PGUID 12 47 f b t \054 0 0 tintervalin tintervalout tintervalin tintervalout i _null_ )); DESCR("time interval '(abstime,abstime)'"); 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(""); DATA(insert OID = 718 ( circle PGUID 24 47 f b t \054 0 0 circle_in circle_out circle_in circle_out d _null_ )); DESCR("geometric circle '(center,radius)'"); +#define CIRCLEOID 718 DATA(insert OID = 719 ( _circle PGUID -1 -1 f b t \054 0 718 array_in array_out array_in array_out d _null_ )); DATA(insert OID = 790 ( money PGUID 4 24 f b t \054 0 0 cash_in cash_out cash_in cash_out i _null_ )); DESCR("money '$d,ddd.cc'"); -- 2.40.0