Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16011/src/backends/monet5
Modified Files:
Tag: SQL_2-24
sql_gencode.mx
Log Message:
incompatible backport of a fix. SQL functions returning tables return
bat[:str,:BAT]. We now correctly return this full type vs only bat before.
Next to this we now print errors (they are in this part of the code
unexpected).
This should not be propagated to the main branch
U sql_gencode.mx
Index: sql_gencode.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_gencode.mx,v
retrieving revision 1.275.2.3
retrieving revision 1.275.2.4
diff -u -d -r1.275.2.3 -r1.275.2.4
--- sql_gencode.mx 17 Jun 2008 08:37:28 -0000 1.275.2.3
+++ sql_gencode.mx 13 Jul 2008 14:43:08 -0000 1.275.2.4
@@ -2060,7 +2060,10 @@
return;
f->sql++;
s = scope_sqlparse(m, NULL, f->imp, m_instantiate);
- if (s) {
+ if (!s) {
+ fprintf(stderr, m->errstr);
+ return;
+ } else {
stmt *opt;
opt = optimize(m, s);
stmt_destroy(s);
@@ -2078,7 +2081,10 @@
varSetProp(curBlk, getArg(curInstr, 0), inlineProp, op_eq, NULL);
if (f->res.type) {
- setVarType(curBlk, 0, f->res.type->localtype);
+ if (f->res.type->localtype == TYPE_bat)
+ setVarType(curBlk, 0, newBatType(TYPE_str, TYPE_bat));
+ else
+ setVarType(curBlk, 0, f->res.type->localtype);
setVarUDFtype(curBlk,0);
} else {
setVarType(curBlk, 0, TYPE_void);
-------------------------------------------------------------------------
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
