Make TypeCategory think that NAME is a member of type
category STRING. Also, if UNKNOWNOID is passed in, return UNKNOWN_TYPE not USER_TYPE.
This commit is contained in:
parent
c9f287e49b
commit
bbe1ff7404
|
@ -8,7 +8,7 @@
|
||||||
*
|
*
|
||||||
*
|
*
|
||||||
* IDENTIFICATION
|
* IDENTIFICATION
|
||||||
* $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.33 2000/02/27 18:54:43 tgl Exp $
|
* $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.34 2000/03/11 23:19:50 tgl Exp $
|
||||||
*
|
*
|
||||||
*-------------------------------------------------------------------------
|
*-------------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
|
@ -297,6 +297,7 @@ TypeCategory(Oid inType)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case (CHAROID):
|
case (CHAROID):
|
||||||
|
case (NAMEOID):
|
||||||
case (BPCHAROID):
|
case (BPCHAROID):
|
||||||
case (VARCHAROID):
|
case (VARCHAROID):
|
||||||
case (TEXTOID):
|
case (TEXTOID):
|
||||||
|
@ -331,11 +332,11 @@ TypeCategory(Oid inType)
|
||||||
|
|
||||||
case (POINTOID):
|
case (POINTOID):
|
||||||
case (LSEGOID):
|
case (LSEGOID):
|
||||||
case (LINEOID):
|
|
||||||
case (BOXOID):
|
|
||||||
case (PATHOID):
|
case (PATHOID):
|
||||||
case (CIRCLEOID):
|
case (BOXOID):
|
||||||
case (POLYGONOID):
|
case (POLYGONOID):
|
||||||
|
case (LINEOID):
|
||||||
|
case (CIRCLEOID):
|
||||||
result = GEOMETRIC_TYPE;
|
result = GEOMETRIC_TYPE;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -344,6 +345,11 @@ TypeCategory(Oid inType)
|
||||||
result = NETWORK_TYPE;
|
result = NETWORK_TYPE;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case (UNKNOWNOID):
|
||||||
|
case (InvalidOid):
|
||||||
|
result = UNKNOWN_TYPE;
|
||||||
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
result = USER_TYPE;
|
result = USER_TYPE;
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in New Issue