Teiid 8 Parser updating to support 8.5-8.7

* commit 'TEIID-2443 adding support for a single rollup grouping expression'
Teiid-Designer · Mar 27, 2014 · f887149 · f887149
1 parent 373a4a9
commit f887149
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/plugins/teiid/org.teiid.runtime.client/engine/javacc/Teiid8Parser.jjt b/plugins/teiid/org.teiid.runtime.client/engine/javacc/Teiid8Parser.jjt
@@ -3683,12 +3683,25 @@ example={code:sql}GROUP BY col1, col2{code}
 GroupBy groupBy(ParseInfo info) #GroupBy :
 {
 	List<Expression> expressions = null;
+	boolean rollup = false;
 }
 {
 	<GROUP> <BY>
-    expressions = expressionList(info)	
+    (
+      <ROLLUP><LPAREN>
+      expressions = expressionList(info)
+      <RPAREN>
+      {
+        requires(versionAtLeast(Version.TEIID_8_5));
+        rollup = true;
+      }
+      |
+      expressions = expressionList(info)
+    )
+
 	{
 	    jjtThis.setSymbols(expressions);
+	    jjtThis.setRollup(rollup);
 		return jjtThis;
 	}
 }