[Monetdb-sql-checkins] sql/src/backends/monet5 sql.mx, Feb2010, 1.389.2.10, 1.389.2.11 sql_result.mx, Feb2010, 1.134.2.1, 1.134.2.2

[Niels Nes]

Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory 
sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv23717/src/backends/monet5

Modified Files:
      Tag: Feb2010
        sql.mx sql_result.mx 
Log Message:
passing error's from tablet via mvc structure into sql layer
approving related tests

added test for problem overflow error not reported on client (only dumped
on server)


Index: sql_result.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_result.mx,v
retrieving revision 1.134.2.1
retrieving revision 1.134.2.2
diff -u -d -r1.134.2.1 -r1.134.2.2
--- sql_result.mx       18 Jan 2010 10:36:12 -0000      1.134.2.1
+++ sql_result.mx       25 Apr 2010 15:17:29 -0000      1.134.2.2
@@ -27,6 +27,7 @@
 #include <sql_mvc.h>
 #include <sql_catalog.h>
 #include <sql_qc.h>
+#include <sql_parser.h>                /* sql_error */
 #include "mal_client.h"
 
 extern int mvc_export_affrows(mvc *m, stream *s, lng val, str w);
@@ -429,24 +430,22 @@
        Column *fmt;
 
        if (!t) {
-               showException(SQL,"sql", "table %s not found", tname);
+               sql_error(m, 500, "table %s not found", tname);
                m->type = -1;
                return NULL;
        }
        if (!bs) {
-               showException(IO,"sql", "no stream (pointer) provided");
-
+               sql_error(m, 500, "no stream (pointer) provided");
                m->type = -1;
                return NULL;
        }
        if (stream_errnr(bs->s)) {
-               showException(IO,"sql", "stream not open %d", 
stream_errnr(bs->s));
-
+               sql_error(m, 500, "stream not open %d", stream_errnr(bs->s));
                m->type = -1;
                return NULL;
        }
        if (offset < 0 || offset > (lng) BUN_MAX) {
-               showException(SQL,"sql","offset out of range");
+               sql_error(m, 500, "offset out of range");
                m->type = -1;
                return NULL;
        }
@@ -501,8 +500,8 @@
                        if (SQLload_file(cntxt, &as, bs, out, sep, rsep, 
ssep?ssep[0]:0, offset, sz) != BUN_NONE && !as.error)
                                bats = TABLETcollect_bats(&as);
                }
-               if (as.error)
-                       showException(SQL, "sql", as.error);
+               if (as.error) 
+                       sql_error(m, 500, "%s", as.error);
                TABLETdestroy_format(&as);
        }
        return bats;

Index: sql.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql.mx,v
retrieving revision 1.389.2.10
retrieving revision 1.389.2.11
diff -u -d -r1.389.2.10 -r1.389.2.11
--- sql.mx      8 Apr 2010 16:39:50 -0000       1.389.2.10
+++ sql.mx      25 Apr 2010 15:17:29 -0000      1.389.2.11
@@ -2956,7 +2956,7 @@
                GDKfree(ssep);
        GDKfree(ns);
        if (!b)
-               throw(SQL, "importTable", "failed to import table");
+               throw(SQL, "importTable", "%sfailed to import table", 
m->errstr);
        *res = b->batCacheid;
        BBPincref( *res, TRUE);
        BBPunfix(*res);


------------------------------------------------------------------------------
_______________________________________________
Monetdb-sql-checkins mailing list
Monetdb-sql-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins