MonetDB: jacqueline - fix too optimistic logic

[Fabian Groffen]

Changeset: 07df1d67f746 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=07df1d67f746
Modified Files:
        monetdb5/extras/jaql/jaqlgencode.c
Branch: jacqueline
Log Message:

fix too optimistic logic

This makes *all* JAQL core test work!


diffs (12 lines):

diff --git a/monetdb5/extras/jaql/jaqlgencode.c 
b/monetdb5/extras/jaql/jaqlgencode.c
--- a/monetdb5/extras/jaql/jaqlgencode.c
+++ b/monetdb5/extras/jaql/jaqlgencode.c
@@ -4080,7 +4080,7 @@ changetmplrefsjoin(tree *t, char *except
        tree *w;
 
        for (w = t; w != NULL; w = w->next) {
-               if (w->type == j_var && except != NULL && strcmp(w->sval, 
except) != 0)
+               if (w->type == j_var && (except == NULL || strcmp(w->sval, 
except) != 0))
                {
                        /* inject an indirection to match the join output */
                        tree *n = GDKzalloc(sizeof(tree));
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list