[Swift-commit] r5215 - provenancedb

[lgadelha at ci.uchicago.edu]

Author: lgadelha
Date: 2011-10-09 16:19:23 -0500 (Sun, 09 Oct 2011)
New Revision: 5215

Modified:
   provenancedb/ProvSQL.g
Log:
Minor changes.


Modified: provenancedb/ProvSQL.g
===================================================================
--- provenancedb/ProvSQL.g	2011-10-09 04:38:12 UTC (rev 5214)
+++ provenancedb/ProvSQL.g	2011-10-09 21:19:23 UTC (rev 5215)
@@ -254,7 +254,42 @@
 				System.out.print(whereClause);
 			}
 		}
- 
+ 		(
+ 		GROUP BY 
+ 		{
+ 			System.out.print(" GROUP BY ");
+ 		}
+ 		a=entityAndAttribute
+ 		{
+ 			System.out.print($a.text);
+ 		}
+ 		(
+ 		COLON
+ 		b=entityAndAttribute
+ 		{
+ 			System.out.print(",");
+ 			System.out.print($b.text);
+ 		}
+ 		)*
+ 		)?
+ 		(
+ 		ORDER BY 
+ 		{
+ 			System.out.print(" ORDER BY ");
+ 		}
+ 		c=entityAndAttribute
+ 		{
+ 			System.out.print($c.text);
+ 		}
+ 		(
+ 		COLON
+ 		d=entityAndAttribute
+ 		{
+ 			System.out.print(",");
+ 			System.out.print($d.text);
+ 		}
+ 		)*
+ 		)?
 		|
 		'(' { System.out.print("("); }
 		squery
@@ -423,8 +458,17 @@
 	
 entityAttribute	:	ID (DOT ID)?;
 
+entityAndAttribute
+	:	ID DOT ID;
+
 OP	:	'=' | '>' | '>=' | '<' | '<=';
 
+GROUP	:	'group';
+
+ORDER	:	'order';
+
+BY	:	'by';
+
 AGGRFUN	:	'avg' | 'max' | 'min' | 'count' | 'sum';
 
 SELECT 	:	's' 'e' 'l' 'e' 'c' 't';