Commit33572dd

committed

Fix for constbyval .

1 parent2074b5f commit33572ddCopy full SHA for 33572dd

File tree

-10

lines changed

-10

lines changed

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.34 1998/09/0104:27:49 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.35 1998/10/0122:45:29 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -332,8 +332,7 @@ MergeAttributes(List schema, List supers, List **supconstr)`
`332`	`332`
`333`	`333`	`for (i=0;i<constr->num_check;i++)`
`334`	`334`	`{`
`335`		`-Constraintcdef= (Constraint)makeNode(Constraint);/* palloc(sizeof(Constrai`
`336`		`- * nt)); */`
	`335`	`+Constraintcdef= (Constraint)makeNode(Constraint);`
`337`	`336`
`338`	`337`	`cdef->contype=CONSTR_CHECK;`
`339`	`338`	`if (check[i].ccname[0]=='$')`

Lines changed: 4 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.6 1998/09/0104:30:28 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.7 1998/10/0122:45:30 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -99,8 +99,7 @@ coerce_type(ParseState pstate, Node node, Oid inputTypeId, Oid targetTypeId)`
`99`	`99`	`{`
`100`	`100`	`Constcon= (Const)node;`
`101`	`101`
`102`		`-val= (Datum)textout((structvarlena*)`
`103`		`-con->constvalue);`
	`102`	`+val= (Datum)textout((structvarlena*)con->constvalue);`
`104`	`103`	`infunc=typeidInfunc(targetTypeId);`
`105`	`104`	`con=makeNode(Const);`
`106`	`105`	`con->consttype=targetTypeId;`
`@@ -109,10 +108,10 @@ coerce_type(ParseState pstate, Node node, Oid inputTypeId, Oid targetTypeId)`
`109`	`108`	`/* use "-1" for varchar() type */`
`110`	`109`	`con->constvalue= (Datum)fmgr(infunc,`
`111`	`110`	`val,`
`112`		`-typeidTypElem(targetTypeId),`
	`111`	`+typeidTypElem(targetTypeId),`
`113`	`112`	`-1);`
`114`	`113`	`con->constisnull= false;`
`115`		`-con->constbyval=true;`
	`114`	`+con->constbyval=typeByVal(typeidType(targetTypeId));`
`116`	`115`	`con->constisset= false;`
`117`	`116`	`result= (Node*)con;`
`118`	`117`	`}`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/parser/parse_node.c,v 1.22 1998/09/25 13:36:05 thomas Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/parser/parse_node.c,v 1.23 1998/10/01 22:45:32 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -79,7 +79,6 @@ make_operand(char *opname,`
`79`	`79`	`result=coerce_type(NULL,tree,orig_typeId,true_typeId);`
`80`	`80`	`}`
`81`	`81`	`}`
`82`		`-`
`83`	`82`	`/* otherwise, this is a NULL value */`
`84`	`83`	`else`
`85`	`84`	`{`

Comments

(0)