Mercurial > urweb
diff src/sql.sig @ 2294:f8903af753ff
Support nested queries but disable UrFlow for now.
author | Ziv Scully <ziv@mit.edu> |
---|---|
date | Thu, 19 Nov 2015 01:59:00 -0500 |
parents | 70ec9bb337be |
children |
line wrap: on
line diff
--- a/src/sql.sig Wed Nov 18 14:48:24 2015 -0500 +++ b/src/sql.sig Thu Nov 19 01:59:00 2015 -0500 @@ -81,12 +81,15 @@ 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