diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/optimizer/util/clauses.c | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/src/backend/optimizer/util/clauses.c b/src/backend/optimizer/util/clauses.c index 53ed5818ca1..fa2c3980083 100644 --- a/src/backend/optimizer/util/clauses.c +++ b/src/backend/optimizer/util/clauses.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/optimizer/util/clauses.c,v 1.201.2.2 2007/02/02 00:03:30 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/optimizer/util/clauses.c,v 1.201.2.3 2007/03/06 22:45:29 tgl Exp $ * * HISTORY * AUTHOR DATE MAJOR EVENT @@ -1594,6 +1594,7 @@ eval_const_expressions_mutator(Node *node, newrelabel->arg = (Expr *) arg; newrelabel->resulttype = relabel->resulttype; newrelabel->resulttypmod = relabel->resulttypmod; + newrelabel->relabelformat = relabel->relabelformat; return (Node *) newrelabel; } } @@ -2417,7 +2418,8 @@ inline_function(Oid funcid, Oid result_type, List *args, * no rewriting was needed; that's probably not important, but let's be * careful. */ - (void) check_sql_fn_retval(funcid, result_type, querytree_list, NULL); + if (check_sql_fn_retval(funcid, result_type, querytree_list, NULL)) + goto fail; /* reject whole-tuple-result cases */ /* * Additional validity checks on the expression. It mustn't return a set, @@ -2503,6 +2505,21 @@ inline_function(Oid funcid, Oid result_type, List *args, MemoryContextDelete(mycxt); /* + * Since check_sql_fn_retval allows binary-compatibility cases, the + * expression we now have might return some type that's only binary + * compatible with the original expression result type. To avoid + * confusing matters, insert a RelabelType in such cases. + */ + if (exprType(newexpr) != funcform->prorettype) + { + Assert(IsBinaryCoercible(exprType(newexpr), funcform->prorettype)); + newexpr = (Node *) makeRelabelType((Expr *) newexpr, + funcform->prorettype, + -1, + COERCE_IMPLICIT_CAST); + } + + /* * Recursively try to simplify the modified expression. Here we must add * the current function to the context list of active functions. */ |