MonetDB: nested - needed to skip the first statement

[Niels Nes via checkin-list]

Changeset: bcd06e710f94 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/bcd06e710f94
Modified Files:
        sql/backends/monet5/rel_bin.c
        sql/backends/monet5/sql.c
Branch: nested
Log Message:

needed to skip the first statement


diffs (24 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
@@ -690,7 +690,7 @@ set_value_list(backend *be, sql_exp *val
                        stmt *input = list_fetch(s->op4.lval, i);
                        sql_subtype *type = tail_type(input);
                        list *nl = list_append(sa_list(be->mvc->sa), input);
-                       for (; n; n = n->next) {
+                       for (n = n->next; n; n = n->next) {
                                stmt *s = n->data;
                                stmt *input = list_fetch(s->op4.lval, i);
                                nl = list_append(nl, input);
diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -6876,7 +6876,7 @@ static mel_func sql_init_funcs[] = {
  pattern("sql", "check", SQLcheck, false, "Return sql string of check 
constraint.", args(1,3, arg("sql",str), arg("sname", str), arg("name", str))),
  pattern("sql", "read_dump_rel", SQLread_dump_rel, false, "Reads sql_rel 
string into sql_rel object and then writes it to the return value", args(1,2, 
arg("sql",str), arg("sql_rel", str))),
  pattern("sql", "from_json", SQLfrom_json, false, "Reads json string into 
table of nested/multiset structures", args(1,3, batvarargany("t",0), 
optbatarg("input", json), arg("type", ptr))),
- pattern("sql", "from_varchar", SQLfrom_varchar, false, "Reads string into 
table of nested/multiset structures", args(1,3, batvarargany("t",0), 
arg("input", str), arg("type", ptr))),
+ pattern("sql", "from_varchar", SQLfrom_varchar, false, "Reads string into 
table of nested/multiset structures", args(1,3, batvarargany("t",0), 
optbatarg("input", str), arg("type", ptr))),
  { .imp=NULL }
 };
 #include "mal_import.h"
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org