diff options
| author |  Adam Chlipala <adamc@hcoop.net> | 2008-08-21 13:47:18 -0400 |
|---|---|---|
| committer | Adam Chlipala <adamc@hcoop.net> | 2008-08-21 13:47:18 -0400 |
| commit | 71e2a7c3c0fd3cbf7e472e85b491ed890fe5976c (patch) | |
| tree | 0885d7c7ba8f99ce0be70a96bf4e00891b4b13e2 | |
| parent | 808b837c2243cb07b2979c030fabd0963fad8af0 (diff) | |
Change [sql_field] type to get 'where' test to check again
| -rw-r--r-- | lib/basis.lig | 3 | ||||
| -rw-r--r-- | src/lacweb.grm | 5 |
2 files changed, 1 insertions, 7 deletions
diff --git a/lib/basis.lig b/lib/basis.lig index 099caab8..7b6f0917 100644 --- a/lib/basis.lig +++ b/lib/basis.lig @@ -39,9 +39,8 @@ val sql_query : tables ::: {{Type}} 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 diff --git a/src/lacweb.grm b/src/lacweb.grm index 1431f792..d369e179 100644 --- a/src/lacweb.grm +++ b/src/lacweb.grm @@ -645,11 +645,6 @@ query : SELECT select FROM tables wopt 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), |