diff lib/ur/basis.urs @ 1682:ac141fbb313a

'ORDER BY RANDOM' (based on a patch from Ron de Bruijn)
author Adam Chlipala <adam@chlipala.net>
date Thu, 02 Feb 2012 11:40:10 -0500
parents b0720700c36e
children 225b87d4a7df
line wrap: on
line diff
--- a/lib/ur/basis.urs	Sun Jan 22 20:25:14 2012 -0500
+++ b/lib/ur/basis.urs	Thu Feb 02 11:40:10 2012 -0500
@@ -399,7 +399,7 @@
                                             selectedExps) }
                  -> sql_query1 free afree tables selectedFields selectedExps
 
-type sql_relop 
+type sql_relop
 val sql_union : sql_relop
 val sql_intersect : sql_relop
 val sql_except : sql_relop
@@ -428,11 +428,13 @@
                         -> sql_exp tables [] exps t -> sql_direction
                         -> sql_order_by tables exps
                         -> sql_order_by tables exps
+val sql_order_by_random : tables ::: {{Type}} -> exps ::: {Type}
+                          -> sql_order_by tables exps
 
 type sql_limit
 val sql_no_limit : sql_limit
 val sql_limit : int -> sql_limit
-                       
+
 type sql_offset
 val sql_no_offset : sql_offset
 val sql_offset : int -> sql_offset
@@ -651,7 +653,7 @@
                   ctxOuter ctxInner useOuter bindOuter
            -> xml ctxInner useInner bindInner
            -> xml ctxOuter (useOuter ++ useInner) (bindOuter ++ bindInner)
-val join : ctx ::: {Unit} 
+val join : ctx ::: {Unit}
         -> use1 ::: {Type} -> bind1 ::: {Type} -> bind2 ::: {Type}
         -> [use1 ~ bind1] => [bind1 ~ bind2] =>
               xml ctx use1 bind1
@@ -769,13 +771,13 @@
 val img : bodyTag ([Alt = string, Src = url, Width = int, Height = int,
                     Onabort = transaction unit, Onerror = transaction unit,
                     Onload = transaction unit] ++ boxAttrs)
-          
+
 val form : ctx ::: {Unit} -> bind ::: {Type}
            -> [[MakeForm, Form] ~ ctx] =>
     option css_class
     -> xml ([Form] ++ ctx) [] bind
     -> xml ([MakeForm] ++ ctx) [] []
-       
+
 val subform : ctx ::: {Unit} -> use ::: {Type} -> bind ::: {Type}
               -> [[Form] ~ ctx] =>
     nm :: Name -> [[nm] ~ use] =>