Commit 3b6073de authored by Tom Lane's avatar Tom Lane

Remove some unnecessary code: since ExecMakeFunctionResultNoSets does not

want to handle set inputs, it should just pass NULL for isDone, not make
its own failure check.
parent 8d6e9bca
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/executor/execQual.c,v 1.178 2005/05/09 14:28:39 tgl Exp $ * $PostgreSQL: pgsql/src/backend/executor/execQual.c,v 1.179 2005/05/12 20:41:56 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -1060,17 +1060,11 @@ ExecMakeFunctionResultNoSets(FuncExprState *fcache, ...@@ -1060,17 +1060,11 @@ ExecMakeFunctionResultNoSets(FuncExprState *fcache,
foreach(arg, fcache->args) foreach(arg, fcache->args)
{ {
ExprState *argstate = (ExprState *) lfirst(arg); ExprState *argstate = (ExprState *) lfirst(arg);
ExprDoneCond thisArgIsDone;
fcinfo.arg[i] = ExecEvalExpr(argstate, fcinfo.arg[i] = ExecEvalExpr(argstate,
econtext, econtext,
&fcinfo.argnull[i], &fcinfo.argnull[i],
&thisArgIsDone); NULL);
if (thisArgIsDone != ExprSingleResult)
ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
errmsg("set-valued function called in context that cannot accept a set")));
i++; i++;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment