From bfcd84434ee997b474935aa13ae7bc1f3801d795 Mon Sep 17 00:00:00 2001
From: Ziv Scully <ziv@mit.edu>
Date: Thu, 19 Nov 2015 01:59:00 -0500
Subject: Support nested queries but disable UrFlow for now.

---
 src/sql.sig | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'src/sql.sig')

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
-- 
cgit v1.2.3