Changeset: 8b02eaef953a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/8b02eaef953a
Modified Files:
        sql/backends/monet5/sql_statement.c
        sql/test/nested/Tests/basic.test
Branch: nested
Log Message:

small fix for simple array of string. Todo find super type of elements.


diffs (33 lines):

diff --git a/sql/backends/monet5/sql_statement.c 
b/sql/backends/monet5/sql_statement.c
--- a/sql/backends/monet5/sql_statement.c
+++ b/sql/backends/monet5/sql_statement.c
@@ -4462,14 +4462,14 @@ stmt_convert(backend *be, stmt *v, stmt 
        if (v->nr < 0)
                goto bailout;
 
+       if (f->type == t->type && t->multiset && v->subtype.multiset)
+               return v;
        if (f->type->eclass == EC_EXTERNAL && t->type->composite && 
strcmp(f->type->base.name, "json") == 0)
                return stmt_from_json(be, v, sel, t);
        if (t->type->eclass == EC_EXTERNAL && f->type->composite && 
strcmp(t->type->base.name, "json") == 0)
                return stmt_to_json(be, v, sel, f, t);
        if (EC_VARCHAR(f->type->eclass) && (t->type->composite || t->multiset))
                return stmt_from_varchar(be, v, sel, t);
-       if (f->type == t->type && t->multiset && v->subtype.multiset)
-               return v;
        if (f->type->eclass != EC_EXTERNAL && t->type->eclass != EC_EXTERNAL &&
                /* general cases */
                ((t->type->localtype == f->type->localtype && t->type->eclass 
== f->type->eclass &&
diff --git a/sql/test/nested/Tests/basic.test b/sql/test/nested/Tests/basic.test
--- a/sql/test/nested/Tests/basic.test
+++ b/sql/test/nested/Tests/basic.test
@@ -55,3 +55,9 @@ select array[1,2,3] union all select arr
 ----
 {1,2,3}
 {4,5,6,7}
+
+query T nosort
+select a from unnest(Array['11','2']) a(a);
+----
+11
+2
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to