diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 1999-11-15 02:00:15 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 1999-11-15 02:00:15 +0000 |
| commit | f68e11f373de8b7b1d19203b8edac1a13a8d406d (patch) | |
| tree | c4e61de2b9bd9b8dd7c70545dc861de3547294d4 /src/backend/nodes/copyfuncs.c | |
| parent | 1ecb129d206f30f5813b01e1f1efe75c06febe49 (diff) | |
| download | postgresql-f68e11f373de8b7b1d19203b8edac1a13a8d406d.tar.gz postgresql-f68e11f373de8b7b1d19203b8edac1a13a8d406d.zip | |
Implement subselects in target lists. Also, relax requirement that
subselects can only appear on the righthand side of a binary operator.
That's still true for quantified predicates like x = ANY (SELECT ...),
but a subselect that delivers a single result can now appear anywhere
in an expression. This is implemented by changing EXPR_SUBLINK sublinks
to represent just the (SELECT ...) expression, without any 'left hand
side' or combining operator --- so they're now more like EXISTS_SUBLINK.
To handle the case of '(x, y, z) = (SELECT ...)', I added a new sublink
type MULTIEXPR_SUBLINK, which acts just like EXPR_SUBLINK used to.
But the grammar will only generate one for a multiple-left-hand-side
row expression.
Diffstat (limited to 'src/backend/nodes/copyfuncs.c')
| -rw-r--r-- | src/backend/nodes/copyfuncs.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c index 5b7437b5644..d353df58bdc 100644 --- a/src/backend/nodes/copyfuncs.c +++ b/src/backend/nodes/copyfuncs.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.94 1999/11/01 05:15:13 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.95 1999/11/15 02:00:01 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -86,10 +86,11 @@ CopyPlanFields(Plan *from, Plan *newnode) newnode->locParam = listCopy(from->locParam); newnode->chgParam = listCopy(from->chgParam); Node_Copy(from, newnode, initPlan); - if (from->subPlan != NULL) - newnode->subPlan = SS_pull_subplan((Node *) newnode->qual); + if (from->subPlan != NIL) + newnode->subPlan = nconc(SS_pull_subplan((Node *) newnode->targetlist), + SS_pull_subplan((Node *) newnode->qual)); else - newnode->subPlan = NULL; + newnode->subPlan = NIL; newnode->nParamExec = from->nParamExec; } @@ -137,8 +138,9 @@ _copyResult(Result *from) * We must add subplans in resconstantqual to the new plan's subPlan * list */ - newnode->plan.subPlan = nconc(newnode->plan.subPlan, - SS_pull_subplan(newnode->resconstantqual)); + if (from->plan.subPlan != NIL) + newnode->plan.subPlan = nconc(newnode->plan.subPlan, + SS_pull_subplan(newnode->resconstantqual)); return newnode; } |