Fix mishandling of whole-row Vars referencing a view or sub-select.

If such a Var appeared within a nested sub-select, we failed to translate it
correctly during pullup of the view, because the recursive call to
replace_rte_variables_mutator was looking for the wrong sublevels_up value.
Bug was introduced during the addition of the PlaceHolderVar mechanism.
Per bug #5514 from Marcos Castedo.

diff --git a/src/backend/optimizer/prep/prepjointree.c b/src/backend/optimizer/prep/prepjointree.c
index bf8f022fcbc0789c299b1af360c04c7b68556c73..cd99752ee70d92359e2755bfac74eb7470123bff 100644 (file)
--- a/src/backend/optimizer/prep/prepjointree.c
+++ b/src/backend/optimizer/prep/prepjointree.c
@@ -16,7 +16,7 @@
  *
  *
  * IDENTIFICATION
- *       $PostgreSQL: pgsql/src/backend/optimizer/prep/prepjointree.c,v 1.66.2.1 2009/09/02 17:52:33 tgl Exp $
+ *       $PostgreSQL: pgsql/src/backend/optimizer/prep/prepjointree.c,v 1.66.2.2 2010/06/21 00:14:54 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1290,6 +1290,7 @@ pullup_replace_vars_callback(Var *var,
                List       *colnames;
                List       *fields;
                bool            save_need_phvs = rcon->need_phvs;
+               int                     save_sublevelsup = context->sublevels_up;
 
                /*
                 * If generating an expansion for a var of a named rowtype (ie, this
@@ -1307,9 +1308,12 @@ pullup_replace_vars_callback(Var *var,
                                  &colnames, &fields);
                /* Adjust the generated per-field Vars, but don't insert PHVs */
                rcon->need_phvs = false;
+               context->sublevels_up = 0; /* to match the expandRTE output */
                fields = (List *) replace_rte_variables_mutator((Node *) fields,
                                                                                                                context);
                rcon->need_phvs = save_need_phvs;
+               context->sublevels_up = save_sublevelsup;
+
                rowexpr = makeNode(RowExpr);
                rowexpr->args = fields;
                rowexpr->row_typeid = var->vartype;

diff --git a/src/test/regress/expected/subselect.out b/src/test/regress/expected/subselect.out
index 49ee53741b206686db1dd71095b72ec4c43d2a1c..b0b260f1847cc79f18bc89e2837927852d9b21ce 100644 (file)
--- a/src/test/regress/expected/subselect.out
+++ b/src/test/regress/expected/subselect.out
@@ -477,3 +477,33 @@ group by f1,f2,fs;
 ----+----+----
 (0 rows)
 
+--
+-- Test case for bug #5514 (mishandling of whole-row Vars in subselects)
+--
+create temp table table_a(id integer);
+insert into table_a values (42);
+create temp view view_a as select * from table_a;
+select view_a from view_a;
+ view_a 
+--------
+ (42)
+(1 row)
+
+select (select view_a) from view_a;
+ ?column? 
+----------
+ (42)
+(1 row)
+
+select (select (select view_a)) from view_a;
+ ?column? 
+----------
+ (42)
+(1 row)
+
+select (select (a.*)::text) from view_a a;
+ ?column? 
+----------
+ (42)
+(1 row)
+

diff --git a/src/test/regress/sql/subselect.sql b/src/test/regress/sql/subselect.sql
index fd8d5df3a01c72cc0ee409d33157e23e063bbb95..45be164d1d1cf52458306e9770c1e6c554fcc8b2 100644 (file)
--- a/src/test/regress/sql/subselect.sql
+++ b/src/test/regress/sql/subselect.sql
@@ -309,3 +309,17 @@ select * from
   (select distinct f1, f2, (select f2 from t1 x where x.f1 = up.f1) as fs
    from t1 up) ss
 group by f1,f2,fs;
+
+--
+-- Test case for bug #5514 (mishandling of whole-row Vars in subselects)
+--
+
+create temp table table_a(id integer);
+insert into table_a values (42);
+
+create temp view view_a as select * from table_a;
+
+select view_a from view_a;
+select (select view_a) from view_a;
+select (select (select view_a)) from view_a;
+select (select (a.*)::text) from view_a a;