Changeset: 833c074e4e33 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/833c074e4e33
Modified Files:
sql/server/rel_dump.c
sql/server/rel_rewriter.c
Branch: no_type_bat
Log Message:
merged with default
diffs (34 lines):
diff --git a/sql/server/rel_dump.c b/sql/server/rel_dump.c
--- a/sql/server/rel_dump.c
+++ b/sql/server/rel_dump.c
@@ -610,6 +610,13 @@ rel_print_refs(mvc *sql, stream* fout, s
switch (rel->op) {
case op_basetable:
case op_table:
+ if (rel->op == op_table && rel->l) {
+ rel_print_refs(sql, fout, rel->l, depth, refs,
decorate);
+ if (rel_is_ref(rel->l) && !find_ref(refs, rel->l)) {
+ rel_print_rel(sql, fout, rel->l, depth, refs,
decorate);
+ list_append(refs, rel->l);
+ }
+ }
break;
case op_ddl:
if (rel->flag == ddl_list || rel->flag == ddl_exception) {
diff --git a/sql/server/rel_rewriter.c b/sql/server/rel_rewriter.c
--- a/sql/server/rel_rewriter.c
+++ b/sql/server/rel_rewriter.c
@@ -33,10 +33,10 @@ exps_simplify_exp(visitor *v, list *exps
needed = (exp_is_true(e) || exp_is_false(e) ||
(is_compare(e->type) && e->flag == cmp_or));
}
- /* if there's only one expression and it is false, we have to keep it */
- if (list_length(exps) == 1 && exp_is_false(exps->h->data))
- return exps;
if (needed) {
+ /* if there's only one expression and it is false, we have to
keep it */
+ if (list_length(exps) == 1 && exp_is_false(exps->h->data))
+ return exps;
list *nexps = sa_list(v->sql->sa);
for (node *n=exps->h; n; n = n->next) {
sql_exp *e = n->data;
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
