Update of /cvsroot/monetdb/sql/src/server
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv5408/src/server
Modified Files:
rel_bin.mx
Log Message:
propagated changes of Monday Aug 03 2009 - Tuesday Aug 04 2009
from the Aug2009 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/08/03 - nielsnes: src/server/rel_bin.mx,1.87.2.1
solved bug in handling not (i)like
allow '*' in selection with other (constant) column expressions
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: rel_bin.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/rel_bin.mx,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- rel_bin.mx 2 Aug 2009 19:56:40 -0000 1.87
+++ rel_bin.mx 4 Aug 2009 07:24:21 -0000 1.88
@@ -523,7 +523,7 @@
/* the escape character of like is in the right expression */
if (e->flag == cmp_notlike || e->flag == cmp_like ||
- e->flag == cmp_notilike || e->flag == cmp_ilike)
+ e->flag == cmp_notilike || e->flag == cmp_ilike)
{
if (!e->f)
r2 = stmt_atom_string(_strdup(""));
@@ -539,8 +539,7 @@
char *likef = (e->flag == cmp_notilike ||
e->flag == cmp_ilike ?
"ilike" : "like");
sql_subtype *s = sql_bind_localtype("str");
- sql_subfunc *like =
sql_bind_func3(sql->session->schema,
- likef, s, s, s);
+ sql_subfunc *like =
sql_bind_func3(sql->session->schema, likef, s, s, s);
list *ops = create_stmt_list();
assert(s && like);
@@ -549,7 +548,7 @@
list_append(ops, r);
list_append(ops, r2);
lstmt = stmt_Nop(stmt_list(ops), like);
- if (e->flag == cmp_notlike) {
+ if (e->flag == cmp_notlike || e->flag ==
cmp_notilike) {
sql_subtype *bt =
sql_bind_localtype("bit");
sql_subfunc *not =
sql_bind_func(sql->session->schema,
"not", bt, 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
