summaryrefslogtreecommitdiff
path: root/src/backend/optimizer/path/equivclass.c
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2011-08-09 00:49:04 -0400
committerTom Lane <tgl@sss.pgh.pa.us>2011-08-09 00:49:04 -0400
commit8a14bdb10f0a9b123e5c6f70f33334b132b3da29 (patch)
tree8227793f9274593813d187d84ee5a454a12966dc /src/backend/optimizer/path/equivclass.c
parentf60078232d587d62c7343780ce1c470e5f5c66a5 (diff)
Fix nested PlaceHolderVar expressions that appear only in targetlists.
A PlaceHolderVar's expression might contain another, lower-level PlaceHolderVar. If the outer PlaceHolderVar is used, the inner one certainly will be also, and so we have to make sure that both of them get into the placeholder_list with correct ph_may_need values during the initial pre-scan of the query (before deconstruct_jointree starts). We did this correctly for PlaceHolderVars appearing in the query quals, but overlooked the issue for those appearing in the top-level targetlist; with the result that nested placeholders referenced only in the targetlist did not work correctly, as illustrated in bug #6154. While at it, add some error checking to find_placeholder_info to ensure that we don't try to create new placeholders after it's too late to do so; they have to all be created before deconstruct_jointree starts. Back-patch to 8.4 where the PlaceHolderVar mechanism was introduced.
Diffstat (limited to 'src/backend/optimizer/path/equivclass.c')
-rw-r--r--src/backend/optimizer/path/equivclass.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/backend/optimizer/path/equivclass.c b/src/backend/optimizer/path/equivclass.c
index 75219d0f334..edbf7384e94 100644
--- a/src/backend/optimizer/path/equivclass.c
+++ b/src/backend/optimizer/path/equivclass.c
@@ -709,7 +709,7 @@ generate_base_implied_equalities_no_const(PlannerInfo *root,
List *vars = pull_var_clause((Node *) cur_em->em_expr,
PVC_INCLUDE_PLACEHOLDERS);
- add_vars_to_targetlist(root, vars, ec->ec_relids);
+ add_vars_to_targetlist(root, vars, ec->ec_relids, false);
list_free(vars);
}
}