From: Tom Lane Date: Thu, 29 Sep 2011 22:12:34 +0000 (-0400) Subject: Fix recursion into previously planned sub-query in examine_simple_variable. X-Git-Tag: REL9_2_BETA1~1045 X-Git-Url: http://git.postgresql.org/gitweb/?a=commitdiff_plain;h=79edb2b1dc33166b576f51a8255a7614f748d9c9;p=postgresql.git Fix recursion into previously planned sub-query in examine_simple_variable. 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. --- diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c index 3e846799563..8ceea820bdc 100644 --- a/src/backend/utils/adt/selfuncs.c +++ b/src/backend/utils/adt/selfuncs.c @@ -4382,6 +4382,17 @@ examine_simple_variable(PlannerInfo *root, Var *var, /* Subquery should have been planned already */ 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 */ ste = get_tle_by_resno(subquery->targetList, var->varattno); if (ste == NULL || ste->resjunk)