MonetDB: Jul2021 - make sure we unnest views

[Niels Nes]

Changeset: 734fbb3ba87a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/734fbb3ba87a
Modified Files:
        sql/server/rel_select.c
        
sql/test/BugTracker-2018/Tests/count_from_commented_function_signatures.Bug-6542.test
Branch: Jul2021
Log Message:

make sure we unnest views


diffs (26 lines):

diff --git a/sql/server/rel_select.c b/sql/server/rel_select.c
--- a/sql/server/rel_select.c
+++ b/sql/server/rel_select.c
@@ -996,6 +996,8 @@ table_ref(sql_query *query, sql_rel *rel
                                        rel_base_disallow(rel);
                        } else {
                                rel = rel_parse(sql, t->s, t->query, 
m_instantiate);
+                               if (rel)
+                                       rel = rel_unnest(sql, rel);
                        }
 
                        if (!rel)
diff --git 
a/sql/test/BugTracker-2018/Tests/count_from_commented_function_signatures.Bug-6542.test
 
b/sql/test/BugTracker-2018/Tests/count_from_commented_function_signatures.Bug-6542.test
--- 
a/sql/test/BugTracker-2018/Tests/count_from_commented_function_signatures.Bug-6542.test
+++ 
b/sql/test/BugTracker-2018/Tests/count_from_commented_function_signatures.Bug-6542.test
@@ -56,8 +56,8 @@ project (
 | | | | ) [ "f"."id" as "fid", "line" ]
 | | | ) [ "fid" ] [ "line" ASC ]
 | | ) [ "fid" as "commented_function_signatures_6542"."fid" ]
-| ) [  ] [ "sys"."count"() NOT NULL as "%1"."%1" ]
-) [ "%1"."%1" NOT NULL ]
+| ) [  ] [ "sys"."count"() NOT NULL as "%3"."%3" ]
+) [ "%3"."%3" NOT NULL ]
 
 query I rowsort
 select count (*) from sys.commented_function_signatures_6542
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list