Changeset: e09755e69b33 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e09755e69b33
Modified Files:
sql/backends/monet5/rel_bin.c
Branch: in-value-list
Log Message:
Restore value_list to its former glory.
diffs (38 lines):
diff --git a/sql/backends/monet5/rel_bin.c b/sql/backends/monet5/rel_bin.c
--- a/sql/backends/monet5/rel_bin.c
+++ b/sql/backends/monet5/rel_bin.c
@@ -256,7 +256,7 @@ row2cols(backend *be, stmt *sub)
}
static stmt *
-value_list(backend *be, list *vals, stmt *left)
+value_list(backend *be, list *vals, stmt *left, stmt* sel)
{
node *n;
stmt *s;
@@ -265,13 +265,13 @@ value_list(backend *be, list *vals, stmt
s = stmt_temp(be, exp_subtype(vals->h->data));
for( n = vals->h; n; n = n->next) {
sql_exp *e = n->data;
- stmt *i = exp_bin(be, e, left, NULL, NULL, NULL, NULL, NULL);
+ stmt *i = exp_bin(be, e, left, NULL, NULL, NULL, NULL, sel);
if (!i)
return NULL;
- //if (list_length(vals) == 1)
- // return i;
+ if (list_length(vals) == 1)
+ return i;
s = stmt_append(be, s, i);
}
@@ -530,7 +530,7 @@ exp_bin(backend *be, sql_exp *e, stmt *l
} else if (e->r) { /* parameters */
s = stmt_var(be, sa_strdup(sql->sa, e->r),
e->tpe.type?&e->tpe:NULL, 0, e->flag);
} else if (e->f) { /* values */
- s = value_list(be, e->f, left);
+ s = value_list(be, e->f, left, sel);
} else { /* arguments */
s = stmt_varnr(be, e->flag, e->tpe.type?&e->tpe:NULL);
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
