Make TypeCategory think that NAME is a member of type

category STRING.  Also, if UNKNOWNOID is passed in, return UNKNOWN_TYPE
not USER_TYPE.

diff --git a/src/backend/parser/parse_coerce.c b/src/backend/parser/parse_coerce.c
index 543971493742587342af425b4d4cda591447da28..210a8f946e300223f3f4c158d036a91a911509fe 100644 (file)
--- 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.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;
 
                case (CHAROID):
+               case (NAMEOID):
                case (BPCHAROID):
                case (VARCHAROID):
                case (TEXTOID):
@@ -331,11 +332,11 @@ TypeCategory(Oid inType)
 
                case (POINTOID):
                case (LSEGOID):
-               case (LINEOID):
-               case (BOXOID):
                case (PATHOID):
-               case (CIRCLEOID):
+               case (BOXOID):
                case (POLYGONOID):
+               case (LINEOID):
+               case (CIRCLEOID):
                        result = GEOMETRIC_TYPE;
                        break;
 
@@ -344,6 +345,11 @@ TypeCategory(Oid inType)
                        result = NETWORK_TYPE;
                        break;
 
+               case (UNKNOWNOID):
+               case (InvalidOid):
+                       result = UNKNOWN_TYPE;
+                       break;
+
                default:
                        result = USER_TYPE;
                        break;