Author: doogie
Date: Fri Nov 13 05:38:18 2009
New Revision: 835747
URL:
http://svn.apache.org/viewvc?rev=835747&view=revLog:
Support sub conditions with ().
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=835747&r1=835746&r2=835747&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 Fri Nov 13 05:38:18 2009
@@ -435,10 +435,12 @@
{
Object v1, v2;
EntityComparisonOperator op;
+ EntityCondition ec;
}
{
v1=Expression() op=ComparisonOperator() v2=Expression()
{ return EntityCondition.makeCondition(v1, op, v2); }
+| <OPEN_PAREN> ec=AndExpression() <CLOSE_PAREN> { return ec; }
}
private EntityComparisonOperator ComparisonOperator():