Mercurial > urweb

diff lib/ur/basis.urs @ 1070:e933297c4e24

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Tweaking SQL parsing and typing
author Adam Chlipala <adamc@hcoop.net>
date Sun, 13 Dec 2009 10:13:06 -0500
parents 757dbac0454d
children 26197c957ad6
line wrap: on
line diff
--- a/lib/ur/basis.urs	Sat Dec 12 14:51:10 2009 -0500
+++ b/lib/ur/basis.urs	Sun Dec 13 10:13:06 2009 -0500
@@ -320,12 +320,14 @@
                  -> grouped ::: {{Type}}
                  -> selectedFields ::: {{Type}}
                  -> selectedExps ::: {Type}
-                 -> {Distinct : bool,
+                 -> empties :: {Unit}
+                 -> [empties ~ selectedFields]
+                 => {Distinct : bool,
                      From : sql_from_items tables,
                      Where : sql_exp tables [] [] bool,
                      GroupBy : sql_subset tables grouped,
                      Having : sql_exp grouped tables [] bool,
-                     SelectFields : sql_subset grouped selectedFields,
+                     SelectFields : sql_subset grouped (map (fn _ => []) empties ++ selectedFields),
                      SelectExps : $(map (sql_exp grouped tables [])
                                             selectedExps) }
                  -> sql_query1 tables selectedFields selectedExps