Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory sc8-pr-cvs16:/tmp/cvs-serv24540/src/backends/monet5

Modified Files:
        sql_gencode.mx 
Log Message:
added use of any type (only internal)
the any type is needed to have a single function definition for
al functions which all types need.



Index: sql_gencode.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_gencode.mx,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -d -r1.241 -r1.242
--- sql_gencode.mx      23 Apr 2007 11:05:28 -0000      1.241
+++ sql_gencode.mx      26 Apr 2007 14:35:07 -0000      1.242
@@ -1120,7 +1120,7 @@
 
                        /* external types have sqlname convert functions,
                           these can generate errors (fromstr cannot) */
-                       if (s->op4.typeval.type->eclass == EC_ANY)
+                       if (s->op4.typeval.type->eclass == EC_EXTERNAL)
                                convert = s->op4.typeval.type->sqlname;
                
                        if (s->op4.typeval.type->eclass == EC_INTERVAL) {
@@ -1200,7 +1200,7 @@
                        @:SQLprelude@
                        backend_create_func(sql, s->op4.funcval->func); 
                        if (s->op1.stval->nrcols) {
-                               int rtype = 
s->op4.funcval->func->res.type->localtype;
+                               int rtype = s->op4.funcval->res.type->localtype;
 
                                q = newStmt(mb, "mal","multiplex");
                                setVarType(mb,getArg(q,0), 
newBatType(TYPE_oid,rtype));
@@ -1233,7 +1233,7 @@
                        backend_create_func(sql, s->op4.funcval->func); 
                        if (s->op1.stval->nrcols || s->op2.stval->nrcols) {
                                if (!special) {
-                                       q = 
multiplex2(mb,mod,convertOperator(fimp),l,r, 
s->op4.funcval->func->res.type->localtype);
+                                       q = 
multiplex2(mb,mod,convertOperator(fimp),l,r, 
s->op4.funcval->res.type->localtype);
                                } else {
                                        mod= convertMultiplexMod(mod,fimp);
                                        fimp= convertMultiplexFcn(fimp);
@@ -1302,7 +1302,7 @@
                        int l = _dumpstmt(sql, mb, s->op1.stval);
                        char *mod = _strdup(s->op4.aggrval->aggr->mod);
                        char *aggrfunc = s->op4.aggrval->aggr->imp;
-                       int restype = s->op4.aggrval->aggr->res.type->localtype;
+                       int restype = s->op4.aggrval->res.type->localtype;
                        sql_subtype *tpe = tail_type(s->op1.stval);
                        int output_type_needed = 0;
                        


-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins

Reply via email to