Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 515e813

Browse files
committed
Fix inline_set_returning_function() to allow multiple OUT parameters.
inline_set_returning_function failed to distinguish functions returning generic RECORD (which require a column list in the RTE, as well as run-time type checking) from those with multiple OUT parameters (which do not). This prevented inlining from happening. Per complaint from Jay Levitt. Back-patch to 8.4 where this capability was introduced.
1 parent f66c825 commit 515e813

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

src/backend/optimizer/util/clauses.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
#include "catalog/pg_type.h"
2727
#include "executor/executor.h"
2828
#include "executor/functions.h"
29+
#include "funcapi.h"
2930
#include "miscadmin.h"
3031
#include "nodes/makefuncs.h"
3132
#include "nodes/nodeFuncs.h"
@@ -4516,9 +4517,12 @@ inline_set_returning_function(PlannerInfo *root, RangeTblEntry *rte)
45164517
* If it returns RECORD, we have to check against the column type list
45174518
* provided in the RTE; check_sql_fn_retval can't do that. (If no match,
45184519
* we just fail to inline, rather than complaining; see notes for
4519-
* tlist_matches_coltypelist.)
4520+
* tlist_matches_coltypelist.) We don't have to do this for functions
4521+
* with declared OUT parameters, even though their funcresulttype is
4522+
* RECORDOID, so check get_func_result_type too.
45204523
*/
45214524
if (fexpr->funcresulttype == RECORDOID &&
4525+
get_func_result_type(func_oid, NULL, NULL) == TYPEFUNC_RECORD &&
45224526
!tlist_matches_coltypelist(querytree->targetList, rte->funccoltypes))
45234527
goto fail;
45244528

0 commit comments

Comments
 (0)