Commitbbe1ff7

committed

Make TypeCategory think that NAME is a member of type

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

1 parentc9f287e commitbbe1ff7Copy full SHA for bbe1ff7

File tree

+10

-4

lines changed

+10

-4

lines changed

Lines changed: 10 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.33 2000/02/27 18:54:43 tgl Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.34 2000/03/11 23:19:50 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -297,6 +297,7 @@ TypeCategory(Oid inType)`
`297`	`297`	`break;`
`298`	`298`
`299`	`299`	`case (CHAROID):`
	`300`	`+case (NAMEOID):`
`300`	`301`	`case (BPCHAROID):`
`301`	`302`	`case (VARCHAROID):`
`302`	`303`	`case (TEXTOID):`
`@@ -331,11 +332,11 @@ TypeCategory(Oid inType)`
`331`	`332`
`332`	`333`	`case (POINTOID):`
`333`	`334`	`case (LSEGOID):`
`334`		`-case (LINEOID):`
`335`		`-case (BOXOID):`
`336`	`335`	`case (PATHOID):`
`337`		`-case (CIRCLEOID):`
	`336`	`+case (BOXOID):`
`338`	`337`	`case (POLYGONOID):`
	`338`	`+case (LINEOID):`
	`339`	`+case (CIRCLEOID):`
`339`	`340`	`result=GEOMETRIC_TYPE;`
`340`	`341`	`break;`
`341`	`342`
`@@ -344,6 +345,11 @@ TypeCategory(Oid inType)`
`344`	`345`	`result=NETWORK_TYPE;`
`345`	`346`	`break;`
`346`	`347`
	`348`	`+case (UNKNOWNOID):`
	`349`	`+case (InvalidOid):`
	`350`	`+result=UNKNOWN_TYPE;`
	`351`	`+break;`
	`352`	`+`
`347`	`353`	`default:`
`348`	`354`	`result=USER_TYPE;`
`349`	`355`	`break;`

Comments

(0)