diff options
| author |  Adam Chlipala <adamc@hcoop.net> | 2008-08-31 16:26:50 -0400 |
|---|---|---|
| committer | Adam Chlipala <adamc@hcoop.net> | 2008-08-31 16:26:50 -0400 |
| commit | ddb4c1fe285a26cc46c59e6269ecac1f26c687a6 (patch) | |
| tree | a16c831c3294421918ed57f105c049597e2159ac | |
| parent | e63d9fdd9bc5c0316f3467fa762e27f5e482ed75 (diff) | |
Monoize aggregates
| -rw-r--r-- | src/monoize.sml | 47 | ||||
| -rw-r--r-- | tests/agg.ur | 4 |
2 files changed, 48 insertions, 3 deletions
diff --git a/src/monoize.sml b/src/monoize.sml index df606085..f5a64545 100644 --- a/src/monoize.sml +++ b/src/monoize.sml @@ -925,7 +925,52 @@ fun monoExp (env, st, fm) (all as (e, loc)) = _) => ((L'.EAbs ("_", (L'.TRecord [], loc), (L'.TFfi ("Basis", "string"), loc), (L'.EPrim (Prim.String "COUNT(*)"), loc)), loc), fm) - + + | L.ECApp ( + (L.ECApp ( + (L.ECApp ( + (L.ECApp ( + (L.EFfi ("Basis", "sql_aggregate"), _), + _), _), + _), _), + _), _), + _) => + let + val s = (L'.TFfi ("Basis", "string"), loc) + fun sc s = (L'.EPrim (Prim.String s), loc) + in + ((L'.EAbs ("c", s, (L'.TFun (s, (L'.TFun (s, s), loc)), loc), + (L'.EAbs ("e1", s, (L'.TFun (s, s), loc), + strcat loc [(L'.ERel 1, loc), + sc "(", + (L'.ERel 0, loc), + sc ")"]), loc)), loc), + fm) + end + + | L.EFfi ("Basis", "sql_summable_int") => ((L'.ERecord [], loc), fm) + | L.EFfi ("Basis", "sql_summable_float") => ((L'.ERecord [], loc), fm) + | L.ECApp ((L.EFfi ("Basis", "sql_avg"), _), _) => + ((L'.EAbs ("_", (L'.TRecord [], loc), (L'.TFfi ("Basis", "string"), loc), + (L'.EPrim (Prim.String "AVG"), loc)), loc), + fm) + | L.ECApp ((L.EFfi ("Basis", "sql_sum"), _), _) => + ((L'.EAbs ("_", (L'.TRecord [], loc), (L'.TFfi ("Basis", "string"), loc), + (L'.EPrim (Prim.String "SUM"), loc)), loc), + fm) + + | L.EFfi ("Basis", "sql_maxable_int") => ((L'.ERecord [], loc), fm) + | L.EFfi ("Basis", "sql_maxable_float") => ((L'.ERecord [], loc), fm) + | L.EFfi ("Basis", "sql_maxable_string") => ((L'.ERecord [], loc), fm) + | L.ECApp ((L.EFfi ("Basis", "sql_max"), _), _) => + ((L'.EAbs ("_", (L'.TRecord [], loc), (L'.TFfi ("Basis", "string"), loc), + (L'.EPrim (Prim.String "MAX"), loc)), loc), + fm) + | L.ECApp ((L.EFfi ("Basis", "sql_min"), _), _) => + ((L'.EAbs ("_", (L'.TRecord [], loc), (L'.TFfi ("Basis", "string"), loc), + (L'.EPrim (Prim.String "MIN"), loc)), loc), + fm) + | L.EApp ( (L.ECApp ( (L.ECApp ((L.EFfi ("Basis", "cdata"), _), _), _), diff --git a/tests/agg.ur b/tests/agg.ur index dc7c0341..7e091060 100644 --- a/tests/agg.ur +++ b/tests/agg.ur @@ -12,8 +12,8 @@ val q5 = (SELECT SUM(t1.A) AS X FROM t1 GROUP BY t1.B) datatype list a = Nil | Cons of a * list a -val r1 : transaction (list int) = - query q1 +val r1 : transaction (list string) = + query q4 (fn fs acc => return (Cons (fs.X, acc))) Nil |