Commitbf4ecb8

committed

Fix expression execution in update trigger

1 parent7e4709f commitbf4ecb8Copy full SHA for bf4ecb8

File tree

-7

lines changed

-7

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1844,7 +1844,9 @@ get_part_expression_info(Oid relid, const char *expr_string,`
`1844`	`1844`	`expr_node=eval_const_expressions(NULL,expr_node);`
`1845`	`1845`	`validate_part_expression(expr_node,NULL);`
`1846`	`1846`	`if (contain_mutable_functions(expr_node))`
`1847`		`-elog(ERROR,"Expression should not contain mutable functions");`
	`1847`	`+ereport(ERROR,`
	`1848`	`+(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),`
	`1849`	`+errmsg("functions in partitioning expression must be marked IMMUTABLE")));`
`1848`	`1850`
`1849`	`1851`	`out_string=nodeToString(expr_node);`
`1850`	`1852`

Lines changed: 2 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -1081,11 +1081,7 @@ change_vars_to_consts(Node node, struct change_vars_context ctx)`
`1081`	`1081`	`if (varattno==0)`
`1082`	`1082`	`elog(ERROR,"Couldn't find attribute used in expression in child relation");`
`1083`	`1083`
`1084`		`-/*`
`1085`		`- * we get atttribute type using tuple description of child relation,`
`1086`		`- * because it could be changed earlier, so Var of parent relation`
`1087`		`- * will not be valid anymore.`
`1088`		`- */`
	`1084`	`+/* we suppose that type can be different from parent */`
`1089`	`1085`	`atttype=ctx->tuple_desc->attrs[varattno-1]->atttypid;`
`1090`	`1086`
`1091`	`1087`	`tp=SearchSysCache1(TYPEOID,ObjectIdGetDatum(atttype));`
`@@ -1112,7 +1108,7 @@ change_vars_to_consts(Node node, struct change_vars_context ctx)`
`1112`	`1108`	`&new_const->constisnull);`
`1113`	`1109`	`return (Node*)new_const;`
`1114`	`1110`	`}`
`1115`		`-returnexpression_tree_mutator(node,change_vars_to_consts,NULL);`
	`1111`	`+returnexpression_tree_mutator(node,change_vars_to_consts,(void*)ctx);`
`1116`	`1112`	`}`
`1117`	`1113`
`1118`	`1114`	`staticExprState*`

Comments

(0)