MonetDB: Dec2011 - Set paramlen correctly to number of parameters.

[Sjoerd Mullender]

Changeset: 78f6e7fbbed9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=78f6e7fbbed9
Modified Files:
        sql/backends/monet5/sql_result.mx
Branch: Dec2011
Log Message:

Set paramlen correctly to number of parameters.


diffs (51 lines):

diff --git a/sql/backends/monet5/sql_result.mx 
b/sql/backends/monet5/sql_result.mx
--- a/sql/backends/monet5/sql_result.mx
+++ b/sql/backends/monet5/sql_result.mx
@@ -673,7 +673,8 @@ int
 mvc_export_prepare(mvc *c, stream *out, cq *q, str w)
 {
        node *n;
-       int len = c->params ? list_length(c->params) : 0;
+       int nparam = c->params ? list_length(c->params) : 0;
+       int nrows = nparam;
        size_t len1 = 0, len4 = 0, len5 = 0, len6 = 0;  /* column widths */
        int len2 = 1, len3 = 1;
        sql_arg *a;
@@ -687,7 +688,7 @@ mvc_export_prepare(mvc *c, stream *out, 
                unsigned int max2 = 10, max3 = 10; /* to help calculate widths 
*/
                sql_rel *r = q->rel;
 
-               len += list_length(r->exps);
+               nrows += list_length(r->exps);
 
                for (n = r->exps->h; n; n = n->next) {
                        char *name;
@@ -752,7 +753,7 @@ mvc_export_prepare(mvc *c, stream *out, 
                        "%% type,\tdigits,\tscale,\tschema,\ttable,\tcolumn # 
name\n"
                        "%% varchar,\tint,\tint,\tstr,\tstr,\tstr # type\n"
                        "%% " SZFMT ",\t%d,\t%d,\t" SZFMT ",\t" SZFMT ",\t" 
SZFMT " # length\n",
-                       q->id, len, len, len1, len2, len3, len4, len5, len6) < 
0) 
+                       q->id, nrows, nrows, len1, len2, len3, len4, len5, 
len6) < 0) 
                        return -1;
        } else {
                if (mnstr_printf(out,
@@ -761,7 +762,7 @@ mvc_export_prepare(mvc *c, stream *out, 
                        "%% type,\tdigits,\tscale # name\n"
                        "%% varchar,\tint,\tint # type\n"
                        "%% " SZFMT ",\t%d,\t%d # length\n",
-                       q->id, len, len, len1, len2, len3) < 0) 
+                       q->id, nrows, nrows, len1, len2, len3) < 0) 
                        return -1;
        }
 
@@ -797,8 +798,8 @@ mvc_export_prepare(mvc *c, stream *out, 
                char *extra = "";
                int i;
 
-               q->paramlen = len;
-               q->params = SA_NEW_ARRAY(q->sa, sql_subtype, len);
+               q->paramlen = nparam;
+               q->params = SA_NEW_ARRAY(q->sa, sql_subtype, nrows);
                if (result) 
                        extra = ",\tNULL,\tNULL,\tNULL";
                for (n = c->params->h, i=0; n; n = n->next, i++) {
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list