From 2a35291952e2a516819553eb9eb40b6763182526 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Thu, 14 Apr 2005 21:44:35 +0000 Subject: [PATCH] Don't try to constant-fold functions returning RECORD, since the optimizer isn't presently set up to pass them an expected tuple descriptor. Bug has been there since 7.3 but was just recently reported by Thomas Hallgren. --- src/backend/optimizer/util/clauses.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/backend/optimizer/util/clauses.c b/src/backend/optimizer/util/clauses.c index ae0c387e69a..75c1e947792 100644 --- a/src/backend/optimizer/util/clauses.c +++ b/src/backend/optimizer/util/clauses.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/util/clauses.c,v 1.154.2.3 2005/04/10 20:58:03 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/util/clauses.c,v 1.154.2.4 2005/04/14 21:44:35 tgl Exp $ * * HISTORY * AUTHOR DATE MAJOR EVENT @@ -1667,6 +1667,13 @@ evaluate_function(Oid funcid, Oid result_type, List *args, if (funcform->proretset) return NULL; + /* + * Can't simplify if it returns RECORD, since it will be needing an + * expected tupdesc which we can't supply here. + */ + if (funcform->prorettype == RECORDOID) + return NULL; + /* * Check for constant inputs and especially constant-NULL inputs. */ -- 2.39.5