database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-30 11:03:19 +03:00
Code Activity

Fix recursion into previously planned sub-query in examine_simple_variable.

Browse Source 
This code was looking at the sub-Query tree as seen in the parent query's
RangeTblEntry; but that's the pristine parser output, and what we need to
look at is the tree as it stands at the completion of planning.  Otherwise
we might pick up a Var that references a subquery that got flattened and
hence has no RelOptInfo in the subroot.  Per report from Peter Geoghegan.
This commit is contained in:
Tom Lane
2011-09-29 18:12:34 -04:00
parent 054219c907
commit 79edb2b1dc
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/backend/utils/adt/selfuncs.c
View File

@ -4382,6 +4382,17 @@ examine_simple_variable(PlannerInfo *root, Var *var,
/* Subquery should have been planned already */ /* Subquery should have been planned already */
Assert(rel->subroot && IsA(rel->subroot, PlannerInfo)); Assert(rel->subroot && IsA(rel->subroot, PlannerInfo));
/*
* Switch our attention to the subquery as mangled by the planner.
* It was okay to look at the pre-planning version for the tests
* above, but now we need a Var that will refer to the subroot's
* live RelOptInfos. For instance, if any subquery pullup happened
* during planning, Vars in the targetlist might have gotten replaced,
* and we need to see the replacement expressions.
*/
subquery = rel->subroot->parse;
Assert(IsA(subquery, Query));
/* Get the subquery output expression referenced by the upper Var */ /* Get the subquery output expression referenced by the upper Var */
ste = get_tle_by_resno(subquery->targetList, var->varattno); ste = get_tle_by_resno(subquery->targetList, var->varattno);
if (ste == NULL || ste->resjunk) if (ste == NULL || ste->resjunk)