diff options
| author |  Adam Chlipala <adamc@hcoop.net> | 2008-08-21 12:54:09 -0400 |
|---|---|---|
| committer | Adam Chlipala <adamc@hcoop.net> | 2008-08-21 12:54:09 -0400 |
| commit | 808b837c2243cb07b2979c030fabd0963fad8af0 (patch) | |
| tree | 587d450a51086ad3afb376bb6cd78871726c7464 /lib | |
| parent | be0c07faab159e4c0d924c9656aa2cb47a363bef (diff) | |
GROUP BY added to query type, with trivial parsing, for now
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/basis.lig | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/basis.lig b/lib/basis.lig index 8299f200..099caab8 100644 --- a/lib/basis.lig +++ b/lib/basis.lig @@ -29,14 +29,14 @@ val sql_subset_all : tables :: {{Type}} -> 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 |