Commitc0d9796

committed

Fix typo and attempt default fix.

1 parenta7b06f2 commitc0d9796Copy full SHA for c0d9796

File tree

+10

-9

lines changed

+10

-9

lines changed

Lines changed: 7 additions & 6 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/catalog/heap.c,v 1.81 1999/05/19 16:46:10 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/catalog/heap.c,v 1.82 1999/05/21 18:31:04 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*`
`13`	`13`	`* INTERFACE ROUTINES`
`@@ -47,6 +47,7 @@`
`47`	`47`	`#include"optimizer/tlist.h"`
`48`	`48`	`#include"parser/parse_expr.h"`
`49`	`49`	`#include"parser/parse_node.h"`
	`50`	`+#include"parser/parse_target.h"`
`50`	`51`	`#include"parser/parse_type.h"`
`51`	`52`	`#include"parser/parse_coerce.h"`
`52`	`53`	`#include"rewrite/rewriteRemove.h"`
`@@ -1545,11 +1546,11 @@ StoreAttrDefault(Relation rel, AttrDefault *attrdef)`
`1545`	`1546`	`if (atp->atttypid==BPCHAROID&&`
`1546`	`1547`	`(type==TEXTOID\|\|type==BPCHAROID\|\|type==UNKNOWNOID))`
`1547`	`1548`	`{`
`1548`		`-if (can_coerce_type(1,&(type),&(atp->atttypid)))`
`1549`		`-expr=coerce_type(NULL, (Node*)expr,type,atp->atttypid);`
`1550`		`-else`
`1551`		`-elog(ERROR,"DEFAULT clause const type '%s' can not be converted to char().",`
`1552`		`-typeidTypeName(type));`
	`1549`	`+FuncCall*n=makeNode(FuncCall);`
	`1550`	`+`
	`1551`	`+n->funcname=typeidTypeName(atp->atttypid);`
	`1552`	`+n->args=lcons((Node*)expr,NIL);`
	`1553`	`+expr=transformExpr(NULL, (Node*)n,EXPR_COLUMN_FIRST);`
`1553`	`1554`	`}`
`1554`	`1555`	`elseif (IS_BINARY_COMPATIBLE(type,atp->atttypid))`
`1555`	`1556`	`;/* use without change */`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`*`
`11`	`11`	`*`
`12`	`12`	`* IDENTIFICATION`
`13`		`- * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.81 1999/05/2115:47:13 momjian Exp $`
	`13`	`+ * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.82 1999/05/2118:31:06 momjian Exp $`
`14`	`14`	`*`
`15`	`15`	`* HISTORY`
`16`	`16`	`* AUTHORDATEMAJOR EVENT`
`@@ -5365,8 +5365,8 @@ static Node makeIndexable(char opname, Node lexpr, Node rexpr)`
`5365`	`5365`	`for (pos = 1; n->val.val.str[pos]; pos++)`
`5366`	`5366`	`{`
`5367`	`5367`	`if (n->val.val.str[pos] == '\|' \|\|`
`5368`		`-if (n->val.val.str[pos] == '{' \|\|`
`5369`		`-if (n->val.val.str[pos] == '}')`
	`5368`	`+n->val.val.str[pos] == '{' \|\|`
	`5369`	`+n->val.val.str[pos] == '}')`
`5370`	`5370`	`{`
`5371`	`5371`	`found_special = true;`
`5372`	`5372`	`break;`

Comments

(0)