NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit515e813

committed

Fix inline_set_returning_function() to allow multiple OUT parameters.

inline_set_returning_function failed to distinguish functions returninggeneric RECORD (which require a column list in the RTE, as well as run-timetype 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 parentf66c825 commit515e813Copy full SHA for 515e813

File tree

1 file changed

-1

lines changed

src/backend/optimizer/util
- clauses.c

1 file changed

-1

lines changed

`‎src/backend/optimizer/util/clauses.c`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@`
`26`	`26`	`#include"catalog/pg_type.h"`
`27`	`27`	`#include"executor/executor.h"`
`28`	`28`	`#include"executor/functions.h"`
	`29`	`+#include"funcapi.h"`
`29`	`30`	`#include"miscadmin.h"`
`30`	`31`	`#include"nodes/makefuncs.h"`
`31`	`32`	`#include"nodes/nodeFuncs.h"`
`@@ -4516,9 +4517,12 @@ inline_set_returning_function(PlannerInfo root, RangeTblEntry rte)`
`4516`	`4517`	`* If it returns RECORD, we have to check against the column type list`
`4517`	`4518`	`* provided in the RTE; check_sql_fn_retval can't do that. (If no match,`
`4518`	`4519`	`* 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.`
`4520`	`4523`	`*/`
`4521`	`4524`	`if (fexpr->funcresulttype==RECORDOID&&`
	`4525`	`+get_func_result_type(func_oid,NULL,NULL)==TYPEFUNC_RECORD&&`
`4522`	`4526`	`!tlist_matches_coltypelist(querytree->targetList,rte->funccoltypes))`
`4523`	`4527`	`gotofail;`
`4524`	`4528`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit515e813

File tree

1 file changed

1 file changed

`‎src/backend/optimizer/util/clauses.c`

0 commit comments