Remove some unnecessary code: since ExecMakeFunctionResultNoSets does not

tglsfdc · tglsfdc · commit 3b6073de7138 · 2005-05-12T20:41:56.000Z
want to handle set inputs, it should just pass NULL for isDone, not make
its own failure check.
diff --git a/src/backend/executor/execQual.c b/src/backend/executor/execQual.c
@@ -8,7 +8,7 @@
  *
  *
  * 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,
 	foreach(arg, fcache->args)
 	{
 		ExprState  *argstate = (ExprState *) lfirst(arg);
-		ExprDoneCond thisArgIsDone;
 
 		fcinfo.arg[i] = ExecEvalExpr(argstate,
 									 econtext,
 									 &fcinfo.argnull[i],
-									 &thisArgIsDone);
-
-		if (thisArgIsDone != ExprSingleResult)
-			ereport(ERROR,
-					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-					 errmsg("set-valued function called in context that cannot accept a set")));
+									 NULL);
 		i++;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/executor/execQual.c,v 1.178 2005/05/09 14:28:39 tgl Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/executor/execQual.c,v 1.179 2005/05/12 20:41:56 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -1060,17 +1060,11 @@ ExecMakeFunctionResultNoSets(FuncExprState *fcache,`
`1060`	`1060`	`foreach(arg, fcache->args)`
`1061`	`1061`	`{`
`1062`	`1062`	`ExprState argstate = (ExprState ) lfirst(arg);`
`1063`		`- ExprDoneCond thisArgIsDone;`
`1064`	`1063`
`1065`	`1064`	`fcinfo.arg[i] = ExecEvalExpr(argstate,`
`1066`	`1065`	`econtext,`
`1067`	`1066`	`&fcinfo.argnull[i],`
`1068`		`- &thisArgIsDone);`
`1069`		`-`
`1070`		`- if (thisArgIsDone != ExprSingleResult)`
`1071`		`- ereport(ERROR,`
`1072`		`- (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),`
`1073`		`- errmsg("set-valued function called in context that cannot accept a set")));`
	`1067`	`+ NULL);`
`1074`	`1068`	`i++;`
`1075`	`1069`	`}`
`1076`	`1070`