summaryrefslogtreecommitdiff
path: root/lib/ur/basis.urs
diff options
context:
space:
mode:
authorGravatar Adam Chlipala <adamc@hcoop.net>2009-12-13 10:13:06 -0500
committerGravatar Adam Chlipala <adamc@hcoop.net>2009-12-13 10:13:06 -0500
commite376aee8f22ca46b5536803fc3d80e31f79da6ff (patch)
treeb8dfbb24caa3bc4cf3cf683e44a9ab92c4dc9e34 /lib/ur/basis.urs
parent0a168e5f39165bd9e462813866c9a25dc2d6b688 (diff)
Tweaking SQL parsing and typing
Diffstat (limited to 'lib/ur/basis.urs')
-rw-r--r--lib/ur/basis.urs6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/ur/basis.urs b/lib/ur/basis.urs
index 545e65aa..4b53659d 100644
--- a/lib/ur/basis.urs
+++ b/lib/ur/basis.urs
@@ -320,12 +320,14 @@ val sql_query1 : tables ::: {{Type}}
-> 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