Changeset: 6ae4527e67eb for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6ae4527e67eb
Modified Files:
        sql/server/rel_schema.c
Branch: sciql
Log Message:

Thanks to Niels, corrected the code which generate sql_rel nodes to create 
array columns.


diffs (30 lines):

diff --git a/sql/server/rel_schema.c b/sql/server/rel_schema.c
--- a/sql/server/rel_schema.c
+++ b/sql/server/rel_schema.c
@@ -931,7 +931,9 @@
                if ((tt == tt_table) || (tt == tt_array && !t->fixed)) {
                        /* TODO: is DDL_CREATE_TABLE sufficient for arrays? */
                        return rel_table(sql, DDL_CREATE_TABLE, sname, t, temp);
-               } else {
+               } else { /* For fixed arrays, we immediately create and fill in 
BATs
+                                       for dimensions with dimension values, 
and for non-dim.
+                                       attributes with default values */
                        sql_rel *res = NULL;
                        list *rp = new_exp_list(sql->sa);
                        node *col = NULL;
@@ -948,12 +950,12 @@
                                        /* TODO: compute the 'N' and 'M' */
                                        append(args, exp_atom_int(sql->sa, 1));
                                        append(args, exp_atom_int(sql->sa, 
*sc->dim->stop));
-
-                                       append(rp, exp_op(sql->sa, args, 
sql_bind_func_(sql->sa, sql->session->schema, "array_series", args)));
+       
+                                       append(rp, exp_op(sql->sa, args, 
sql_bind_func_(sql->sa, sql->session->schema, "array_series", 
exps_subtype(args))));
                                }
                        }
                        res = rel_table(sql, DDL_CREATE_TABLE, sname, t, temp);
-                       return rel_insert(sql, res, rel_project(sql->sa, res, 
rp));
+                       return rel_insert(sql, res, rel_project(sql->sa, NULL, 
rp));
                }
        } else { /* [col name list] as subquery with or without data */
                /* TODO: handle create_array_as_subquery??? */
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to