diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/catalog/catversion.h | 4 | ||||
| -rw-r--r-- | src/include/catalog/pg_cast.h | 150 | ||||
| -rw-r--r-- | src/include/catalog/pg_proc.h | 126 | ||||
| -rw-r--r-- | src/include/nodes/execnodes.h | 15 | ||||
| -rw-r--r-- | src/include/nodes/nodes.h | 4 | ||||
| -rw-r--r-- | src/include/nodes/primnodes.h | 20 | ||||
| -rw-r--r-- | src/include/parser/parse_coerce.h | 24 | ||||
| -rw-r--r-- | src/include/utils/builtins.h | 23 | ||||
| -rw-r--r-- | src/include/utils/date.h | 8 | ||||
| -rw-r--r-- | src/include/utils/int8.h | 5 | ||||
| -rw-r--r-- | src/include/utils/timestamp.h | 8 |
11 files changed, 112 insertions, 275 deletions
diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h index 8f79a7a920..ec6d516713 100644 --- a/src/include/catalog/catversion.h +++ b/src/include/catalog/catversion.h @@ -37,7 +37,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/catversion.h,v 1.409 2007/06/01 23:40:18 neilc Exp $ + * $PostgreSQL: pgsql/src/include/catalog/catversion.h,v 1.410 2007/06/05 21:31:07 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -53,6 +53,6 @@ */ /* yyyymmddN */ -#define CATALOG_VERSION_NO 200706012 +#define CATALOG_VERSION_NO 200706051 #endif diff --git a/src/include/catalog/pg_cast.h b/src/include/catalog/pg_cast.h index 0b518265a3..82016774e8 100644 --- a/src/include/catalog/pg_cast.h +++ b/src/include/catalog/pg_cast.h @@ -10,7 +10,7 @@ * * Copyright (c) 2002-2007, PostgreSQL Global Development Group * - * $PostgreSQL: pgsql/src/include/catalog/pg_cast.h,v 1.33 2007/06/01 23:40:18 neilc Exp $ + * $PostgreSQL: pgsql/src/include/catalog/pg_cast.h,v 1.34 2007/06/05 21:31:07 tgl Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -173,7 +173,7 @@ DATA(insert ( 25 2205 1079 i )); DATA(insert ( 1043 2205 1079 i )); /* - * String category: this needs to be tightened up + * String category */ DATA(insert ( 25 1042 0 i )); DATA(insert ( 25 1043 0 i )); @@ -193,7 +193,8 @@ DATA(insert ( 1043 18 944 a )); DATA(insert ( 25 19 407 i )); DATA(insert ( 1042 19 409 i )); DATA(insert ( 1043 19 1400 i )); -/* Cross-category casts between int4 and "char" */ + +/* Allow explicit coercions between int4 and "char" */ DATA(insert ( 18 23 77 e )); DATA(insert ( 23 18 78 e )); @@ -265,127 +266,42 @@ DATA(insert ( 1560 23 1684 e )); /* * Cross-category casts to and from TEXT * - * For historical reasons, most casts to TEXT are implicit. This is BAD - * and should be reined in. + * We need entries here only for a few specialized cases where the behavior + * of the cast function differs from the datatype's I/O functions. Otherwise, + * parse_coerce.c will generate CoerceViaIO operations without any prompting. + * + * Note that the castcontext values specified here should be no stronger than + * parse_coerce.c's automatic casts ('a' to text, 'e' from text) else odd + * behavior will ensue when the automatic cast is applied instead of the + * pg_cast entry! */ -DATA(insert ( 20 25 1289 i )); -DATA(insert ( 25 20 1290 e )); -DATA(insert ( 21 25 113 i )); -DATA(insert ( 25 21 818 e )); -DATA(insert ( 23 25 112 i )); -DATA(insert ( 25 23 819 e )); -DATA(insert ( 26 25 114 i )); -DATA(insert ( 25 26 817 e )); -DATA(insert ( 25 650 1714 e )); -DATA(insert ( 700 25 841 i )); -DATA(insert ( 25 700 839 e )); -DATA(insert ( 701 25 840 i )); -DATA(insert ( 25 701 838 e )); -DATA(insert ( 829 25 752 e )); -DATA(insert ( 25 829 767 e )); -DATA(insert ( 650 25 730 e )); -DATA(insert ( 869 25 730 e )); -DATA(insert ( 25 869 1713 e )); -DATA(insert ( 1082 25 749 i )); -DATA(insert ( 25 1082 748 e )); -DATA(insert ( 1083 25 948 i )); -DATA(insert ( 25 1083 837 e )); -DATA(insert ( 1114 25 2034 i )); -DATA(insert ( 25 1114 2022 e )); -DATA(insert ( 1184 25 1192 i )); -DATA(insert ( 25 1184 1191 e )); -DATA(insert ( 1186 25 1193 i )); -DATA(insert ( 25 1186 1263 e )); -DATA(insert ( 1266 25 939 i )); -DATA(insert ( 25 1266 938 e )); -DATA(insert ( 1700 25 1688 i )); -DATA(insert ( 25 1700 1686 e )); -DATA(insert ( 142 25 2922 e )); +DATA(insert ( 650 25 730 a )); +DATA(insert ( 869 25 730 a )); +DATA(insert ( 16 25 2971 a )); +DATA(insert ( 142 25 2922 a )); DATA(insert ( 25 142 2896 e )); -DATA(insert ( 16 25 2971 e )); -DATA(insert ( 25 16 2970 e )); /* * Cross-category casts to and from VARCHAR * - * We support all the same casts as for TEXT, but none are implicit. + * We support all the same casts as for TEXT. */ -DATA(insert ( 20 1043 1289 a )); -DATA(insert ( 1043 20 1290 e )); -DATA(insert ( 21 1043 113 a )); -DATA(insert ( 1043 21 818 e )); -DATA(insert ( 23 1043 112 a )); -DATA(insert ( 1043 23 819 e )); -DATA(insert ( 26 1043 114 a )); -DATA(insert ( 1043 26 817 e )); -DATA(insert ( 1043 650 1714 e )); -DATA(insert ( 700 1043 841 a )); -DATA(insert ( 1043 700 839 e )); -DATA(insert ( 701 1043 840 a )); -DATA(insert ( 1043 701 838 e )); -DATA(insert ( 829 1043 752 e )); -DATA(insert ( 1043 829 767 e )); -DATA(insert ( 650 1043 730 e )); -DATA(insert ( 869 1043 730 e )); -DATA(insert ( 1043 869 1713 e )); -DATA(insert ( 1082 1043 749 a )); -DATA(insert ( 1043 1082 748 e )); -DATA(insert ( 1083 1043 948 a )); -DATA(insert ( 1043 1083 837 e )); -DATA(insert ( 1114 1043 2034 a )); -DATA(insert ( 1043 1114 2022 e )); -DATA(insert ( 1184 1043 1192 a )); -DATA(insert ( 1043 1184 1191 e )); -DATA(insert ( 1186 1043 1193 a )); -DATA(insert ( 1043 1186 1263 e )); -DATA(insert ( 1266 1043 939 a )); -DATA(insert ( 1043 1266 938 e )); -DATA(insert ( 1700 1043 1688 a )); -DATA(insert ( 1043 1700 1686 e )); -DATA(insert ( 142 1043 2922 e )); +DATA(insert ( 650 1043 730 a )); +DATA(insert ( 869 1043 730 a )); +DATA(insert ( 16 1043 2971 a )); +DATA(insert ( 142 1043 2922 a )); DATA(insert ( 1043 142 2896 e )); -DATA(insert ( 16 1043 2971 e )); -DATA(insert ( 1043 16 2970 e )); /* * Cross-category casts to and from BPCHAR * - * A function supporting cast to TEXT/VARCHAR can be used for cast to BPCHAR, - * but the other direction is okay only if the function treats trailing - * blanks as insignificant. So this is a subset of the VARCHAR list. - * (Arguably the holdouts should be fixed, but I'm not doing that now...) + * We support all the same casts as for TEXT. */ -DATA(insert ( 20 1042 1289 a )); -DATA(insert ( 1042 20 1290 e )); -DATA(insert ( 21 1042 113 a )); -DATA(insert ( 1042 21 818 e )); -DATA(insert ( 23 1042 112 a )); -DATA(insert ( 1042 23 819 e )); -DATA(insert ( 26 1042 114 a )); -DATA(insert ( 1042 26 817 e )); -DATA(insert ( 700 1042 841 a )); -DATA(insert ( 1042 700 839 e )); -DATA(insert ( 701 1042 840 a )); -DATA(insert ( 1042 701 838 e )); -DATA(insert ( 829 1042 752 e )); -DATA(insert ( 1042 829 767 e )); -DATA(insert ( 650 1042 730 e )); -DATA(insert ( 869 1042 730 e )); -DATA(insert ( 1082 1042 749 a )); -DATA(insert ( 1042 1082 748 e )); -DATA(insert ( 1083 1042 948 a )); -DATA(insert ( 1042 1083 837 e )); -DATA(insert ( 1114 1042 2034 a )); -DATA(insert ( 1042 1114 2022 e )); -DATA(insert ( 1184 1042 1192 a )); -DATA(insert ( 1042 1184 1191 e )); -DATA(insert ( 1186 1042 1193 a )); -DATA(insert ( 1042 1186 1263 e )); -DATA(insert ( 1266 1042 939 a )); -DATA(insert ( 1042 1266 938 e )); -DATA(insert ( 1700 1042 1688 a )); -DATA(insert ( 1042 1700 1686 e )); -DATA(insert ( 142 1042 2922 e )); +DATA(insert ( 650 1042 730 a )); +DATA(insert ( 869 1042 730 a )); +DATA(insert ( 16 1042 2971 a )); +DATA(insert ( 142 1042 2922 a )); +DATA(insert ( 1042 142 2896 e )); /* * Length-coercion functions @@ -401,16 +317,4 @@ DATA(insert ( 1560 1560 1685 i )); DATA(insert ( 1562 1562 1687 i )); DATA(insert ( 1700 1700 1703 i )); -/* casts to and from uuid */ -DATA(insert ( 25 2950 2964 a )); -DATA(insert ( 2950 25 2965 a )); -DATA(insert ( 1043 2950 2964 a )); -DATA(insert ( 2950 1043 2965 a )); - -/* - * enums - */ -DATA(insert ( 3500 25 3532 e )); -DATA(insert ( 25 3500 3533 e )); - #endif /* PG_CAST_H */ diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h index 7145b021ac..c656c7a671 100644 --- a/src/include/catalog/pg_proc.h +++ b/src/include/catalog/pg_proc.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/catalog/pg_proc.h,v 1.457 2007/06/01 23:40:18 neilc Exp $ + * $PostgreSQL: pgsql/src/include/catalog/pg_proc.h,v 1.458 2007/06/05 21:31:07 tgl Exp $ * * NOTES * The script catalog/genbki.sh reads this file and generates .bki @@ -238,12 +238,6 @@ DESCR("I/O"); DATA(insert OID = 110 ( unknownout PGNSP PGUID 12 1 0 f f t f i 1 2275 "705" _null_ _null_ _null_ unknownout - _null_ )); DESCR("I/O"); DATA(insert OID = 111 ( numeric_fac PGNSP PGUID 12 1 0 f f t f i 1 1700 "20" _null_ _null_ _null_ numeric_fac - _null_ )); -DATA(insert OID = 112 ( text PGNSP PGUID 12 1 0 f f t f i 1 25 "23" _null_ _null_ _null_ int4_text - _null_ )); -DESCR("convert int4 to text"); -DATA(insert OID = 113 ( text PGNSP PGUID 12 1 0 f f t f i 1 25 "21" _null_ _null_ _null_ int2_text - _null_ )); -DESCR("convert int2 to text"); -DATA(insert OID = 114 ( text PGNSP PGUID 12 1 0 f f t f i 1 25 "26" _null_ _null_ _null_ oid_text - _null_ )); -DESCR("convert oid to text"); DATA(insert OID = 115 ( box_above_eq PGNSP PGUID 12 1 0 f f t f i 2 16 "603 603" _null_ _null_ _null_ box_above_eq - _null_ )); DESCR("is above (allows touching)"); @@ -513,7 +507,7 @@ DESCR("abstime in tinterval"); DATA(insert OID = 249 ( tintervalrel PGNSP PGUID 12 1 0 f f t f i 1 703 "704" _null_ _null_ _null_ tintervalrel - _null_ )); DESCR("tinterval to reltime"); DATA(insert OID = 250 ( timenow PGNSP PGUID 12 1 0 f f t f s 0 702 "" _null_ _null_ _null_ timenow - _null_ )); -DESCR("Current date and time (abstime)"); +DESCR("current date and time (abstime)"); DATA(insert OID = 251 ( abstimeeq PGNSP PGUID 12 1 0 f f t f i 2 16 "702 702" _null_ _null_ _null_ abstimeeq - _null_ )); DESCR("equal"); DATA(insert OID = 252 ( abstimene PGNSP PGUID 12 1 0 f f t f i 2 16 "702 702" _null_ _null_ _null_ abstimene - _null_ )); @@ -561,7 +555,7 @@ DESCR("start of interval"); DATA(insert OID = 273 ( tintervalend PGNSP PGUID 12 1 0 f f t f i 1 702 "704" _null_ _null_ _null_ tintervalend - _null_ )); DESCR("end of interval"); DATA(insert OID = 274 ( timeofday PGNSP PGUID 12 1 0 f f t f v 0 25 "" _null_ _null_ _null_ timeofday - _null_ )); -DESCR("Current date and time - increments during transactions"); +DESCR("current date and time - increments during transactions"); DATA(insert OID = 275 ( isfinite PGNSP PGUID 12 1 0 f f t f i 1 16 "702" _null_ _null_ _null_ abstime_finite - _null_ )); DESCR("finite abstime?"); @@ -1091,22 +1085,6 @@ DESCR("greater-than-or-equal"); /* OIDS 800 - 899 */ -DATA(insert OID = 817 ( oid PGNSP PGUID 12 1 0 f f t f i 1 26 "25" _null_ _null_ _null_ text_oid - _null_ )); -DESCR("convert text to oid"); -DATA(insert OID = 818 ( int2 PGNSP PGUID 12 1 0 f f t f i 1 21 "25" _null_ _null_ _null_ text_int2 - _null_ )); -DESCR("convert text to int2"); -DATA(insert OID = 819 ( int4 PGNSP PGUID 12 1 0 f f t f i 1 23 "25" _null_ _null_ _null_ text_int4 - _null_ )); -DESCR("convert text to int4"); - -DATA(insert OID = 838 ( float8 PGNSP PGUID 12 1 0 f f t f i 1 701 "25" _null_ _null_ _null_ text_float8 - _null_ )); -DESCR("convert text to float8"); -DATA(insert OID = 839 ( float4 PGNSP PGUID 12 1 0 f f t f i 1 700 "25" _null_ _null_ _null_ text_float4 - _null_ )); -DESCR("convert text to float4"); -DATA(insert OID = 840 ( text PGNSP PGUID 12 1 0 f f t f i 1 25 "701" _null_ _null_ _null_ float8_text - _null_ )); -DESCR("convert float8 to text"); -DATA(insert OID = 841 ( text PGNSP PGUID 12 1 0 f f t f i 1 25 "700" _null_ _null_ _null_ float4_text - _null_ )); -DESCR("convert float4 to text"); - DATA(insert OID = 846 ( cash_mul_flt4 PGNSP PGUID 12 1 0 f f t f i 2 790 "790 700" _null_ _null_ _null_ cash_mul_flt4 - _null_ )); DESCR("multiply"); DATA(insert OID = 847 ( cash_div_flt4 PGNSP PGUID 12 1 0 f f t f i 2 790 "790 700" _null_ _null_ _null_ cash_div_flt4 - _null_ )); @@ -1303,19 +1281,6 @@ DESCR("horizontal?"); DATA(insert OID = 999 ( lseg_eq PGNSP PGUID 12 1 0 f f t f i 2 16 "601 601" _null_ _null_ _null_ lseg_eq - _null_ )); DESCR("equal"); -DATA(insert OID = 748 ( date PGNSP PGUID 12 1 0 f f t f s 1 1082 "25" _null_ _null_ _null_ text_date - _null_ )); -DESCR("convert text to date"); -DATA(insert OID = 749 ( text PGNSP PGUID 12 1 0 f f t f s 1 25 "1082" _null_ _null_ _null_ date_text - _null_ )); -DESCR("convert date to text"); -DATA(insert OID = 837 ( time PGNSP PGUID 12 1 0 f f t f s 1 1083 "25" _null_ _null_ _null_ text_time - _null_ )); -DESCR("convert text to time"); -DATA(insert OID = 948 ( text PGNSP PGUID 12 1 0 f f t f i 1 25 "1083" _null_ _null_ _null_ time_text - _null_ )); -DESCR("convert time to text"); -DATA(insert OID = 938 ( timetz PGNSP PGUID 12 1 0 f f t f s 1 1266 "25" _null_ _null_ _null_ text_timetz - _null_ )); -DESCR("convert text to timetz"); -DATA(insert OID = 939 ( text PGNSP PGUID 12 1 0 f f t f i 1 25 "1266" _null_ _null_ _null_ timetz_text - _null_ )); -DESCR("convert timetz to text"); - /* OIDS 1000 - 1999 */ DATA(insert OID = 1026 ( timezone PGNSP PGUID 12 1 0 f f t f i 2 1114 "1186 1184" _null_ _null_ _null_ timestamptz_izone - _null_ )); @@ -1524,12 +1489,6 @@ DATA(insert OID = 1189 ( timestamptz_pl_interval PGNSP PGUID 12 1 0 f f t f s 2 DESCR("plus"); DATA(insert OID = 1190 ( timestamptz_mi_interval PGNSP PGUID 12 1 0 f f t f s 2 1184 "1184 1186" _null_ _null_ _null_ timestamptz_mi_interval - _null_ )); DESCR("minus"); -DATA(insert OID = 1191 ( timestamptz PGNSP PGUID 12 1 0 f f t f s 1 1184 "25" _null_ _null_ _null_ text_timestamptz - _null_ )); -DESCR("convert text to timestamp with time zone"); -DATA(insert OID = 1192 ( text PGNSP PGUID 12 1 0 f f t f s 1 25 "1184" _null_ _null_ _null_ timestamptz_text - _null_ )); -DESCR("convert timestamp with time zone to text"); -DATA(insert OID = 1193 ( text PGNSP PGUID 12 1 0 f f t f i 1 25 "1186" _null_ _null_ _null_ interval_text - _null_ )); -DESCR("convert interval to text"); DATA(insert OID = 1194 ( reltime PGNSP PGUID 12 1 0 f f t f i 1 703 "1186" _null_ _null_ _null_ interval_reltime - _null_ )); DESCR("convert interval to reltime"); DATA(insert OID = 1195 ( timestamptz_smaller PGNSP PGUID 12 1 0 f f t f i 2 1184 "1184 1184" _null_ _null_ _null_ timestamp_smaller - _null_ )); @@ -1586,9 +1545,6 @@ DESCR("absolute value"); DATA(insert OID = 1253 ( int2abs PGNSP PGUID 12 1 0 f f t f i 1 21 "21" _null_ _null_ _null_ int2abs - _null_ )); DESCR("absolute value"); -DATA(insert OID = 1263 ( interval PGNSP PGUID 12 1 0 f f t f s 1 1186 "25" _null_ _null_ _null_ text_interval - _null_ )); -DESCR("convert text to interval"); - DATA(insert OID = 1271 ( overlaps PGNSP PGUID 12 1 0 f f f f i 4 16 "1266 1266 1266 1266" _null_ _null_ _null_ overlaps_timetz - _null_ )); DESCR("SQL92 interval comparison"); DATA(insert OID = 1272 ( datetime_pl PGNSP PGUID 12 1 0 f f t f i 2 1114 "1082 1083" _null_ _null_ _null_ datetime_timestamp - _null_ )); @@ -1617,11 +1573,6 @@ DESCR("convert int8 to oid"); DATA(insert OID = 1288 ( int8 PGNSP PGUID 12 1 0 f f t f i 1 20 "26" _null_ _null_ _null_ oidtoi8 - _null_ )); DESCR("convert oid to int8"); -DATA(insert OID = 1289 ( text PGNSP PGUID 12 1 0 f f t f i 1 25 "20" _null_ _null_ _null_ int8_text - _null_ )); -DESCR("convert int8 to text"); -DATA(insert OID = 1290 ( int8 PGNSP PGUID 12 1 0 f f t f i 1 20 "25" _null_ _null_ _null_ text_int8 - _null_ )); -DESCR("convert text to int8"); - DATA(insert OID = 1292 ( tideq PGNSP PGUID 12 1 0 f f t f i 2 16 "27 27" _null_ _null_ _null_ tideq - _null_ )); DESCR("equal"); DATA(insert OID = 1293 ( currtid PGNSP PGUID 12 1 0 f f t f v 2 27 "26 27" _null_ _null_ _null_ currtid_byreloid - _null_ )); @@ -2407,12 +2358,8 @@ DESCR("I/O"); DATA(insert OID = 437 ( macaddr_out PGNSP PGUID 12 1 0 f f t f i 1 2275 "829" _null_ _null_ _null_ macaddr_out - _null_ )); DESCR("I/O"); -DATA(insert OID = 752 ( text PGNSP PGUID 12 1 0 f f t f i 1 25 "829" _null_ _null_ _null_ macaddr_text - _null_ )); -DESCR("MAC address to text"); DATA(insert OID = 753 ( trunc PGNSP PGUID 12 1 0 f f t f i 1 829 "829" _null_ _null_ _null_ macaddr_trunc - _null_ )); DESCR("MAC manufacturer fields"); -DATA(insert OID = 767 ( macaddr PGNSP PGUID 12 1 0 f f t f i 1 829 "25" _null_ _null_ _null_ text_macaddr - _null_ )); -DESCR("text to MAC address"); DATA(insert OID = 830 ( macaddr_eq PGNSP PGUID 12 1 0 f f t f i 2 16 "829 829" _null_ _null_ _null_ macaddr_eq - _null_ )); DESCR("equal"); @@ -2490,10 +2437,6 @@ DATA(insert OID = 730 ( text PGNSP PGUID 12 1 0 f f t f i 1 25 "869" _null_ DESCR("show all parts of inet/cidr value"); DATA(insert OID = 1362 ( hostmask PGNSP PGUID 12 1 0 f f t f i 1 869 "869" _null_ _null_ _null_ network_hostmask - _null_ )); DESCR("hostmask of address"); -DATA(insert OID = 1713 ( inet PGNSP PGUID 12 1 0 f f t f i 1 869 "25" _null_ _null_ _null_ text_inet - _null_ )); -DESCR("text to inet"); -DATA(insert OID = 1714 ( cidr PGNSP PGUID 12 1 0 f f t f i 1 650 "25" _null_ _null_ _null_ text_cidr - _null_ )); -DESCR("text to cidr"); DATA(insert OID = 1715 ( cidr PGNSP PGUID 12 1 0 f f t f i 1 650 "869" _null_ _null_ _null_ inet_to_cidr - _null_ )); DESCR("coerce inet to cidr"); @@ -2521,11 +2464,6 @@ DESCR("subtract integer from inet value"); DATA(insert OID = 2633 ( inetmi PGNSP PGUID 12 1 0 f f t f i 2 20 "869 869" _null_ _null_ _null_ inetmi - _null_ )); DESCR("subtract inet values"); -DATA(insert OID = 1686 ( numeric PGNSP PGUID 12 1 0 f f t f i 1 1700 "25" _null_ _null_ _null_ text_numeric - _null_ )); -DESCR("(internal)"); -DATA(insert OID = 1688 ( text PGNSP PGUID 12 1 0 f f t f i 1 25 "1700" _null_ _null_ _null_ numeric_text - _null_ )); -DESCR("(internal)"); - DATA(insert OID = 1690 ( time_mi_time PGNSP PGUID 12 1 0 f f t f i 2 1186 "1083 1083" _null_ _null_ _null_ time_mi_time - _null_ )); DESCR("minus"); @@ -3009,9 +2947,9 @@ DATA(insert OID = 2274 ( pg_stat_reset PGNSP PGUID 12 1 0 f f f f v 0 2278 DESCR("Statistics: Reset collected statistics for current database"); DATA(insert OID = 1946 ( encode PGNSP PGUID 12 1 0 f f t f i 2 25 "17 25" _null_ _null_ _null_ binary_encode - _null_ )); -DESCR("Convert bytea value into some ascii-only text string"); +DESCR("convert bytea value into some ascii-only text string"); DATA(insert OID = 1947 ( decode PGNSP PGUID 12 1 0 f f t f i 2 17 "25 25" _null_ _null_ _null_ binary_decode - _null_ )); -DESCR("Convert ascii-encoded text string into bytea value"); +DESCR("convert ascii-encoded text string into bytea value"); DATA(insert OID = 1948 ( byteaeq PGNSP PGUID 12 1 0 f f t f i 2 16 "17 17" _null_ _null_ _null_ byteaeq - _null_ )); DESCR("equal"); @@ -3076,8 +3014,6 @@ DATA(insert OID = 2020 ( date_trunc PGNSP PGUID 12 1 0 f f t f i 2 1114 "25 11 DESCR("truncate timestamp to specified units"); DATA(insert OID = 2021 ( date_part PGNSP PGUID 12 1 0 f f t f i 2 701 "25 1114" _null_ _null_ _null_ timestamp_part - _null_ )); DESCR("extract field from timestamp"); -DATA(insert OID = 2022 ( timestamp PGNSP PGUID 12 1 0 f f t f s 1 1114 "25" _null_ _null_ _null_ text_timestamp - _null_ )); -DESCR("convert text to timestamp"); DATA(insert OID = 2023 ( timestamp PGNSP PGUID 12 1 0 f f t f s 1 1114 "702" _null_ _null_ _null_ abstime_timestamp - _null_ )); DESCR("convert abstime to timestamp"); DATA(insert OID = 2024 ( timestamp PGNSP PGUID 12 1 0 f f t f i 1 1114 "1082" _null_ _null_ _null_ date_timestamp - _null_ )); @@ -3098,8 +3034,6 @@ DATA(insert OID = 2032 ( timestamp_pl_interval PGNSP PGUID 12 1 0 f f t f i 2 1 DESCR("plus"); DATA(insert OID = 2033 ( timestamp_mi_interval PGNSP PGUID 12 1 0 f f t f i 2 1114 "1114 1186" _null_ _null_ _null_ timestamp_mi_interval - _null_ )); DESCR("minus"); -DATA(insert OID = 2034 ( text PGNSP PGUID 12 1 0 f f t f s 1 25 "1114" _null_ _null_ _null_ timestamp_text - _null_ )); -DESCR("convert timestamp to text"); DATA(insert OID = 2035 ( timestamp_smaller PGNSP PGUID 12 1 0 f f t f i 2 1114 "1114 1114" _null_ _null_ _null_ timestamp_smaller - _null_ )); DESCR("smaller of two"); DATA(insert OID = 2036 ( timestamp_larger PGNSP PGUID 12 1 0 f f t f i 2 1114 "1114 1114" _null_ _null_ _null_ timestamp_larger - _null_ )); @@ -3191,13 +3125,13 @@ DATA(insert OID = 2855 ( pg_is_other_temp_schema PGNSP PGUID 12 1 0 f f t f s 1 DESCR("is schema another session's temp schema?"); DATA(insert OID = 2171 ( pg_cancel_backend PGNSP PGUID 12 1 0 f f t f v 1 16 "23" _null_ _null_ _null_ pg_cancel_backend - _null_ )); -DESCR("Cancel a server process' current query"); +DESCR("cancel a server process' current query"); DATA(insert OID = 2172 ( pg_start_backup PGNSP PGUID 12 1 0 f f t f v 1 25 "25" _null_ _null_ _null_ pg_start_backup - _null_ )); -DESCR("Prepare for taking an online backup"); +DESCR("prepare for taking an online backup"); DATA(insert OID = 2173 ( pg_stop_backup PGNSP PGUID 12 1 0 f f t f v 0 25 "" _null_ _null_ _null_ pg_stop_backup - _null_ )); -DESCR("Finish taking an online backup"); +DESCR("finish taking an online backup"); DATA(insert OID = 2848 ( pg_switch_xlog PGNSP PGUID 12 1 0 f f t f v 0 25 "" _null_ _null_ _null_ pg_switch_xlog - _null_ )); -DESCR("Switch to new xlog file"); +DESCR("switch to new xlog file"); DATA(insert OID = 2849 ( pg_current_xlog_location PGNSP PGUID 12 1 0 f f t f v 0 25 "" _null_ _null_ _null_ pg_current_xlog_location - _null_ )); DESCR("current xlog write location"); DATA(insert OID = 2852 ( pg_current_xlog_insert_location PGNSP PGUID 12 1 0 f f t f v 0 25 "" _null_ _null_ _null_ pg_current_xlog_insert_location - _null_ )); @@ -3208,23 +3142,21 @@ DATA(insert OID = 2851 ( pg_xlogfile_name PGNSP PGUID 12 1 0 f f t f i 1 25 "2 DESCR("xlog filename, given an xlog location"); DATA(insert OID = 2621 ( pg_reload_conf PGNSP PGUID 12 1 0 f f t f v 0 16 "" _null_ _null_ _null_ pg_reload_conf - _null_ )); -DESCR("Reload configuration files"); +DESCR("reload configuration files"); DATA(insert OID = 2622 ( pg_rotate_logfile PGNSP PGUID 12 1 0 f f t f v 0 16 "" _null_ _null_ _null_ pg_rotate_logfile - _null_ )); -DESCR("Rotate log file"); +DESCR("rotate log file"); DATA(insert OID = 2623 ( pg_stat_file PGNSP PGUID 12 1 0 f f t f v 1 2249 "25" "{25,20,1184,1184,1184,1184,16}" "{i,o,o,o,o,o,o}" "{filename,size,access,modification,change,creation,isdir}" pg_stat_file - _null_ )); -DESCR("Return file information"); +DESCR("return file information"); DATA(insert OID = 2624 ( pg_read_file PGNSP PGUID 12 1 0 f f t f v 3 25 "25 20 20" _null_ _null_ _null_ pg_read_file - _null_ )); -DESCR("Read text from a file"); +DESCR("read text from a file"); DATA(insert OID = 2625 ( pg_ls_dir PGNSP PGUID 12 1 1000 f f t t v 1 25 "25" _null_ _null_ _null_ pg_ls_dir - _null_ )); -DESCR("List all files in a directory"); +DESCR("list all files in a directory"); DATA(insert OID = 2626 ( pg_sleep PGNSP PGUID 12 1 0 f f t f v 1 2278 "701" _null_ _null_ _null_ pg_sleep - _null_ )); -DESCR("Sleep for the specified time in seconds"); +DESCR("sleep for the specified time in seconds"); -DATA(insert OID = 2970 ( boolean PGNSP PGUID 12 1 0 f f t f i 1 16 "25" _null_ _null_ _null_ textbool - _null_ )); -DESCR("text to boolean"); DATA(insert OID = 2971 ( text PGNSP PGUID 12 1 0 f f t f i 1 25 "16" _null_ _null_ _null_ booltext - _null_ )); -DESCR("boolean to text"); +DESCR("convert boolean to text"); /* Aggregates (moved here from pg_aggregate for 7.3) */ @@ -3491,23 +3423,23 @@ DESCR("current user privilege on role by role oid"); DATA(insert OID = 1269 ( pg_column_size PGNSP PGUID 12 1 0 f f t f s 1 23 "2276" _null_ _null_ _null_ pg_column_size - _null_ )); DESCR("bytes required to store the value, perhaps with compression"); DATA(insert OID = 2322 ( pg_tablespace_size PGNSP PGUID 12 1 0 f f t f v 1 20 "26" _null_ _null_ _null_ pg_tablespace_size_oid - _null_ )); -DESCR("Calculate total disk space usage for the specified tablespace"); +DESCR("total disk space usage for the specified tablespace"); DATA(insert OID = 2323 ( pg_tablespace_size PGNSP PGUID 12 1 0 f f t f v 1 20 "19" _null_ _null_ _null_ pg_tablespace_size_name - _null_ )); -DESCR("Calculate total disk space usage for the specified tablespace"); +DESCR("total disk space usage for the specified tablespace"); DATA(insert OID = 2324 ( pg_database_size PGNSP PGUID 12 1 0 f f t f v 1 20 "26" _null_ _null_ _null_ pg_database_size_oid - _null_ )); -DESCR("Calculate total disk space usage for the specified database"); +DESCR("total disk space usage for the specified database"); DATA(insert OID = 2168 ( pg_database_size PGNSP PGUID 12 1 0 f f t f v 1 20 "19" _null_ _null_ _null_ pg_database_size_name - _null_ )); -DESCR("Calculate total disk space usage for the specified database"); +DESCR("total disk space usage for the specified database"); DATA(insert OID = 2325 ( pg_relation_size PGNSP PGUID 12 1 0 f f t f v 1 20 "26" _null_ _null_ _null_ pg_relation_size_oid - _null_ )); -DESCR("Calculate disk space usage for the specified table or index"); +DESCR("disk space usage for the specified table or index"); DATA(insert OID = 2289 ( pg_relation_size PGNSP PGUID 12 1 0 f f t f v 1 20 "25" _null_ _null_ _null_ pg_relation_size_name - _null_ )); -DESCR("Calculate disk space usage for the specified table or index"); +DESCR("disk space usage for the specified table or index"); DATA(insert OID = 2286 ( pg_total_relation_size PGNSP PGUID 12 1 0 f f t f v 1 20 "26" _null_ _null_ _null_ pg_total_relation_size_oid - _null_ )); -DESCR("Calculate total disk space usage for the specified table and associated indexes and toast tables"); +DESCR("total disk space usage for the specified table and associated indexes and toast tables"); DATA(insert OID = 2287 ( pg_total_relation_size PGNSP PGUID 12 1 0 f f t f v 1 20 "25" _null_ _null_ _null_ pg_total_relation_size_name - _null_ )); -DESCR("Calculate total disk space usage for the specified table and associated indexes and toast tables"); +DESCR("total disk space usage for the specified table and associated indexes and toast tables"); DATA(insert OID = 2288 ( pg_size_pretty PGNSP PGUID 12 1 0 f f t f v 1 25 "20" _null_ _null_ _null_ pg_size_pretty - _null_ )); -DESCR("Convert a long int to a human readable text using size units"); +DESCR("convert a long int to a human readable text using size units"); DATA(insert OID = 2290 ( record_in PGNSP PGUID 12 1 0 f f t f v 3 2249 "2275 26 23" _null_ _null_ _null_ record_in - _null_ )); DESCR("I/O"); @@ -4150,10 +4082,6 @@ DATA(insert OID = 2962 ( uuid_send PGNSP PGUID 12 1 0 f f t f i 1 17 "2950" DESCR("I/O"); DATA(insert OID = 2963 ( uuid_hash PGNSP PGUID 12 1 0 f f t f i 1 23 "2950" _null_ _null_ _null_ uuid_hash - _null_ )); DESCR("hash"); -DATA(insert OID = 2964 ( uuid PGNSP PGUID 12 1 0 f f t f i 1 2950 "25" _null_ _null_ _null_ text_uuid - _null_ )); -DESCR("convert text to uuid"); -DATA(insert OID = 2965 ( text PGNSP PGUID 12 1 0 f f t f i 1 25 "2950" _null_ _null_ _null_ uuid_text - _null_ )); -DESCR("convert uuid to text"); /* enum related procs */ DATA(insert OID = 3504 ( anyenum_in PGNSP PGUID 12 1 0 f f t f i 1 3500 "2275" _null_ _null_ _null_ anyenum_in - _null_ )); @@ -4190,10 +4118,6 @@ DATA(insert OID = 3528 ( enum_first PGNSP PGUID 12 1 0 f f f f s 1 3500 "3500" DATA(insert OID = 3529 ( enum_last PGNSP PGUID 12 1 0 f f f f s 1 3500 "3500" _null_ _null_ _null_ enum_last - _null_ )); DATA(insert OID = 3530 ( enum_range PGNSP PGUID 12 1 0 f f f f s 2 2277 "3500 3500" _null_ _null_ _null_ enum_range_bounds - _null_ )); DATA(insert OID = 3531 ( enum_range PGNSP PGUID 12 1 0 f f f f s 1 2277 "3500" _null_ _null_ _null_ enum_range_all - _null_ )); -DATA(insert OID = 3532 ( text PGNSP PGUID 12 1 0 f f t f s 1 25 "3500" _null_ _null_ _null_ enum_text - _null_ )); -DESCR("convert enum to text"); -DATA(insert OID = 3533 ( enum PGNSP PGUID 12 1 0 f f t f s 1 3500 "25" _null_ _null_ _null_ text_enum - _null_ )); -DESCR("convert text to enum"); /* * Symbolic values for provolatile column: these indicate whether the result diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h index b6b7ddcde6..ccc243cfd0 100644 --- a/src/include/nodes/execnodes.h +++ b/src/include/nodes/execnodes.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/nodes/execnodes.h,v 1.175 2007/05/21 17:57:34 tgl Exp $ + * $PostgreSQL: pgsql/src/include/nodes/execnodes.h,v 1.176 2007/06/05 21:31:08 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -638,6 +638,19 @@ typedef struct FieldStoreState } FieldStoreState; /* ---------------- + * CoerceViaIOState node + * ---------------- + */ +typedef struct CoerceViaIOState +{ + ExprState xprstate; + ExprState *arg; /* input expression */ + FmgrInfo outfunc; /* lookup info for source output function */ + FmgrInfo infunc; /* lookup info for result input function */ + Oid intypioparam; /* argument needed for input function */ +} CoerceViaIOState; + +/* ---------------- * ArrayCoerceExprState node * ---------------- */ diff --git a/src/include/nodes/nodes.h b/src/include/nodes/nodes.h index fc48961c5c..31186930d2 100644 --- a/src/include/nodes/nodes.h +++ b/src/include/nodes/nodes.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/nodes/nodes.h,v 1.199 2007/04/26 16:13:14 neilc Exp $ + * $PostgreSQL: pgsql/src/include/nodes/nodes.h,v 1.200 2007/06/05 21:31:08 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -121,6 +121,7 @@ typedef enum NodeTag T_FieldSelect, T_FieldStore, T_RelabelType, + T_CoerceViaIO, T_ArrayCoerceExpr, T_ConvertRowtypeExpr, T_CaseExpr, @@ -160,6 +161,7 @@ typedef enum NodeTag T_SubPlanState, T_FieldSelectState, T_FieldStoreState, + T_CoerceViaIOState, T_ArrayCoerceExprState, T_ConvertRowtypeExprState, T_CaseExprState, diff --git a/src/include/nodes/primnodes.h b/src/include/nodes/primnodes.h index ccad1329a6..a567a8e26d 100644 --- a/src/include/nodes/primnodes.h +++ b/src/include/nodes/primnodes.h @@ -10,7 +10,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/nodes/primnodes.h,v 1.129 2007/03/27 23:21:12 tgl Exp $ + * $PostgreSQL: pgsql/src/include/nodes/primnodes.h,v 1.130 2007/06/05 21:31:08 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -551,6 +551,24 @@ typedef struct RelabelType } RelabelType; /* ---------------- + * CoerceViaIO + * + * CoerceViaIO represents a type coercion between two types whose textual + * representations are compatible, implemented by invoking the source type's + * typoutput function then the destination type's typinput function. + * ---------------- + */ + +typedef struct CoerceViaIO +{ + Expr xpr; + Expr *arg; /* input expression */ + Oid resulttype; /* output type of coercion */ + /* output typmod is not stored, but is presumed -1 */ + CoercionForm coerceformat; /* how to display this node */ +} CoerceViaIO; + +/* ---------------- * ArrayCoerceExpr * * ArrayCoerceExpr represents a type coercion from one array type to another, diff --git a/src/include/parser/parse_coerce.h b/src/include/parser/parse_coerce.h index 23aaa87cfa..959ac50cde 100644 --- a/src/include/parser/parse_coerce.h +++ b/src/include/parser/parse_coerce.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/parser/parse_coerce.h,v 1.70 2007/03/27 23:21:12 tgl Exp $ + * $PostgreSQL: pgsql/src/include/parser/parse_coerce.h,v 1.71 2007/06/05 21:31:08 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -17,6 +17,7 @@ #include "parser/parse_node.h" +/* Type categories (kluge ... ought to be extensible) */ typedef enum CATEGORY { INVALID_TYPE, @@ -33,6 +34,16 @@ typedef enum CATEGORY USER_TYPE } CATEGORY; +/* Result codes for find_coercion_pathway */ +typedef enum CoercionPathType +{ + COERCION_PATH_NONE, /* failed to find any coercion pathway */ + COERCION_PATH_FUNC, /* apply the specified coercion function */ + COERCION_PATH_RELABELTYPE, /* binary-compatible cast, no function */ + COERCION_PATH_ARRAYCOERCE, /* need an ArrayCoerceExpr node */ + COERCION_PATH_COERCEVIAIO /* need a CoerceViaIO node */ +} CoercionPathType; + extern bool IsBinaryCoercible(Oid srctype, Oid targettype); extern bool IsPreferredType(CATEGORY category, Oid type); @@ -75,10 +86,11 @@ extern Oid resolve_generic_type(Oid declared_type, Oid context_actual_type, Oid context_declared_type); -extern bool find_coercion_pathway(Oid targetTypeId, Oid sourceTypeId, - CoercionContext ccontext, - Oid *funcid, bool *arrayCoerce); -extern bool find_typmod_coercion_function(Oid typeId, - Oid *funcid, bool *arrayCoerce); +extern CoercionPathType find_coercion_pathway(Oid targetTypeId, + Oid sourceTypeId, + CoercionContext ccontext, + Oid *funcid); +extern CoercionPathType find_typmod_coercion_function(Oid typeId, + Oid *funcid); #endif /* PARSE_COERCE_H */ diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h index d0a7329f10..5ff4fe738f 100644 --- a/src/include/utils/builtins.h +++ b/src/include/utils/builtins.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/builtins.h,v 1.294 2007/06/01 23:40:19 neilc Exp $ + * $PostgreSQL: pgsql/src/include/utils/builtins.h,v 1.295 2007/06/05 21:31:08 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -71,7 +71,6 @@ extern Datum boolout(PG_FUNCTION_ARGS); extern Datum boolrecv(PG_FUNCTION_ARGS); extern Datum boolsend(PG_FUNCTION_ARGS); extern Datum booltext(PG_FUNCTION_ARGS); -extern Datum textbool(PG_FUNCTION_ARGS); extern Datum booleq(PG_FUNCTION_ARGS); extern Datum boolne(PG_FUNCTION_ARGS); extern Datum boollt(PG_FUNCTION_ARGS); @@ -115,8 +114,6 @@ extern Datum enum_ne(PG_FUNCTION_ARGS); extern Datum enum_ge(PG_FUNCTION_ARGS); extern Datum enum_gt(PG_FUNCTION_ARGS); extern Datum enum_cmp(PG_FUNCTION_ARGS); -extern Datum enum_text(PG_FUNCTION_ARGS); -extern Datum text_enum(PG_FUNCTION_ARGS); extern Datum enum_smaller(PG_FUNCTION_ARGS); extern Datum enum_larger(PG_FUNCTION_ARGS); extern Datum enum_first(PG_FUNCTION_ARGS); @@ -140,12 +137,8 @@ extern Datum int4recv(PG_FUNCTION_ARGS); extern Datum int4send(PG_FUNCTION_ARGS); extern Datum i2toi4(PG_FUNCTION_ARGS); extern Datum i4toi2(PG_FUNCTION_ARGS); -extern Datum int2_text(PG_FUNCTION_ARGS); -extern Datum text_int2(PG_FUNCTION_ARGS); extern Datum int4_bool(PG_FUNCTION_ARGS); extern Datum bool_int4(PG_FUNCTION_ARGS); -extern Datum int4_text(PG_FUNCTION_ARGS); -extern Datum text_int4(PG_FUNCTION_ARGS); extern Datum int4eq(PG_FUNCTION_ARGS); extern Datum int4ne(PG_FUNCTION_ARGS); extern Datum int4lt(PG_FUNCTION_ARGS); @@ -334,10 +327,6 @@ extern Datum i4tof(PG_FUNCTION_ARGS); extern Datum i2tof(PG_FUNCTION_ARGS); extern Datum ftoi4(PG_FUNCTION_ARGS); extern Datum ftoi2(PG_FUNCTION_ARGS); -extern Datum text_float8(PG_FUNCTION_ARGS); -extern Datum text_float4(PG_FUNCTION_ARGS); -extern Datum float8_text(PG_FUNCTION_ARGS); -extern Datum float4_text(PG_FUNCTION_ARGS); extern Datum dround(PG_FUNCTION_ARGS); extern Datum dceil(PG_FUNCTION_ARGS); extern Datum dfloor(PG_FUNCTION_ARGS); @@ -446,8 +435,6 @@ extern Datum oidge(PG_FUNCTION_ARGS); extern Datum oidgt(PG_FUNCTION_ARGS); extern Datum oidlarger(PG_FUNCTION_ARGS); extern Datum oidsmaller(PG_FUNCTION_ARGS); -extern Datum oid_text(PG_FUNCTION_ARGS); -extern Datum text_oid(PG_FUNCTION_ARGS); extern Datum oidvectorin(PG_FUNCTION_ARGS); extern Datum oidvectorout(PG_FUNCTION_ARGS); extern Datum oidvectorrecv(PG_FUNCTION_ARGS); @@ -782,8 +769,6 @@ extern Datum network_show(PG_FUNCTION_ARGS); extern Datum inet_abbrev(PG_FUNCTION_ARGS); extern Datum cidr_abbrev(PG_FUNCTION_ARGS); extern double convert_network_to_scalar(Datum value, Oid typid); -extern Datum text_cidr(PG_FUNCTION_ARGS); -extern Datum text_inet(PG_FUNCTION_ARGS); extern Datum inet_to_cidr(PG_FUNCTION_ARGS); extern Datum inet_set_masklen(PG_FUNCTION_ARGS); extern Datum cidr_set_masklen(PG_FUNCTION_ARGS); @@ -814,8 +799,6 @@ extern Datum macaddr_ge(PG_FUNCTION_ARGS); extern Datum macaddr_gt(PG_FUNCTION_ARGS); extern Datum macaddr_ne(PG_FUNCTION_ARGS); extern Datum macaddr_trunc(PG_FUNCTION_ARGS); -extern Datum macaddr_text(PG_FUNCTION_ARGS); -extern Datum text_macaddr(PG_FUNCTION_ARGS); extern Datum hashmacaddr(PG_FUNCTION_ARGS); /* numeric.c */ @@ -866,8 +849,6 @@ extern Datum numeric_float8(PG_FUNCTION_ARGS); extern Datum numeric_float8_no_overflow(PG_FUNCTION_ARGS); extern Datum float4_numeric(PG_FUNCTION_ARGS); extern Datum numeric_float4(PG_FUNCTION_ARGS); -extern Datum text_numeric(PG_FUNCTION_ARGS); -extern Datum numeric_text(PG_FUNCTION_ARGS); extern Datum numeric_accum(PG_FUNCTION_ARGS); extern Datum numeric_avg_accum(PG_FUNCTION_ARGS); extern Datum int2_accum(PG_FUNCTION_ARGS); @@ -970,7 +951,5 @@ extern Datum uuid_gt(PG_FUNCTION_ARGS); extern Datum uuid_ne(PG_FUNCTION_ARGS); extern Datum uuid_cmp(PG_FUNCTION_ARGS); extern Datum uuid_hash(PG_FUNCTION_ARGS); -extern Datum text_uuid(PG_FUNCTION_ARGS); -extern Datum uuid_text(PG_FUNCTION_ARGS); #endif /* BUILTINS_H */ diff --git a/src/include/utils/date.h b/src/include/utils/date.h index e58c6a03b9..c7f9f73239 100644 --- a/src/include/utils/date.h +++ b/src/include/utils/date.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/date.h,v 1.36 2007/01/05 22:19:59 momjian Exp $ + * $PostgreSQL: pgsql/src/include/utils/date.h,v 1.37 2007/06/05 21:31:08 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -133,8 +133,6 @@ extern Datum date_timestamptz(PG_FUNCTION_ARGS); extern Datum timestamptz_date(PG_FUNCTION_ARGS); extern Datum datetime_timestamp(PG_FUNCTION_ARGS); extern Datum abstime_date(PG_FUNCTION_ARGS); -extern Datum text_date(PG_FUNCTION_ARGS); -extern Datum date_text(PG_FUNCTION_ARGS); extern Datum time_in(PG_FUNCTION_ARGS); extern Datum time_out(PG_FUNCTION_ARGS); @@ -158,8 +156,6 @@ extern Datum timestamp_time(PG_FUNCTION_ARGS); extern Datum timestamptz_time(PG_FUNCTION_ARGS); extern Datum time_interval(PG_FUNCTION_ARGS); extern Datum interval_time(PG_FUNCTION_ARGS); -extern Datum text_time(PG_FUNCTION_ARGS); -extern Datum time_text(PG_FUNCTION_ARGS); extern Datum time_pl_interval(PG_FUNCTION_ARGS); extern Datum time_mi_interval(PG_FUNCTION_ARGS); extern Datum time_part(PG_FUNCTION_ARGS); @@ -186,8 +182,6 @@ extern Datum timetz_time(PG_FUNCTION_ARGS); extern Datum time_timetz(PG_FUNCTION_ARGS); extern Datum timestamptz_timetz(PG_FUNCTION_ARGS); extern Datum datetimetz_timestamptz(PG_FUNCTION_ARGS); -extern Datum text_timetz(PG_FUNCTION_ARGS); -extern Datum timetz_text(PG_FUNCTION_ARGS); extern Datum timetz_part(PG_FUNCTION_ARGS); extern Datum timetz_zone(PG_FUNCTION_ARGS); extern Datum timetz_izone(PG_FUNCTION_ARGS); diff --git a/src/include/utils/int8.h b/src/include/utils/int8.h index d43cf6450a..1331d554f9 100644 --- a/src/include/utils/int8.h +++ b/src/include/utils/int8.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/int8.h,v 1.46 2007/01/05 22:19:59 momjian Exp $ + * $PostgreSQL: pgsql/src/include/utils/int8.h,v 1.47 2007/06/05 21:31:08 tgl Exp $ * * NOTES * These data types are supported on all 64-bit architectures, and may @@ -111,9 +111,6 @@ extern Datum ftoi8(PG_FUNCTION_ARGS); extern Datum i8tooid(PG_FUNCTION_ARGS); extern Datum oidtoi8(PG_FUNCTION_ARGS); -extern Datum int8_text(PG_FUNCTION_ARGS); -extern Datum text_int8(PG_FUNCTION_ARGS); - extern Datum generate_series_int8(PG_FUNCTION_ARGS); extern Datum generate_series_step_int8(PG_FUNCTION_ARGS); diff --git a/src/include/utils/timestamp.h b/src/include/utils/timestamp.h index 5923c35493..629aa36564 100644 --- a/src/include/utils/timestamp.h +++ b/src/include/utils/timestamp.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/utils/timestamp.h,v 1.69 2007/04/30 21:01:53 tgl Exp $ + * $PostgreSQL: pgsql/src/include/utils/timestamp.h,v 1.70 2007/06/05 21:31:08 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -252,10 +252,6 @@ extern Datum interval_justify_interval(PG_FUNCTION_ARGS); extern Datum interval_justify_hours(PG_FUNCTION_ARGS); extern Datum interval_justify_days(PG_FUNCTION_ARGS); -extern Datum timestamp_text(PG_FUNCTION_ARGS); -extern Datum text_timestamp(PG_FUNCTION_ARGS); -extern Datum interval_text(PG_FUNCTION_ARGS); -extern Datum text_interval(PG_FUNCTION_ARGS); extern Datum timestamp_trunc(PG_FUNCTION_ARGS); extern Datum interval_trunc(PG_FUNCTION_ARGS); extern Datum timestamp_part(PG_FUNCTION_ARGS); @@ -291,8 +287,6 @@ extern Datum timestamp_mi_interval(PG_FUNCTION_ARGS); extern Datum timestamp_age(PG_FUNCTION_ARGS); extern Datum overlaps_timestamp(PG_FUNCTION_ARGS); -extern Datum timestamptz_text(PG_FUNCTION_ARGS); -extern Datum text_timestamptz(PG_FUNCTION_ARGS); extern Datum timestamptz_pl_interval(PG_FUNCTION_ARGS); extern Datum timestamptz_mi_interval(PG_FUNCTION_ARGS); extern Datum timestamptz_age(PG_FUNCTION_ARGS); |