diff options
| -rw-r--r-- | src/backend/optimizer/util/clauses.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/backend/optimizer/util/clauses.c b/src/backend/optimizer/util/clauses.c index a5faff26cfd..a767eda803c 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.162 2004/01/12 20:48:15 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/optimizer/util/clauses.c,v 1.163 2004/01/28 00:05:04 tgl Exp $ * * HISTORY * AUTHOR DATE MAJOR EVENT @@ -1711,6 +1711,7 @@ evaluate_function(Oid funcid, Oid result_type, List *args, bool has_null_input = false; List *arg; FuncExpr *newexpr; + char result_typtype; /* * Can't simplify if it returns a set. @@ -1748,6 +1749,15 @@ evaluate_function(Oid funcid, Oid result_type, List *args, return NULL; /* + * Can't simplify functions returning composite types (mainly because + * datumCopy() doesn't cope; FIXME someday when we have a saner + * representation for whole-tuple results). + */ + result_typtype = get_typtype(funcform->prorettype); + if (result_typtype == 'c') + return NULL; + + /* * OK, looks like we can simplify this operator/function. * * Build a new FuncExpr node containing the already-simplified arguments. |