Mercurial > urweb

changeset 225:5ac2cf59b839

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Change [sql_field] type to get 'where' test to check again
author Adam Chlipala <adamc@hcoop.net>
date Thu, 21 Aug 2008 13:47:18 -0400
parents cb8a68964ebb
children b0041cc7e5f7
files lib/basis.lig src/lacweb.grm
diffstat 2 files changed, 1 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/lib/basis.lig	Thu Aug 21 12:54:09 2008 -0400
+++ b/lib/basis.lig	Thu Aug 21 13:47:18 2008 -0400
@@ -39,9 +39,8 @@
             SelectFields : sql_subset grouped selected}
         -> sql_query selected
 
-val sql_field : otherTabs ::: {{Type}} -> otherFields ::: {Type} -> fieldType ::: Type
+val sql_field : otherTabs ::: {{Type}} -> otherFields ::: {Type} -> fieldType ::: Type -> agg ::: {{Type}}
         -> tab :: Name -> field :: Name
-        -> agg ::: {{Type}}
         -> sql_exp ([tab = [field = fieldType] ++ otherFields] ++ otherTabs) agg fieldType
 
 class sql_injectable
--- a/src/lacweb.grm	Thu Aug 21 12:54:09 2008 -0400
+++ b/src/lacweb.grm	Thu Aug 21 13:47:18 2008 -0400
@@ -645,11 +645,6 @@
                                                                      loc))
 
                                              val e = (EVar (["Basis"], "sql_query"), loc)
-                                             val _ = [((CName "GroupBy", loc),
-                                                       (ECApp ((EVar (["Basis"], "sql_subset_all"), loc),
-                                                               (CWild (KRecord (KType, loc), loc), loc)), loc)),
-                                                      ((CName "Having", loc),
-                                                       hopt)]
                                              val re = (ERecord [((CName "From", loc),
                                                                  (ERecord tables, loc)),
                                                                 ((CName "Where", loc),