diff options
| author |  Adam Chlipala <adamc@hcoop.net> | 2008-08-21 12:49:29 -0400 |
|---|---|---|
| committer | Adam Chlipala <adamc@hcoop.net> | 2008-08-21 12:49:29 -0400 |
| commit | be0c07faab159e4c0d924c9656aa2cb47a363bef (patch) | |
| tree | 34ed0c3c2149452895208ebdaf6a6ab732a75b41 /src/lacweb.grm | |
| parent | 024d9ab1d554d897787c9d38dc1761ba37a078de (diff) | |
Queries back to working as well as before, after start of refactoring to support grouping
Diffstat (limited to 'src/lacweb.grm')
| -rw-r--r-- | src/lacweb.grm | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/lacweb.grm b/src/lacweb.grm index e38ad6b0..1eb85181 100644 --- a/src/lacweb.grm +++ b/src/lacweb.grm @@ -640,12 +640,24 @@ query : SELECT select FROM tables wopt val sel = (CRecord sel, loc) + val hopt = (sql_inject (EVar (["Basis"], "True"), + EVar (["Basis"], "sql_bool"), + loc)) + val e = (EVar (["Basis"], "sql_query"), loc) - val e = (ECApp (e, sel), 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), - wopt)], loc) + wopt), + ((CName "SelectFields", loc), + (ECApp ((EVar (["Basis"], "sql_subset"), loc), + sel), loc))], loc) + val e = (EApp (e, re), loc) in e |