Update of /cvsroot/monetdb/sql/src/backends/monet4
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv24324/src/backends/monet4

Modified Files:
      Tag: SQL_2-18
        sql_gencode.mx 
Log Message:
fixed bugs
 1774312          SQL: conversion from decimal to varchar error
 1775550          SQL: implied conversion from numeric to varchar disconnect

First failed because of missing function (removed from the function list now)
second failed because incorrect conversion function was called. Now all
convertions to VARCHAR types are handled the same way.


Index: sql_gencode.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet4/sql_gencode.mx,v
retrieving revision 1.152
retrieving revision 1.152.2.1
diff -u -d -r1.152 -r1.152.2.1
--- sql_gencode.mx      26 Apr 2007 14:35:06 -0000      1.152
+++ sql_gencode.mx      16 Aug 2007 21:33:05 -0000      1.152.2.1
@@ -782,7 +782,7 @@
 
                        /* convert to string is complex, we need full type info
                           and mvc for the timezone */
-                       if (s->op4.typeval.type->eclass == EC_STRING && 
+                       if (EC_VARCHAR(s->op4.typeval.type->eclass) && 
                            !(s->op3.typeval.type->eclass == EC_STRING &&
                            s->op4.typeval.digits == 0) ) 
                                len += snprintf(buf+len, buflen-len, "myc, %d, 
%u, %u, %d, ", s->op3.typeval.type->eclass, s->op3.typeval.digits, 
s->op3.typeval.scale, type_has_tz(&s->op3.typeval));
@@ -795,7 +795,7 @@
                            s->op4.typeval.type->eclass == EC_INTERVAL)
                                len += snprintf(buf+len, buflen-len, ", %u, 
%u", s->op4.typeval.digits, s->op4.typeval.scale);
                        /* convert to string, give error on to large strings */
-                       if (s->op4.typeval.type->eclass == EC_STRING && 
+                       if (EC_VARCHAR(s->op4.typeval.type->eclass) && 
                            !(s->op3.typeval.type->eclass == EC_STRING &&
                            s->op4.typeval.digits == 0) )
                                len += snprintf(buf+len, buflen-len, ", %u", 
s->op4.typeval.digits);


-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >>  http://get.splunk.com/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins

Reply via email to