Changeset: 5b7ff22f889e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/5b7ff22f889e
Modified Files:
        sql/server/rel_optimize_exps.c
Branch: reducedstack
Log Message:

small fixes new not rewriting


diffs (27 lines):

diff --git a/sql/server/rel_optimize_exps.c b/sql/server/rel_optimize_exps.c
--- a/sql/server/rel_optimize_exps.c
+++ b/sql/server/rel_optimize_exps.c
@@ -532,16 +532,21 @@ simplify_not(visitor *v, sql_exp *e)
 
                sql_exp *i = l->h->data;
 
-               if (is_compare(i->type)) {
+               if (is_compare(i->type) && i->flag != cmp_filter) {
                        if (is_anti(i))
                                reset_anti(i);
                        else
                                set_anti(i);
                        v->changes++;
+                       if (exp_name(e))
+                               exp_prop_alias(v->sql->sa, i, e);
                        return i;
                }
                v->changes++;
-               return exp_compare(v->sql->sa, i, exp_atom_bool(v->sql->sa, 0), 
cmp_equal);
+               sql_exp *ne = exp_compare(v->sql->sa, i, 
exp_atom_bool(v->sql->sa, 0), cmp_equal);
+               if (exp_name(e))
+                       exp_prop_alias(v->sql->sa, ne, e);
+               return ne;
        }
        return e;
 }
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to