aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Adam Chlipala <adamc@hcoop.net>2008-08-31 16:10:20 -0400
committerGravatar Adam Chlipala <adamc@hcoop.net>2008-08-31 16:10:20 -0400
commita7ffe5cf661a65e0dc48b90f16df9746de034096 (patch)
treecf1d476add4d86556e5ad0c3f3a5640748e8d5b1
parent578034280bdf2b7172e71b3f36b6db6db3ce53eb (diff)
Monoize LIMIT
-rw-r--r--src/monoize.sml11
-rw-r--r--tests/limit.ur20
2 files changed, 31 insertions, 0 deletions
diff --git a/src/monoize.sml b/src/monoize.sml
index d2da6e27..620956f7 100644
--- a/src/monoize.sml
+++ b/src/monoize.sml
@@ -739,6 +739,17 @@ fun monoExp (env, st, fm) (all as (e, loc)) =
| L.EFfi ("Basis", "sql_no_limit") =>
((L'.EPrim (Prim.String ""), loc), fm)
+ | L.EFfiApp ("Basis", "sql_limit", [e]) =>
+ let
+ val (e, fm) = monoExp (env, st, fm) e
+ in
+ (strcat loc [
+ (L'.EPrim (Prim.String " LIMIT "), loc),
+ (L'.EFfiApp ("Basis", "sqlifyInt", [e]), loc)
+ ],
+ fm)
+ end
+
| L.EFfi ("Basis", "sql_no_offset") =>
((L'.EPrim (Prim.String ""), loc), fm)
diff --git a/tests/limit.ur b/tests/limit.ur
index 5bfb1a81..03deb0b3 100644
--- a/tests/limit.ur
+++ b/tests/limit.ur
@@ -5,3 +5,23 @@ val q2 = fn n => (SELECT * FROM t LIMIT {n})
val q3 = (SELECT * FROM t OFFSET 3)
val q4 = fn n => fn m => (SELECT * FROM t LIMIT {n} OFFSET {m})
+
+
+datatype list a = Nil | Cons of a * list a
+
+val r1 : transaction (list {A : int, B : string, C : float}) =
+ query (q2 3)
+ (fn fs acc => return (Cons (fs.T, acc)))
+ Nil
+
+val r2 : transaction string =
+ ls <- r1;
+ return (case ls of
+ Nil => "Problem"
+ | Cons ({B = b, ...}, _) => b)
+
+val main : unit -> transaction page = fn () =>
+ s <- r2;
+ return <html><body>
+ {cdata s}
+ </body></html>