EQL - initial

src/test/java/com/avaje/ebeaninternal/server/grammer/EqlParserTest.java

@@ -0,0 +1,55 @@
+package com.avaje.ebeaninternal.server.grammer;
+
+import com.avaje.ebean.Ebean;
+import com.avaje.ebean.Query;
+import com.avaje.tests.model.basic.Customer;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class EqlParserTest {
+
+  @Test
+  public void where_eq() throws Exception {
+
+    Query<Customer> query = parse("where name eq 'Rob'");
+    query.findList();
+
+    assertThat(query.getGeneratedSql()).contains("where t0.name = ?");
+  }
+
+  @Test
+  public void where_eq2() throws Exception {
+
+    Query<Customer> query = parse("where name = 'Rob'");
+    query.findList();
+
+    assertThat(query.getGeneratedSql()).contains("where t0.name = ?");
+  }
+
+  @Test
+  public void where_or1() throws Exception {
+
+    Query<Customer> query = parse("where name = 'Rob' or (status = 'NEW' and smallnote is null)");
+    query.findList();
+
+    assertThat(query.getGeneratedSql()).contains("where (t0.name = ?  or (t0.status = ?  and t0.smallnote is null ) )");
+  }
+
+  @Test
+  public void where_or2() throws Exception {
+
+    Query<Customer> query = parse("where (name = 'Rob' or status = 'NEW') and smallnote is null");
+    query.findList();
+
+    assertThat(query.getGeneratedSql()).contains("where ((t0.name = ?  or t0.status = ? )  and t0.smallnote is null )");
+  }
+
+  private Query<Customer> parse(String raw) {
+
+    Query<Customer> query = Ebean.find(Customer.class);
+    EqlParser.parse(raw, query);
+    return query;
+  }
+
+}

src/test/resources/EQL.g4

@@ -0,0 +1,169 @@
+grammar EQL;
+
+select_statement
+   : (select_clause)? (fetch_clause)? (where_clause)?
+   ;
+
+select_clause
+   : 'select' '(' fetch_property_group ')'
+   ;
+
+fetch_clause
+   : fetch_path
+   ;
+
+where_clause
+   : 'where' conditional_expression
+   ;
+
+fetch_path
+   : 'fetch' PATH_VARIABLE '(' fetch_property_group ')'
+   ;
+
+fetch_property_group
+   : fetch_property (',' fetch_property)*
+   ;
+
+fetch_property
+   : PATH_VARIABLE
+   ;
+
+
+conditional_expression
+   : (conditional_term) ('or' conditional_term)*
+   ;
+
+conditional_term
+   : (conditional_factor) ('and' conditional_factor)*
+   ;
+
+conditional_factor
+   : ('not')? conditional_primary
+   ;
+
+conditional_primary
+   : any_expression
+   | '(' conditional_expression ')'
+   ;
+
+any_expression
+   : comparison_expression
+   | like_expression
+   | between_expression
+   | propertyBetween_expression
+   | in_expression
+   | isNull_expression
+   | isNotNull_expression
+   | isEmpty_expression
+   | isNotEmpty_expression
+   | '(' any_expression ')'
+   ;
+
+in_expression
+   : PATH_VARIABLE 'in' in_value
+   ;
+
+in_value
+   : INPUT_VARIABLE
+   | '(' INPUT_VARIABLE ')'
+   | '(' value_expression (',' value_expression)* ')'
+   ;
+
+between_expression
+   : PATH_VARIABLE 'between' value_expression 'and' value_expression
+   ;
+
+propertyBetween_expression
+   :  value_expression 'between' PATH_VARIABLE 'and' PATH_VARIABLE
+   ;
+
+isNull_expression
+   : PATH_VARIABLE 'is' 'null'
+   | PATH_VARIABLE 'isNull'
+   ;
+
+isNotNull_expression
+   : PATH_VARIABLE 'is' 'not' 'null'
+   | PATH_VARIABLE 'isNotNull'
+   | PATH_VARIABLE 'notNull'
+   ;
+
+isEmpty_expression
+   : PATH_VARIABLE 'is' 'empty'
+   | PATH_VARIABLE 'isEmpty'
+   ;
+
+isNotEmpty_expression
+   : PATH_VARIABLE 'is' 'not' 'empty'
+   | PATH_VARIABLE 'isNotEmpty'
+   | PATH_VARIABLE 'notEmpty'
+   ;
+
+like_expression
+   : PATH_VARIABLE like_op value_expression
+   ;
+
+like_op
+   : 'like'       | 'ilike'
+   | 'contains'   | 'icontains'
+   | 'startsWith' | 'istartsWith'
+   | 'endsWith'   | 'iendsWith'
+   ;
+
+comparison_expression
+   : PATH_VARIABLE comparison_operator value_expression
+   ;
+
+comparison_operator
+   : '='  | 'eq'
+   | '>'  | 'gt'
+   | '>=' | 'ge' | 'gte'
+   | '<'  | 'lt'
+   | '<=' | 'le' | 'lte'
+   | '<>' | '!=' | 'ne'
+   | 'ieq'
+   ;
+
+value_expression
+   : literal
+   | INPUT_VARIABLE
+   ;
+
+literal
+   : STRING_LITERAL
+   | BOOLEAN_LITERAL
+   | NUMBER_LITERAL
+   ;
+
+
+INPUT_VARIABLE
+   : ':' ('a' .. 'z' | 'A' .. 'Z' | '_') ('a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '_')*
+   ;
+
+PATH_VARIABLE
+   : ('a' .. 'z' | 'A' .. 'Z' | '_') ('a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '_' | '.')*
+   ;
+
+CHARACTER
+   : '\'' (~ ('\'' | '\\')) '\''
+   ;
+
+BOOLEAN_LITERAL
+   : 'true'
+   | 'false'
+   ;
+
+NUMBER_LITERAL
+   : [0-9]+ '.'? [0-9]*;
+
+STRING_LITERAL
+   : '\'' ( ~'\'' | '\'\'' )* '\''
+   ;
+
+ESCAPE_CHARACTER
+   : CHARACTER
+   ;
+
+WS
+   : [ \t\r\n] -> skip
+   ;

src/test/resources/logback-test.xml

@@ -76,10 +76,10 @@
   <logger name="com.avaje.ebean" level="INFO"/>
   <logger name="org.avaje.ebean" level="INFO"/>
 
-  <!--<logger name="org.avaje.ebean.SQL" level="TRACE"/>-->
-  <!--<logger name="org.avaje.ebean.TXN" level="TRACE"/>-->
-  <!--<logger name="org.avaje.ebean.SUM" level="TRACE"/>-->
-  <!--<logger name="org.avaje.ebean.ELA" level="TRACE"/>-->
+  <logger name="org.avaje.ebean.SQL" level="TRACE"/>
+  <logger name="org.avaje.ebean.TXN" level="TRACE"/>
+  <logger name="org.avaje.ebean.SUM" level="TRACE"/>
+  <logger name="org.avaje.ebean.ELA" level="TRACE"/>
 
   <!--<logger name="org.avaje.ebean.cache.QUERY" level="TRACE"/>-->
   <!--<logger name="org.avaje.ebean.cache.BEAN" level="TRACE"/>-->