Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv27554/src/backends/monet5
Modified Files:
sql_gencode.mx sql_scenario.mx
Log Message:
propagated changes of Friday Mar 30 2007 - Monday Apr 02 2007
from the SQL_2-16 branch to the development trunk
Index: sql_scenario.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_scenario.mx,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -d -r1.255 -r1.256
--- sql_scenario.mx 20 Mar 2007 18:29:09 -0000 1.255
+++ sql_scenario.mx 1 Apr 2007 22:08:56 -0000 1.256
@@ -1164,7 +1164,7 @@
/* TODO use sql_prepare/execute */
snprintf(buf, BUFSIZ, "INSERT INTO \"profile\" "
- "VALUES(now,'%s',%lld,%lld,%lld,%lld,USER);\n",
+ "VALUES(now,'%s',"LLFMT","LLFMT","LLFMT","LLFMT",USER);\n",
q, parse, optimize, exec, total);
_DELETE(query);
Index: sql_gencode.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_gencode.mx,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -d -r1.237 -r1.238
--- sql_gencode.mx 25 Mar 2007 20:46:05 -0000 1.237
+++ sql_gencode.mx 1 Apr 2007 22:08:55 -0000 1.238
@@ -659,6 +659,7 @@
@:SQLprelude@
if (s->op2.stval->nrcols >= 1) {
+ char *mod = calcRef;
char *op = "=";
int k;
int j,hml,tmr,mhj,mtj;
@@ -682,6 +683,14 @@
case cmp_gte:
op = ">=";
break;
+ case cmp_like:
+ op = "like";
+ mod = strRef;
+ break;
+ case cmp_notlike:
+ op = "notlike";
+ mod = strRef;
+ break;
default:
showException(SQL,"sql","Unknown
operator");
}
@@ -733,7 +742,7 @@
q = pushArgument(mb, q, r);
r = getDestVar(q);
- q=
dump_multiplex(mb,calcRef,convertOperator(op),l,r,tail_type(s->op2.stval)->type->localtype,
TYPE_bit);
+ q=
dump_multiplex(mb,mod,convertOperator(op),l,r,tail_type(s->op2.stval)->type->localtype,
TYPE_bit);
k = getDestVar(q);
q = newStmt1(mb, algebraRef, "uselect");
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
