Cause CHAR(n) to TEXT or VARCHAR conversion to automatically strip trailing

blanks, in hopes of reducing the surprise factor for newbies.  Remove
redundant operators for VARCHAR (it depends wholly on TEXT operations now).
Clean up resolution of ambiguous operators/functions to avoid surprising
choices for domains: domains are treated as equivalent to their base types
and binary-coercibility is no longer considered a preference item when
choosing among multiple operators/functions.  IsBinaryCoercible now correctly
reflects the notion that you need *only* relabel the type to get from type
A to type B: that is, a domain is binary-coercible to its base type, but
not vice versa.  Various marginal cleanup, including merging the essentially
duplicate resolution code in parse_func.c and parse_oper.c.  Improve opr_sanity
regression test to understand about binary compatibility (using pg_cast),
and fix a couple of small errors in the catalogs revealed thereby.
Restructure "special operator" handling to fetch operators via index opclasses
rather than hardwiring assumptions about names (cleans up the pattern_ops
stuff a little).

1 files changed, 13 insertions, 2 deletions

diff --git a/src/include/catalog/pg_opclass.h b/src/include/catalog/pg_opclass.h
index 29c92f5ddf..809cde3da0 100644
--- a/src/include/catalog/pg_opclass.h
+++ b/src/include/catalog/pg_opclass.h
@@ -9,7 +9,7 @@
  * of opclass name and index access method type.  This row specifies the
  * expected input data type for the opclass (the type of the heap column,
  * or the function output type in the case of a functional index).	Note
- * that types binary-compatible with the specified type will be accepted too.
+ * that types binary-coercible to the specified type will be accepted too.
  *
  * For a given <opcamid, opcintype> pair, there can be at most one row that
  * has opcdefault = true; this row is the default opclass for such data in
@@ -26,7 +26,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: pg_opclass.h,v 1.48 2003/05/15 15:50:19 petere Exp $
+ * $Id: pg_opclass.h,v 1.49 2003/05/26 00:11:27 tgl Exp $
  *
  * NOTES
  *	  the genbki.sh script reads this file and generates .bki
@@ -92,11 +92,14 @@ DATA(insert OID =  423 (	403		bit_ops			PGNSP PGUID 1560 t 0 ));
 DATA(insert OID =  424 (	403		bool_ops		PGNSP PGUID   16 t 0 ));
 DATA(insert OID =  425 (	402		box_ops			PGNSP PGUID  603 t 0 ));
 DATA(insert OID =  426 (	403		bpchar_ops		PGNSP PGUID 1042 t 0 ));
+#define BPCHAR_BTREE_OPS_OID 426
 DATA(insert OID =  427 (	405		bpchar_ops		PGNSP PGUID 1042 t 0 ));
 DATA(insert OID =  428 (	403		bytea_ops		PGNSP PGUID   17 t 0 ));
+#define BYTEA_BTREE_OPS_OID 428
 DATA(insert OID =  429 (	403		char_ops		PGNSP PGUID   18 t 0 ));
 DATA(insert OID =  431 (	405		char_ops		PGNSP PGUID   18 t 0 ));
 DATA(insert OID =  432 (	403		cidr_ops		PGNSP PGUID  650 t 0 ));
+#define CIDR_BTREE_OPS_OID 432
 DATA(insert OID =  433 (	405		cidr_ops		PGNSP PGUID  650 t 0 ));
 DATA(insert OID =  434 (	403		date_ops		PGNSP PGUID 1082 t 0 ));
 DATA(insert OID =  435 (	405		date_ops		PGNSP PGUID 1082 t 0 ));
@@ -105,6 +108,7 @@ DATA(insert OID = 1971 (	405		float4_ops		PGNSP PGUID  700 t 0 ));
 DATA(insert OID = 1972 (	403		float8_ops		PGNSP PGUID  701 t 0 ));
 DATA(insert OID = 1973 (	405		float8_ops		PGNSP PGUID  701 t 0 ));
 DATA(insert OID = 1974 (	403		inet_ops		PGNSP PGUID  869 t 0 ));
+#define INET_BTREE_OPS_OID 1974
 DATA(insert OID = 1975 (	405		inet_ops		PGNSP PGUID  869 t 0 ));
 DATA(insert OID = 1976 (	403		int2_ops		PGNSP PGUID   21 t 0 ));
 #define INT2_BTREE_OPS_OID 1976
@@ -119,6 +123,7 @@ DATA(insert OID = 1983 (	405		interval_ops	PGNSP PGUID 1186 t 0 ));
 DATA(insert OID = 1984 (	403		macaddr_ops		PGNSP PGUID  829 t 0 ));
 DATA(insert OID = 1985 (	405		macaddr_ops		PGNSP PGUID  829 t 0 ));
 DATA(insert OID = 1986 (	403		name_ops		PGNSP PGUID   19 t 0 ));
+#define NAME_BTREE_OPS_OID 1986
 DATA(insert OID = 1987 (	405		name_ops		PGNSP PGUID   19 t 0 ));
 DATA(insert OID = 1988 (	403		numeric_ops		PGNSP PGUID 1700 t 0 ));
 DATA(insert OID = 1989 (	403		oid_ops			PGNSP PGUID   26 t 0 ));
@@ -128,6 +133,7 @@ DATA(insert OID = 1991 (	403		oidvector_ops	PGNSP PGUID   30 t 0 ));
 DATA(insert OID = 1992 (	405		oidvector_ops	PGNSP PGUID   30 t 0 ));
 DATA(insert OID = 1993 (	402		poly_ops		PGNSP PGUID  604 t 0 ));
 DATA(insert OID = 1994 (	403		text_ops		PGNSP PGUID   25 t 0 ));
+#define TEXT_BTREE_OPS_OID 1994
 DATA(insert OID = 1995 (	405		text_ops		PGNSP PGUID   25 t 0 ));
 DATA(insert OID = 1996 (	403		time_ops		PGNSP PGUID 1083 t 0 ));
 DATA(insert OID = 1997 (	405		time_ops		PGNSP PGUID 1083 t 0 ));
@@ -137,12 +143,17 @@ DATA(insert OID = 2000 (	403		timetz_ops		PGNSP PGUID 1266 t 0 ));
 DATA(insert OID = 2001 (	405		timetz_ops		PGNSP PGUID 1266 t 0 ));
 DATA(insert OID = 2002 (	403		varbit_ops		PGNSP PGUID 1562 t 0 ));
 DATA(insert OID = 2003 (	403		varchar_ops		PGNSP PGUID 1043 t 0 ));
+#define VARCHAR_BTREE_OPS_OID 2003
 DATA(insert OID = 2004 (	405		varchar_ops		PGNSP PGUID 1043 t 0 ));
 DATA(insert OID = 2039 (	403		timestamp_ops	PGNSP PGUID 1114 t 0 ));
 DATA(insert OID = 2040 (	405		timestamp_ops	PGNSP PGUID 1114 t 0 ));
 DATA(insert OID = 2095 (	403		text_pattern_ops	PGNSP PGUID   25 f 0 ));
+#define TEXT_PATTERN_BTREE_OPS_OID 2095
 DATA(insert OID = 2096 (	403		varchar_pattern_ops	PGNSP PGUID 1043 f 0 ));
+#define VARCHAR_PATTERN_BTREE_OPS_OID 2096
 DATA(insert OID = 2097 (	403		bpchar_pattern_ops	PGNSP PGUID 1042 f 0 ));
+#define BPCHAR_PATTERN_BTREE_OPS_OID 2097
 DATA(insert OID = 2098 (	403		name_pattern_ops	PGNSP PGUID   19 f 0 ));
+#define NAME_PATTERN_BTREE_OPS_OID 2098
 
 #endif   /* PG_OPCLASS_H */