Update of /cvsroot/monetdb/sql/src/server
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv7982/src/server
Modified Files:
rel_optimizer.mx
Log Message:
propagated changes of Friday Aug 07 2009
from the Aug2009 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/08/07 - nielsnes: src/server/rel_optimizer.mx,1.67.2.1
bug fixing
prepare/execute statements now go to seperate query cache
check for ambiguous order by columns
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: rel_optimizer.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/rel_optimizer.mx,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- rel_optimizer.mx 1 Aug 2009 14:47:41 -0000 1.67
+++ rel_optimizer.mx 7 Aug 2009 21:24:43 -0000 1.68
@@ -67,7 +67,7 @@
sql_table *t = rel->l;
if (rel->exps) {
- sql_exp *rename = exps_bind_column(rel->exps, name);
+ sql_exp *rename = exps_bind_column(rel->exps, name,
NULL);
if (!rename ||
rename->type != e_column ||
(rename->l && strcmp(t->base.name, rename->l) != 0))
@@ -83,7 +83,7 @@
}
case op_table:
if (rel->exps)
- alias = exps_bind_column(rel->exps, name);
+ alias = exps_bind_column(rel->exps, name, NULL);
/* table func */
return NULL;
case op_join:
@@ -107,7 +107,7 @@
case op_groupby:
if (!rel->exps)
break;
- alias = exps_bind_column(rel->exps, name);
+ alias = exps_bind_column(rel->exps, name, NULL);
break;
case op_insert:
case op_update:
@@ -883,7 +883,7 @@
ne = exps_bind_column2(f->exps, e->l, e->r);
/* if relation name matches expressions relation name,
find column based on column name alone */
} else {
- ne = exps_bind_column(f->exps, e->r);
+ ne = exps_bind_column(f->exps, e->r, NULL);
}
if (!ne)
return exp_dup(e);
@@ -993,7 +993,7 @@
/* if relation name matches expressions relation name,
find column based on column name alone */
}
if (!ne && !e->l)
- ne = exps_bind_column(f->exps, e->r);
+ ne = exps_bind_column(f->exps, e->r, NULL);
if (!ne)
return NULL;
e = NULL;
@@ -2010,7 +2010,7 @@
if (exp_is_atom(e))
continue;
if ((e->l && exps_bind_column2(r_exps, e->l,
e->r) != NULL) ||
- (exps_bind_column(r_exps, e->r) != NULL &&
(!e->l || !e->r)))
+ (exps_bind_column(r_exps, e->r, NULL) !=
NULL && (!e->l || !e->r)))
return rel;
}
for(n = r_exps->h; n; n = n->next) {
@@ -2019,7 +2019,7 @@
if (exp_is_atom(e))
continue;
if ((e->l && exps_bind_column2(l_exps, e->l,
e->r) != NULL) ||
- (exps_bind_column(l_exps, e->r) != NULL &&
(!e->l || !e->r)))
+ (exps_bind_column(l_exps, e->r, NULL) !=
NULL && (!e->l || !e->r)))
return rel;
}
list_destroy(l_exps);
@@ -2749,7 +2749,7 @@
if (e->l)
re = exps_bind_column2(r->exps, e->l, e->r);
if (!re && ((char*)e->r)[0] == 'L')
- re = exps_bind_column(r->exps, e->r);
+ re = exps_bind_column(r->exps, e->r, NULL);
if (re)
return is_identity(re, r->l);
}
------------------------------------------------------------------------------
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
