diff options
| author |  Ziv Scully <ziv@mit.edu> | 2015-11-19 01:59:00 -0500 |
|---|---|---|
| committer | Ziv Scully <ziv@mit.edu> | 2015-11-19 01:59:00 -0500 |
| commit | bfcd84434ee997b474935aa13ae7bc1f3801d795 (patch) | |
| tree | 77c947df67cba402ee17c655d8557bd1a29dfae8 /src/sql.sig | |
| parent | 588831a34eb1747b5468581169f6e68116ecbd62 (diff) | |
Support nested queries but disable UrFlow for now.
Diffstat (limited to 'src/sql.sig')
| -rw-r--r-- | src/sql.sig | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/sql.sig b/src/sql.sig index 5f5d1b23..317c157f 100644 --- a/src/sql.sig +++ b/src/sql.sig @@ -81,12 +81,15 @@ datatype sitem = SqField of string * string | SqExp of sqexp * string -type query1 = {Select : sitem list, - From : (string * string) list, - Where : sqexp option} +datatype jtype = Inner | Left | Right | Full -datatype query = - Query1 of query1 +datatype fitem = + Table of string * string (* table AS name *) + | Join of jtype * fitem * fitem * sqexp + | Nested of query * string (* query AS name *) + + and query = + Query1 of {Select : sitem list, From : fitem list, Where : sqexp option} | Union of query * query val query : query parser |