summaryrefslogtreecommitdiff
path: root/src/include/parser/parse_coerce.h
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2001-06-23 22:23:49 +0000
committerBruce Momjian <bruce@momjian.us>2001-06-23 22:23:49 +0000
commit6a7f23c2138d67a3311873ff58c14ad4224310bb (patch)
tree848d806020bbfa19655f47124b71a6f2751a0325 /src/include/parser/parse_coerce.h
parent2e2d17ed51a478dce46400cd23dfa0889c57b592 (diff)
> Marko Kreen <marko@l-t.ee> writes:
> > secure_ctx changes too. it will be PGC_BACKEND after '-p'. > > Oh, okay, I missed that part. Could we see the total state of the > patch --- ie, a diff against current CVS, not a bunch of deltas? > I've gotten confused about what's in and what's out. Ok, here it is. Cleared the ctx comment too - after -p it will be PGC_BACKEND in any case. Marko Kreen
Diffstat (limited to 'src/include/parser/parse_coerce.h')
-rw-r--r--src/include/parser/parse_coerce.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/include/parser/parse_coerce.h b/src/include/parser/parse_coerce.h
index 1f508b1eae0..f0b0607cd6c 100644
--- a/src/include/parser/parse_coerce.h
+++ b/src/include/parser/parse_coerce.h
@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $Id: parse_coerce.h,v 1.29 2001/06/19 22:39:12 tgl Exp $
+ * $Id: parse_coerce.h,v 1.30 2001/06/23 22:23:49 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -46,6 +46,7 @@ typedef enum CATEGORY
|| ((t) == BPCHAROID) \
|| ((t) == VARCHAROID) \
|| ((t) == TEXTOID) \
+ || ((t) == BYTEAOID) \
|| ((t) == INT4OID) \
|| ((t) == INT8OID) \
|| ((t) == FLOAT8OID) \
@@ -85,10 +86,16 @@ typedef enum CATEGORY
#define IS_BINARY_COMPATIBLE(a,b) \
(((a) == BPCHAROID && (b) == TEXTOID) \
|| ((a) == BPCHAROID && (b) == VARCHAROID) \
+ || ((a) == BPCHAROID && (b) == BYTEAOID) \
|| ((a) == VARCHAROID && (b) == TEXTOID) \
|| ((a) == VARCHAROID && (b) == BPCHAROID) \
+ || ((a) == VARCHAROID && (b) == BYTEAOID) \
|| ((a) == TEXTOID && (b) == BPCHAROID) \
|| ((a) == TEXTOID && (b) == VARCHAROID) \
+ || ((a) == TEXTOID && (b) == BYTEAOID) \
+ || ((a) == BYTEAOID && (b) == BPCHAROID) \
+ || ((a) == BYTEAOID && (b) == VARCHAROID) \
+ || ((a) == BYTEAOID && (b) == TEXTOID) \
|| ((a) == OIDOID && (b) == INT4OID) \
|| ((a) == OIDOID && (b) == REGPROCOID) \
|| ((a) == INT4OID && (b) == OIDOID) \