Commitec67b89

committed

Add UtilityReturnsTuples() support for CALL

This ensures that prepared statements for CALL can return tuples.

1 parentcccf81d commitec67b89Copy full SHA for ec67b89

File tree

+34

-0

lines changed

+34

-0

lines changed

Lines changed: 24 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,7 @@`
`51`	`51`	`#include"commands/proclang.h"`
`52`	`52`	`#include"executor/execdesc.h"`
`53`	`53`	`#include"executor/executor.h"`
	`54`	`+#include"funcapi.h"`
`54`	`55`	`#include"miscadmin.h"`
`55`	`56`	`#include"optimizer/clauses.h"`
`56`	`57`	`#include"optimizer/var.h"`
`@@ -2340,3 +2341,26 @@ ExecuteCallStmt(CallStmt *stmt, ParamListInfo params, bool atomic, DestReceiver`
`2340`	`2341`
`2341`	`2342`	`FreeExecutorState(estate);`
`2342`	`2343`	`}`
	`2344`	`+`
	`2345`	`+/*`
	`2346`	`+ * Construct the tuple descriptor for a CALL statement return`
	`2347`	`+ */`
	`2348`	`+TupleDesc`
	`2349`	`+CallStmtResultDesc(CallStmt*stmt)`
	`2350`	`+{`
	`2351`	`+FuncExpr*fexpr;`
	`2352`	`+HeapTupletuple;`
	`2353`	`+TupleDesctupdesc;`
	`2354`	`+`
	`2355`	`+fexpr=stmt->funcexpr;`
	`2356`	`+`
	`2357`	`+tuple=SearchSysCache1(PROCOID,ObjectIdGetDatum(fexpr->funcid));`
	`2358`	`+if (!HeapTupleIsValid(tuple))`
	`2359`	`+elog(ERROR,"cache lookup failed for procedure %u",fexpr->funcid);`
	`2360`	`+`
	`2361`	`+tupdesc=build_function_result_tupdesc_t(tuple);`
	`2362`	`+`
	`2363`	`+ReleaseSysCache(tuple);`
	`2364`	`+`
	`2365`	`+returntupdesc;`
	`2366`	`+}`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1744,6 +1744,12 @@ UtilityReturnsTuples(Node *parsetree)`
`1744`	`1744`	`{`
`1745`	`1745`	`switch (nodeTag(parsetree))`
`1746`	`1746`	`{`
	`1747`	`+caseT_CallStmt:`
	`1748`	`+{`
	`1749`	`+CallStmtstmt= (CallStmt)parsetree;`
	`1750`	`+`
	`1751`	`+return (stmt->funcexpr->funcresulttype==RECORDOID);`
	`1752`	`+}`
`1747`	`1753`	`caseT_FetchStmt:`
`1748`	`1754`	`{`
`1749`	`1755`	`FetchStmtstmt= (FetchStmt)parsetree;`
`@@ -1794,6 +1800,9 @@ UtilityTupleDescriptor(Node *parsetree)`
`1794`	`1800`	`{`
`1795`	`1801`	`switch (nodeTag(parsetree))`
`1796`	`1802`	`{`
	`1803`	`+caseT_CallStmt:`
	`1804`	`+returnCallStmtResultDesc((CallStmt*)parsetree);`
	`1805`	`+`
`1797`	`1806`	`caseT_FetchStmt:`
`1798`	`1807`	`{`
`1799`	`1808`	`FetchStmtstmt= (FetchStmt)parsetree;`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,7 @@ extern void IsThereFunctionInNamespace(const char *proname, int pronargs,`
`64`	`64`	`oidvector*proargtypes,OidnspOid);`
`65`	`65`	`externvoidExecuteDoStmt(DoStmt*stmt,boolatomic);`
`66`	`66`	`externvoidExecuteCallStmt(CallStmtstmt,ParamListInfoparams,boolatomic,DestReceiverdest);`
	`67`	`+externTupleDescCallStmtResultDesc(CallStmt*stmt);`
`67`	`68`	`externOidget_cast_oid(Oidsourcetypeid,Oidtargettypeid,boolmissing_ok);`
`68`	`69`	`externOidget_transform_oid(Oidtype_id,Oidlang_id,boolmissing_ok);`
`69`	`70`	`externvoidinterpret_function_parameter_list(ParseState*pstate,`

Comments

(0)