diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2005-11-23 20:27:58 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2005-11-23 20:27:58 +0000 |
| commit | 4dd2048a47712732b60f45fd49f4080bfeec95a0 (patch) | |
| tree | 831248d517aed80c52fa6f7b0bd45b72c2009f68 /src/backend/executor/execUtils.c | |
| parent | 19ff959bff054574be094e9633b69fc65c6c6a3c (diff) | |
| download | postgresql-4dd2048a47712732b60f45fd49f4080bfeec95a0.tar.gz postgresql-4dd2048a47712732b60f45fd49f4080bfeec95a0.zip | |
Get rid of ExecAssignResultTypeFromOuterPlan() and make all plan node types
generate their output tuple descriptors from their target lists (ie, using
ExecAssignResultTypeFromTL()). We long ago fixed things so that all node
types have minimally valid tlists, so there's no longer any good reason to
have two different ways of doing it. This change is needed to fix bug
reported by Hayden James: the fix of 2005-11-03 to emit the correct column
names after optimizing away a SubqueryScan node didn't work if the new
top-level plan node used ExecAssignResultTypeFromOuterPlan to generate its
tupdesc, since the next plan node down won't have the correct column labels.
Diffstat (limited to 'src/backend/executor/execUtils.c')
| -rw-r--r-- | src/backend/executor/execUtils.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/src/backend/executor/execUtils.c b/src/backend/executor/execUtils.c index 5ab4a5e98fc..5221624fc7d 100644 --- a/src/backend/executor/execUtils.c +++ b/src/backend/executor/execUtils.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/execUtils.c,v 1.128 2005/11/22 18:17:10 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/executor/execUtils.c,v 1.129 2005/11/23 20:27:57 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -436,22 +436,6 @@ ExecAssignResultType(PlanState *planstate, } /* ---------------- - * ExecAssignResultTypeFromOuterPlan - * ---------------- - */ -void -ExecAssignResultTypeFromOuterPlan(PlanState *planstate) -{ - PlanState *outerPlan; - TupleDesc tupDesc; - - outerPlan = outerPlanState(planstate); - tupDesc = ExecGetResultType(outerPlan); - - ExecAssignResultType(planstate, tupDesc, false); -} - -/* ---------------- * ExecAssignResultTypeFromTL * ---------------- */ |