MonetDB: octbugs - Look for failed conversion

[Pedro Ferreira]

Changeset: 3e4bf27bd8aa for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3e4bf27bd8aa
Modified Files:
        sql/server/rel_unnest.c
Branch: octbugs
Log Message:

Look for failed conversion


diffs (21 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
@@ -2267,7 +2267,7 @@ rewrite_anyequal(mvc *sql, sql_rel *rel,
                                        return exp_in_compare(sql, &le, vals, 
is_anyequal(sf));
                                } else {
                                        le = exp_in_project(sql, &le, vals, 
is_anyequal(sf));
-                                       if (exp_name(e))
+                                       if (le && exp_name(e))
                                                exp_prop_alias(sql->sa, le, e);
                                        return le;
                                }
@@ -2465,7 +2465,7 @@ rewrite_compare(visitor *v, sql_rel *rel
                                        return exp_in_compare(v->sql, &le, 
vals, is_anyequal(sf));
                                } else {
                                        le = exp_in_project(v->sql, &le, vals, 
is_anyequal(sf));
-                                       if (exp_name(e))
+                                       if (le && exp_name(e))
                                                exp_prop_alias(v->sql->sa, le, 
e);
                                        return le;
                                }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list