Changeset: 059c1f631d04 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/059c1f631d04
Modified Files:
sql/backends/monet5/sql.c
Branch: newjson
Log Message:
merge nested
diffs (21 lines):
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
@@ -5741,7 +5741,7 @@ insert_json_object(char **msg, JSON *js,
break;
case JSON_ELEMENT: // field
name = jt->value;
- nlen = jt->valuelen;
+ nlen = (int)jt->valuelen;
break;
case JSON_VALUE:
case JSON_STRING:
@@ -5751,7 +5751,7 @@ insert_json_object(char **msg, JSON *js,
pos = -1;
for(i = 0, n = t->type->d.fields->h; i < w && n && pos
< 0; i++, n = n->next) {
sql_arg *a = n->data;
- int alen = strlen(a->name);
+ int alen = (int)strlen(a->name);
if (nlen == alen && strncmp(name, a->name,
nlen) == 0)
pos = i;
}
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
