Mercurial > urweb

diff lib/basis.lig @ 224:cb8a68964ebb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
GROUP BY added to query type, with trivial parsing, for now
author Adam Chlipala <adamc@hcoop.net>
date Thu, 21 Aug 2008 12:54:09 -0400
parents bbe5899a9585
children 5ac2cf59b839
line wrap: on
line diff
--- a/lib/basis.lig	Thu Aug 21 12:49:29 2008 -0400
+++ b/lib/basis.lig	Thu Aug 21 12:54:09 2008 -0400
@@ -29,14 +29,14 @@
         -> sql_subset tables tables
 
 val sql_query : tables ::: {{Type}}
-        (*-> grouped ::: {{Type}}*)
+        -> grouped ::: {{Type}}
         -> selected ::: {{Type}}
         -> {From : $(fold (fn nm => fn fields :: {Type} => fn acc =>
                 [nm] ~ acc => [nm = sql_table fields] ++ acc) [] tables),
             Where : sql_exp tables [] bool,
-            (*GroupBy : sql_subset tables grouped,
-            Having : sql_exp grouped tables bool,*)
-            SelectFields : sql_subset tables selected}
+            GroupBy : sql_subset tables grouped,
+            Having : sql_exp grouped tables bool,
+            SelectFields : sql_subset grouped selected}
         -> sql_query selected
 
 val sql_field : otherTabs ::: {{Type}} -> otherFields ::: {Type} -> fieldType ::: Type