svn commit: r836073 - /ofbiz/trunk/framework/entity/src/org/ofbiz/entity/sql/Parser.jj

[do...@apache.org]

Author: doogie
Date: Sat Nov 14 00:13:09 2009
New Revision: 836073

URL: http://svn.apache.org/viewvc?rev=836073&view=rev
Log:
Add aggregate function support for field definitions.

Modified:
    ofbiz/trunk/framework/entity/src/org/ofbiz/entity/sql/Parser.jj

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/sql/Parser.jj
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/sql/Parser.jj?rev=836073&r1=836072&r2=836073&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/sql/Parser.jj (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/sql/Parser.jj Sat Nov 14 00:13:09 2009
@@ -94,6 +94,7 @@
 |	<COMMA: ",">
 |	<DESC: "DESC">
 |	<ASC: "ASC">
+|	<AGGREGATE_FUNCTION: "COUNT"|"COUNT-DISTINCT"|"MIN"|"MAX"|"SUM"|"AVG">
 |	<START_DQUOTE: "\""> { pushState(IN_DQUOTE); }
 |	<START_SQUOTE: "'"> { pushState(IN_SQUOTE); }
 |	<INTEGER:
@@ -294,13 +295,30 @@
 	FieldDef(dve) ( <COMMA> FieldDef(dve) )*
 }
 
+private String AggregateFunction():
+{}
+{
+	<AGGREGATE_FUNCTION> { return getToken(0).image.toLowerCase(); }
+}
+
 private void FieldDef(DynamicViewEntity dve):
 {
 	List<String> fieldUse;
-	String tableAlias, fieldName, fieldAlias = null;
+	String tableAlias, fieldName, fieldAlias = null, function;
 }
 {
-	tableAlias=NamePart() <PERIOD>
+	function=AggregateFunction()
+	<OPEN_PAREN>
+	tableAlias=NamePart() <PERIOD> fieldName=NamePart()
+	<CLOSE_PAREN>
+	( <AS> fieldAlias=NamePart() )? {
+		if (fieldAlias == null) {
+			dve.addAlias(tableAlias, fieldName, null, null, null, null, function);
+		} else {
+			dve.addAlias(tableAlias, fieldAlias, fieldName, null, null, null, function);
+		}
+	}
+|	tableAlias=NamePart() <PERIOD>
 	(
 		<STAR> { dve.addAliasAll(tableAlias, null); }
 	|	fieldName=NamePart() ( <AS> fieldAlias=NamePart() )? {