diff options
| author | Tom Lane | 2004-01-22 02:23:21 +0000 |
|---|---|---|
| committer | Tom Lane | 2004-01-22 02:23:21 +0000 |
| commit | a376a4673ae9c331700f19f1bae999e3eadfaf10 (patch) | |
| tree | b2600f41af8e95543b479eec09053a0c8301db7a /src/include | |
| parent | bb9f66351ab3fed583d93200dc68dd60f8615d30 (diff) | |
Fix oversight in optimization that avoids an unnecessary projection step
when scanning a table that we need all the columns from. In case of
SELECT INTO, we have to check that the hasoids flag matches the desired
output type, too. Per report from Mike Mascari.
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/executor/executor.h | 3 | ||||
| -rw-r--r-- | src/include/nodes/execnodes.h | 7 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h index 050894708c8..39e07da8afb 100644 --- a/src/include/executor/executor.h +++ b/src/include/executor/executor.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/executor/executor.h,v 1.105 2004/01/14 23:01:55 tgl Exp $ + * $PostgreSQL: pgsql/src/include/executor/executor.h,v 1.106 2004/01/22 02:23:21 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -93,6 +93,7 @@ extern void ExecutorEnd(QueryDesc *queryDesc); extern void ExecutorRewind(QueryDesc *queryDesc); extern void ExecCheckRTPerms(List *rangeTable); extern void ExecEndPlan(PlanState *planstate, EState *estate); +extern bool ExecContextForcesOids(PlanState *planstate, bool *hasoids); extern void ExecConstraints(ResultRelInfo *resultRelInfo, TupleTableSlot *slot, EState *estate); extern TupleTableSlot *EvalPlanQual(EState *estate, Index rti, diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h index 21d32dec857..50db072f41a 100644 --- a/src/include/nodes/execnodes.h +++ b/src/include/nodes/execnodes.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/nodes/execnodes.h,v 1.110 2004/01/06 04:31:01 tgl Exp $ + * $PostgreSQL: pgsql/src/include/nodes/execnodes.h,v 1.111 2004/01/22 02:23:21 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -311,9 +311,8 @@ typedef struct EState List *es_rowMark; /* not good place, but there is no other */ bool es_instrument; /* true requests runtime instrumentation */ - bool es_force_oids; /* true forces result tuples to have - * (space for) OIDs --- used for SELECT - * INTO */ + bool es_select_into; /* true if doing SELECT INTO */ + bool es_into_oids; /* true to generate OIDs in SELECT INTO */ List *es_exprcontexts; /* List of ExprContexts within EState */ |