diff options
| author |  Adam Chlipala <adam@chlipala.net> | 2010-12-21 17:01:51 -0500 |
|---|---|---|
| committer | Adam Chlipala <adam@chlipala.net> | 2010-12-21 17:01:51 -0500 |
| commit | 22d11510a829052ea5be8d93c9805572aa13d66e (patch) | |
| tree | 9663f11a7186f993953c956c349a8f0b1992944a /src | |
| parent | 70d7e503a3a7716b4559756db8ffc3f4c7898716 (diff) | |
Allow SQL aggregation over nullable types
Diffstat (limited to 'src')
| -rw-r--r-- | src/monoize.sml | 30 |
1 files changed, 23 insertions, 7 deletions
diff --git a/src/monoize.sml b/src/monoize.sml index bd5787b4..eccf5714 100644 --- a/src/monoize.sml +++ b/src/monoize.sml @@ -2637,24 +2637,32 @@ fun monoExp (env, st, fm) (all as (e, loc)) = val default = case #1 t of L.CFfi ("Basis", s) => - (case s of + SOME (case s of "int" => "0" | "float" => "0.0" | "string" => "''" | "time" => "0" | _ => raise Fail "Illegal type of sql_aggregate [1]") + | L.CApp ((L.CFfi ("Basis", "option"), _), _) => NONE | _ => raise Fail "Illegal type of sql_aggregate [2]" val s = (L'.TFfi ("Basis", "string"), loc) fun sc s = (L'.EPrim (Prim.String s), loc) + + val main = strcat [(L'.ERel 1, loc), + sc "(", + (L'.ERel 0, loc), + sc ")"] + + val main = case default of + NONE => main + | SOME default => + strcat [sc "COALESCE(", + main, + sc ("," ^ default ^ ")")] in ((L'.EAbs ("c", s, (L'.TFun (s, (L'.TFun (s, s), loc)), loc), - (L'.EAbs ("e1", s, (L'.TFun (s, s), loc), - strcat [sc "COALESCE(", - (L'.ERel 1, loc), - sc "(", - (L'.ERel 0, loc), - sc (")," ^ default ^ ")")]), loc)), loc), + (L'.EAbs ("e1", s, (L'.TFun (s, s), loc), main), loc)), loc), fm) end @@ -2664,6 +2672,10 @@ fun monoExp (env, st, fm) (all as (e, loc)) = | 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_summable_option"), _), _) => + ((L'.EAbs ("_", (L'.TRecord [], loc), (L'.TRecord [], loc), + (L'.ERecord [], loc)), 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), @@ -2679,6 +2691,10 @@ fun monoExp (env, st, fm) (all as (e, loc)) = | 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_maxable_option"), _), _) => + ((L'.EAbs ("_", (L'.TRecord [], loc), (L'.TRecord [], loc), + (L'.ERecord [], loc)), 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), |