Commit52aa720

committed

Add separate type category for bit string types, allowing mixed bit/varbit

function calls to work.

1 parent8a35ac2 commit52aa720Copy full SHA for 52aa720

File tree

-3

lines changed

-3

lines changed

Lines changed: 6 additions & 2 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.49 2000/11/16 22:30:27 tgl Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.50 2000/11/17 19:57:47 petere Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -458,7 +458,7 @@ TypeCategory(Oid inType)`
`458`	`458`	`*/`
`459`	`459`	`case (ZPBITOID):`
`460`	`460`	`case (VARBITOID):`
`461`		`-result=STRING_TYPE;`
	`461`	`+result=BITSTRING_TYPE;`
`462`	`462`	`break;`
`463`	`463`
`464`	`464`	`case (OIDOID):`
`@@ -543,6 +543,10 @@ PreferredType(CATEGORY category, Oid type)`
`543`	`543`	`result=TEXTOID;`
`544`	`544`	`break;`
`545`	`545`
	`546`	`+case (BITSTRING_TYPE):`
	`547`	`+result=VARBITOID;`
	`548`	`+break;`
	`549`	`+`
`546`	`550`	`case (NUMERIC_TYPE):`
`547`	`551`	`if (type==OIDOID)`
`548`	`552`	`result=OIDOID;`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* Portions Copyright (c) 1996-2000, PostgreSQL, Inc`
`8`	`8`	`* Portions Copyright (c) 1994, Regents of the University of California`
`9`	`9`	`*`
`10`		`- * $Id: parse_coerce.h,v 1.24 2000/10/05 19:11:38 tgl Exp $`
	`10`	`+ * $Id: parse_coerce.h,v 1.25 2000/11/17 19:57:48 petere Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -23,6 +23,7 @@ typedef enum CATEGORY`
`23`	`23`	`UNKNOWN_TYPE,`
`24`	`24`	`BOOLEAN_TYPE,`
`25`	`25`	`STRING_TYPE,`
	`26`	`+BITSTRING_TYPE,`
`26`	`27`	`NUMERIC_TYPE,`
`27`	`28`	`DATETIME_TYPE,`
`28`	`29`	`TIMESPAN_TYPE,`

Comments

(0)