diff options
| author | Bruce Momjian <bruce@momjian.us> | 2001-06-23 22:23:49 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2001-06-23 22:23:49 +0000 |
| commit | 6a7f23c2138d67a3311873ff58c14ad4224310bb (patch) | |
| tree | 848d806020bbfa19655f47124b71a6f2751a0325 /src/backend/parser/parse_coerce.c | |
| parent | 2e2d17ed51a478dce46400cd23dfa0889c57b592 (diff) | |
| download | postgresql-6a7f23c2138d67a3311873ff58c14ad4224310bb.tar.gz | |
> 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/backend/parser/parse_coerce.c')
| -rw-r--r-- | src/backend/parser/parse_coerce.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/backend/parser/parse_coerce.c b/src/backend/parser/parse_coerce.c index 283fd30240..52ba418401 100644 --- a/src/backend/parser/parse_coerce.c +++ b/src/backend/parser/parse_coerce.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.58 2001/06/19 22:39:11 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.59 2001/06/23 22:23:49 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -470,6 +470,7 @@ TypeCategory(Oid inType) case (CHAROID): case (NAMEOID): + case (BYTEAOID): case (BPCHAROID): case (VARCHAROID): case (TEXTOID): @@ -614,6 +615,7 @@ PromoteTypeToNext(Oid inType) result = VARCHAROID; break; + case (BYTEAOID): case (VARCHAROID): result = TEXTOID; break; @@ -708,6 +710,7 @@ PromoteLesserType(Oid inType1, Oid inType2, Oid *newType1, Oid *newType2) case (CHAROID): switch (*arg2) { + case (BYTEAOID): case (BPCHAROID): case (VARCHAROID): case (TEXTOID): @@ -772,6 +775,7 @@ PromoteLesserType(Oid inType1, Oid inType2, Oid *newType1, Oid *newType2) case (CHAROID): switch (*arg2) { + case (BYTEAOID): case (BPCHAROID): case (VARCHAROID): case (TEXTOID): |