Changeset: 1fc250a4b1a5 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/1fc250a4b1a5
Modified Files:
        sql/server/rel_unnest.c
Branch: default
Log Message:

make sure merged project expressions in push up project are bound


diffs (20 lines):

diff --git a/sql/server/rel_unnest.c b/sql/server/rel_unnest.c
--- a/sql/server/rel_unnest.c
+++ b/sql/server/rel_unnest.c
@@ -907,7 +907,15 @@ push_up_project(mvc *sql, sql_rel *rel, 
                                l = rel_dup(l);
                                if (!is_project(l->op) || rel_is_ref(l))
                                        l = rel_project( sql->sa, l, 
rel_projections(sql, l, NULL, 1, 1));
-                               l->exps = list_merge(l->exps, r->exps, 
(fdup)NULL);
+                               if (r->exps) {
+                                       for (m=r->exps->h; m; m = m->next) {
+                                               sql_exp *e = m->data;
+
+                                               if (exp_has_freevar(sql, e))
+                                                       rel_bind_var(sql, l, e);
+                                               append(l->exps, e);
+                                       }
+                               }
                                rel_destroy(rel);
                                return l;
                        }
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to