Update of /cvsroot/monetdb/pathfinder/compiler/sql
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25118/compiler/sql
Modified Files:
lalg2sql.brg
Log Message:
propagated changes of Tuesday Feb 12 2008 - Friday Feb 15 2008
from the XQuery_0-22 branch to the development trunk
Index: lalg2sql.brg
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/sql/lalg2sql.brg,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- lalg2sql.brg 15 Feb 2008 16:53:30 -0000 1.116
+++ lalg2sql.brg 15 Feb 2008 18:34:08 -0000 1.117
@@ -1376,7 +1376,7 @@
column_assign (name, NAME_)),
from_list (
alias_bind (select (
- column_assign (max (PRE_), MAX_),
+ column_assign (max_ (PRE_), MAX_),
from_list (max_pre_frag),
NULL),
alias (max)),
@@ -1401,7 +1401,7 @@
NAME(content)),
from_list (
alias_bind (select (
- column_assign (max (PRE_), MAX_),
+ column_assign (max_ (PRE_), MAX_),
from_list (max_pre_frag),
NULL),
alias (max)),
@@ -2864,7 +2864,7 @@
expr = col_env_lookup (COLMAP(L(p)), att, ty);
/* generate the aggregation */
- expr = p->sem.pos_sel.pos > 0 ? min (expr) : max (expr);
+ expr = p->sem.pos_sel.pos > 0 ? min_ (expr) : max_ (expr);
col_env_add (COLMAP(p), att, ty,
ext_column_name (newalias, col));
@@ -3441,22 +3441,22 @@
/* generate the aggregation */
switch (p->kind) {
- case la_avg: expr = avg (expr); break;
- case la_max: expr = max (expr); break;
- case la_min: expr = min (expr); break;
+ case la_avg: expr = avg (expr); break;
+ case la_max: expr = max_ (expr); break;
+ case la_min: expr = min_ (expr); break;
/* with la_all we have to ensure that each
* attribute att is true for all rows within
* a group, since we express boolean values
* as literal integers, MIN does the job */
case la_all: assert (ty == aat_bln);
- expr = min (((expr)->kind == sql_column_name)?
+ expr = min_ (((expr)->kind == sql_column_name)?
expr:
case_(
when (expr,
lit_int(1)),
else_ (lit_int (0))));
break;
- case la_sum: expr = sum (expr); break;
+ case la_sum: expr = sum (expr); break;
case la_count: expr = count (star ()); break;
default: assert (0); break;
}
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
