# HG changeset patch
# User Adam Chlipala <adamc@hcoop.net>
# Date 1261502003 18000
# Node ID 25d491287358d2c6ddb19d134c2dfd5aca821758
# Parent  a4979e31e4bf3c264398b9578bc43946f44256a0
Basis.sql_nullable and Top.queryL

diff -r a4979e31e4bf -r 25d491287358 lib/ur/basis.urs
--- a/lib/ur/basis.urs	Sun Dec 20 15:17:43 2009 -0500
+++ b/lib/ur/basis.urs	Tue Dec 22 12:13:23 2009 -0500
@@ -484,6 +484,11 @@
 val sql_octet_length : sql_ufunc blob int
 
 
+val sql_nullable : tables ::: {{Type}} -> agg ::: {{Type}} -> exps ::: {Type} -> t ::: Type
+                   -> sql_injectable_prim t
+                   -> sql_exp tables agg exps t
+                   -> sql_exp tables agg exps (option t)
+
 (*** Executing queries *)
 
 val query : tables ::: {{Type}} -> exps ::: {Type}
diff -r a4979e31e4bf -r 25d491287358 lib/ur/top.ur
--- a/lib/ur/top.ur	Sun Dec 20 15:17:43 2009 -0500
+++ b/lib/ur/top.ur	Tue Dec 22 12:13:23 2009 -0500
@@ -208,6 +208,11 @@
                <xml>{f [nm] [t] [rest] ! r1 r2 r3}{acc}</xml>)
            <xml/>
 
+fun queryL [tables] [exps] [tables ~ exps] (q : sql_query tables exps) =
+    query q
+    (fn r ls => return (r :: ls))
+    []
+
 fun queryI [tables ::: {{Type}}] [exps ::: {Type}]
            [tables ~ exps] (q : sql_query tables exps)
            (f : $(exps ++ map (fn fields :: {Type} => $fields) tables)
diff -r a4979e31e4bf -r 25d491287358 lib/ur/top.urs
--- a/lib/ur/top.urs	Sun Dec 20 15:17:43 2009 -0500
+++ b/lib/ur/top.urs	Tue Dec 22 12:13:23 2009 -0500
@@ -118,6 +118,11 @@
               -> r :: {K} -> folder r
               -> $(map tf1 r) -> $(map tf2 r) -> $(map tf3 r) -> xml ctx [] []
 
+val queryL : tables ::: {{Type}} -> exps ::: {Type}
+             -> [tables ~ exps] =>
+                  sql_query tables exps
+                  -> transaction (list $(exps ++ map (fn fields :: {Type} => $fields) tables))
+
 val queryI : tables ::: {{Type}} -> exps ::: {Type}
              -> [tables ~ exps] =>
              sql_query tables exps
diff -r a4979e31e4bf -r 25d491287358 src/monoize.sml
--- a/src/monoize.sml	Sun Dec 20 15:17:43 2009 -0500
+++ b/src/monoize.sml	Tue Dec 22 12:13:23 2009 -0500
@@ -2469,6 +2469,25 @@
                  fm)
             end
 
+          | L.ECApp (
+            (L.ECApp (
+             (L.ECApp (
+              (L.ECApp (
+               (L.EFfi ("Basis", "sql_nullable"), _),
+               _), _),
+              _), _),
+             _), _),
+            _) =>
+            let
+                val s = (L'.TFfi ("Basis", "string"), loc)
+                fun sc s = (L'.EPrim (Prim.String s), loc)
+            in
+                ((L'.EAbs ("u", (L'.TRecord [], loc), (L'.TFun (s, s), loc),
+                           (L'.EAbs ("x", s, s,
+                                     (L'.ERel 0, loc)), loc)), loc),
+                 fm)
+            end
+
           | L.EFfiApp ("Basis", "nextval", [e]) =>
             let
                 val (e, fm) = monoExp (env, st, fm) e