summaryrefslogtreecommitdiff
path: root/src/backend/parser/parse_coerce.c
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2007-08-21 01:11:32 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2007-08-21 01:11:32 +0000
commit140d4ebcb46e17cdb1be43892ed797e5e060c8ef (patch)
treef99d209dbe5e40dcb434c3841e0c8b4ff383f453 /src/backend/parser/parse_coerce.c
parent4e94d1f952c3ce5670ceae3c12b55e344503a701 (diff)
Tsearch2 functionality migrates to core. The bulk of this work is by
Oleg Bartunov and Teodor Sigaev, but I did a lot of editorializing, so anything that's broken is probably my fault. Documentation is nonexistent as yet, but let's land the patch so we can get some portability testing done.
Diffstat (limited to 'src/backend/parser/parse_coerce.c')
-rw-r--r--src/backend/parser/parse_coerce.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/backend/parser/parse_coerce.c b/src/backend/parser/parse_coerce.c
index abc05685811..6fb7bd9b59f 100644
--- a/src/backend/parser/parse_coerce.c
+++ b/src/backend/parser/parse_coerce.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/parser/parse_coerce.c,v 2.155 2007/06/06 23:00:37 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/parser/parse_coerce.c,v 2.156 2007/08/21 01:11:15 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -1554,6 +1554,8 @@ TypeCategory(Oid inType)
case (REGOPERATOROID):
case (REGCLASSOID):
case (REGTYPEOID):
+ case (REGCONFIGOID):
+ case (REGDICTIONARYOID):
case (INT2OID):
case (INT4OID):
case (INT8OID):
@@ -1672,7 +1674,9 @@ IsPreferredType(CATEGORY category, Oid type)
type == REGOPEROID ||
type == REGOPERATOROID ||
type == REGCLASSOID ||
- type == REGTYPEOID)
+ type == REGTYPEOID ||
+ type == REGCONFIGOID ||
+ type == REGDICTIONARYOID)
preftype = OIDOID;
else
preftype = FLOAT8OID;