Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv20312/src/backends/monet5
Modified Files:
sql_result.mx
Log Message:
don't output errors directly, but only createExceptions
U sql_result.mx
Index: sql_result.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_result.mx,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -d -r1.122 -r1.123
--- sql_result.mx 9 Aug 2009 20:43:31 -0000 1.122
+++ sql_result.mx 10 Aug 2009 06:43:09 -0000 1.123
@@ -293,7 +293,7 @@
}
for (i = 0; i < (t->digits-t->scale) && *s != '.' && *s; i++, s++) {
if (!*s || *s < '0' || *s > '9') {
- showException(SQL,"sql", "decimal wrong format (%s)
digit expected", p);
+ createException(SQL,"sql", "decimal wrong format (%s)
digit expected", p);
return NULL;
}
res *= 10;
@@ -306,13 +306,13 @@
}
if (*s) {
if (*s != '.') {
- showException(SQL,"sql", "decimal wrong format (%s) '.'
expected", p);
+ createException(SQL,"sql", "decimal wrong format (%s)
'.' expected", p);
return NULL;
}
s++;
for( i = 0; *s && i < t->scale; i++, s++) {
if (*s < '0' || *s > '9') {
- showException(SQL,"sql", "decimal wrong format
(%s)", p);
+ createException(SQL,"sql", "decimal wrong
format (%s)", p);
return NULL;
}
res *= 10;
@@ -323,7 +323,7 @@
}
}
if (*s) {
- showException(SQL,"sql", "decimal wrong format (%s) too many
characters", p);
+ createException(SQL,"sql", "decimal wrong format (%s) too many
characters", p);
return NULL;
}
r = c->data;
@@ -344,7 +344,7 @@
(void)e;
(void)quote;
if (s == e) {
- GDKerror("Decimal cannot be parsed from %s\n", ATOMname(type));
+ createException(SQL, "sql", "Decimal cannot be parsed from
%s\n", ATOMname(type));
return NULL;
} else if (type == TYPE_bte) {
@:dec_frstr(bte)@
@@ -355,7 +355,7 @@
} else if (type == TYPE_lng) {
@:dec_frstr(lng)@
} else {
- GDKerror("Decimal cannot be parsed from %s\n", ATOMname(type));
+ createException(SQL, "sql", "Decimal cannot be parsed from
%s\n", ATOMname(type));
}
return NULL;
}
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
