Fix expression execution in update trigger

ildus · ildus · commit bf4ecb8ec86a · 2017-04-10T18:46:51.000+03:00
diff --git a/src/partition_creation.c b/src/partition_creation.c
@@ -1844,7 +1844,9 @@ get_part_expression_info(Oid relid, const char *expr_string,
 	expr_node = eval_const_expressions(NULL, expr_node);
 	validate_part_expression(expr_node, NULL);
 	if (contain_mutable_functions(expr_node))
-		elog(ERROR, "Expression should not contain mutable functions");
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
+				 errmsg("functions in partitioning expression must be marked IMMUTABLE")));
 
 	out_string = nodeToString(expr_node);
 
diff --git a/src/pl_funcs.c b/src/pl_funcs.c
@@ -1081,11 +1081,7 @@ change_vars_to_consts(Node *node, struct change_vars_context *ctx)
 		if (varattno == 0)
 			elog(ERROR, "Couldn't find attribute used in expression in child relation");
 
-		/*
-		 * we get atttribute type using tuple description of child relation,
-		 * because it could be changed earlier, so Var of parent relation
-		 * will not be valid anymore.
-		 */
+		/* we suppose that type can be different from parent */
 		atttype = ctx->tuple_desc->attrs[varattno - 1]->atttypid;
 
 		tp = SearchSysCache1(TYPEOID, ObjectIdGetDatum(atttype));
@@ -1112,7 +1108,7 @@ change_vars_to_consts(Node *node, struct change_vars_context *ctx)
 											 &new_const->constisnull);
 		return (Node *) new_const;
 	}
-	return expression_tree_mutator(node, change_vars_to_consts, NULL);
+	return expression_tree_mutator(node, change_vars_to_consts, (void *) ctx);
 }
 
 static ExprState *
