diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2000-08-24 03:29:15 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2000-08-24 03:29:15 +0000 |
| commit | 782c16c6a154e760bf1608d633488538cd52da93 (patch) | |
| tree | 902da787593da21a979bd2f74b0b44acf9c427b0 /src/backend/executor/nodeSubplan.c | |
| parent | 87523ab8db34859ae3fb980a3fab9f29dfc4c97a (diff) | |
| download | postgresql-782c16c6a154e760bf1608d633488538cd52da93.tar.gz postgresql-782c16c6a154e760bf1608d633488538cd52da93.zip | |
SQL-language functions are now callable in ordinary fmgr contexts ...
for example, an SQL function can be used in a functional index. (I make
no promises about speed, but it'll work ;-).) Clean up and simplify
handling of functions returning sets.
Diffstat (limited to 'src/backend/executor/nodeSubplan.c')
| -rw-r--r-- | src/backend/executor/nodeSubplan.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/backend/executor/nodeSubplan.c b/src/backend/executor/nodeSubplan.c index 3d331c714f7..aee6911e5e4 100644 --- a/src/backend/executor/nodeSubplan.c +++ b/src/backend/executor/nodeSubplan.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/nodeSubplan.c,v 1.26 2000/07/12 02:37:04 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeSubplan.c,v 1.27 2000/08/24 03:29:03 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -40,7 +40,6 @@ ExecSubPlan(SubPlan *node, List *pvar, ExprContext *econtext, bool *isNull) MemoryContext oldcontext; TupleTableSlot *slot; Datum result; - bool isDone; bool found = false; /* TRUE if got at least one subplan tuple */ List *lst; @@ -67,9 +66,7 @@ ExecSubPlan(SubPlan *node, List *pvar, ExprContext *econtext, bool *isNull) prm->value = ExecEvalExprSwitchContext((Node *) lfirst(pvar), econtext, &(prm->isnull), - &isDone); - if (!isDone) - elog(ERROR, "ExecSubPlan: set values not supported for params"); + NULL); pvar = lnext(pvar); } plan->chgParam = nconc(plan->chgParam, listCopy(node->parParam)); @@ -189,9 +186,7 @@ ExecSubPlan(SubPlan *node, List *pvar, ExprContext *econtext, bool *isNull) * Now we can eval the combining operator for this column. */ expresult = ExecEvalExprSwitchContext((Node *) expr, econtext, - &expnull, &isDone); - if (!isDone) - elog(ERROR, "ExecSubPlan: set values not supported for combining operators"); + &expnull, NULL); /* * Combine the result into the row result as appropriate. |