From 4fe2016891b7b06c3e9dcdec27b58acb4a0a0506 Mon Sep 17 00:00:00 2001
From: Roland Praml <praml@foconis.de>
Date: Mon, 19 Nov 2018 10:22:46 +0100
Subject: [PATCH] new comparison method Ine (caseInsensitive notEquals) (#1551)

---
 src/main/java/io/ebean/ExpressionFactory.java |   11 +
 src/main/java/io/ebean/ExpressionList.java    |    6 +
 .../CaseInsensitiveEqualExpression.java       |   24 +-
 .../expression/DefaultExpressionFactory.java  |   24 +-
 .../expression/DefaultExpressionList.java     |    6 +
 .../server/expression/DocQueryContext.java    |    7 +
 .../server/expression/JunctionExpression.java |    5 +
 .../server/grammer/EqlAdapter.java            |    6 +
 .../server/grammer/EqlAdapterHelper.java      |    3 +
 .../server/grammer/EqlOperator.java           |    1 +
 .../server/grammer/OperatorMapping.java       |    1 +
 .../server/grammer/antlr/EQL.tokens           |   22 +-
 .../server/grammer/antlr/EQLBaseListener.java |  346 +++--
 .../server/grammer/antlr/EQLLexer.java        |  442 +++----
 .../server/grammer/antlr/EQLLexer.tokens      |   22 +-
 .../server/grammer/antlr/EQLListener.java     |  244 ++--
 .../server/grammer/antlr/EQLParser.java       | 1165 +++++++++--------
 .../CaseInsensitiveEqualExpressionTest.java   |    2 +-
 .../DefaultExpressionFactoryTest.java         |   21 +-
 .../server/grammer/EqlParserTest.java         |   18 +
 .../query/TestQueryFilterCaseInsensitive.java |  116 ++
 src/test/resources/EQL.g4                     |    3 +-
 22 files changed, 1487 insertions(+), 1008 deletions(-)
 create mode 100644 src/test/java/org/tests/query/TestQueryFilterCaseInsensitive.java

diff --git a/src/main/java/io/ebean/ExpressionFactory.java b/src/main/java/io/ebean/ExpressionFactory.java
index 0c81a32e3..bd5f0a590 100644
--- a/src/main/java/io/ebean/ExpressionFactory.java
+++ b/src/main/java/io/ebean/ExpressionFactory.java
@@ -133,11 +133,22 @@ public interface ExpressionFactory {
    */
   Expression ieq(String propertyName, String value);
 
+  /**
+   * Case Insensitive Not Equal To - property not equal to the given value (typically
+   * using a lower() function to make it case insensitive).
+   */
+  Expression ine(String propertyName, String value);
+
   /**
    * Case Insensitive Equal To that allows for named parameter use.
    */
   Expression ieqObject(String propertyName, Object value);
 
+  /**
+   * Case Insensitive Not Equal To that allows for named parameter use.
+   */
+  Expression ineObject(String propertyName, Object value);
+
   /**
    * Between - property between the two given values.
    */
diff --git a/src/main/java/io/ebean/ExpressionList.java b/src/main/java/io/ebean/ExpressionList.java
index b156afdd9..5a68a6308 100644
--- a/src/main/java/io/ebean/ExpressionList.java
+++ b/src/main/java/io/ebean/ExpressionList.java
@@ -749,6 +749,12 @@ public interface ExpressionList<T> {
    */
   ExpressionList<T> ieq(String propertyName, String value);
 
+  /**
+   * Case Insensitive Not Equal To - property not equal to the given value (typically
+   * using a lower() function to make it case insensitive).
+   */
+  ExpressionList<T> ine(String propertyName, String value);
+
   /**
    * Between - property between the two given values.
    */
diff --git a/src/main/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpression.java b/src/main/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpression.java
index e82698a4a..afa352940 100644
--- a/src/main/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpression.java
@@ -8,8 +8,11 @@ import java.io.IOException;
 
 class CaseInsensitiveEqualExpression extends AbstractValueExpression {
 
-  CaseInsensitiveEqualExpression(String propertyName, Object value) {
+  private boolean not;
+
+  CaseInsensitiveEqualExpression(String propertyName, Object value, boolean not) {
     super(propertyName, value);
+    this.not = not;
   }
 
   /**
@@ -21,7 +24,11 @@ class CaseInsensitiveEqualExpression extends AbstractValueExpression {
 
   @Override
   public void writeDocQuery(DocQueryContext context) throws IOException {
-    context.writeIEqualTo(propName, val());
+    if (not) {
+      context.writeINotEqualTo(propName, val());
+    } else {
+      context.writeIEqualTo(propName, val());
+    }
   }
 
   @Override
@@ -45,13 +52,20 @@ class CaseInsensitiveEqualExpression extends AbstractValueExpression {
     if (prop != null && prop.isDbEncrypted()) {
       pname = prop.getBeanProperty().getDecryptProperty(propName);
     }
-
-    request.append("lower(").append(pname).append(") =? ");
+    if (not) {
+      request.append("lower(").append(pname).append(") !=? ");
+    } else {
+      request.append("lower(").append(pname).append(") =? ");
+    }
   }
 
   @Override
   public void queryPlanHash(StringBuilder builder) {
-    builder.append("Ieq[").append(propName).append("]");
+    if (not) {
+      builder.append("Ine[").append(propName).append("]");
+    } else {
+      builder.append("Ieq[").append(propName).append("]");
+    }
   }
 
   @Override
diff --git a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionFactory.java b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionFactory.java
index 14ab457c8..43d0fae18 100644
--- a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionFactory.java
+++ b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionFactory.java
@@ -182,7 +182,19 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
     if (value == null) {
       return equalsWithNullAsNoop ? NoopExpression.INSTANCE : isNull(propertyName);
     }
-    return new CaseInsensitiveEqualExpression(propertyName, value);
+    return new CaseInsensitiveEqualExpression(propertyName, value, false);
+  }
+
+  /**
+   * Case Insensitive Equal To - property equal to the given value (typically
+   * using a lower() function to make it case insensitive).
+   */
+  @Override
+  public Expression ine(String propertyName, String value) {
+    if (value == null) {
+      return equalsWithNullAsNoop ? NoopExpression.INSTANCE : isNotNull(propertyName);
+    }
+    return new CaseInsensitiveEqualExpression(propertyName, value, true);
   }
 
   /**
@@ -190,7 +202,15 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
    */
   @Override
   public Expression ieqObject(String propertyName, Object value) {
-    return new CaseInsensitiveEqualExpression(propertyName, value);
+    return new CaseInsensitiveEqualExpression(propertyName, value, false);
+  }
+
+  /**
+   * Create for named parameter use (and without support for equalsWithNullAsNoop).
+   */
+  @Override
+  public Expression ineObject(String propertyName, Object value) {
+    return new CaseInsensitiveEqualExpression(propertyName, value, true);
   }
 
   /**
diff --git a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
index 746a1f0a7..6a64b1b1b 100644
--- a/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
+++ b/src/main/java/io/ebeaninternal/server/expression/DefaultExpressionList.java
@@ -759,6 +759,12 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
     return this;
   }
 
+  @Override
+  public ExpressionList<T> ine(String propertyName, String value) {
+    add(expr.ine(propertyName, value));
+    return this;
+  }
+
   @Override
   public ExpressionList<T> ne(String propertyName, Object value) {
     add(expr.ne(propertyName, value));
diff --git a/src/main/java/io/ebeaninternal/server/expression/DocQueryContext.java b/src/main/java/io/ebeaninternal/server/expression/DocQueryContext.java
index 9f0195e85..9e1cf9641 100644
--- a/src/main/java/io/ebeaninternal/server/expression/DocQueryContext.java
+++ b/src/main/java/io/ebeaninternal/server/expression/DocQueryContext.java
@@ -48,6 +48,13 @@ public interface DocQueryContext {
    */
   void writeIEqualTo(String propName, String value) throws IOException;
 
+  /**
+   * Write a case insensitive notEqualTo expression.
+   */
+  default void writeINotEqualTo(String propName, String value) throws IOException {
+    throw new AbstractMethodError("writeINotEqualTo not implemented");
+  }
+
   /**
    * Write a range operation with one value.
    */
diff --git a/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java b/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
index 4dc93e626..a4c2206db 100644
--- a/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
+++ b/src/main/java/io/ebeaninternal/server/expression/JunctionExpression.java
@@ -616,6 +616,11 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
     return exprList.ieq(propertyName, value);
   }
 
+  @Override
+  public ExpressionList<T> ine(String propertyName, String value) {
+    return exprList.ine(propertyName, value);
+  }
+
   @Override
   public ExpressionList<T> iexampleLike(Object example) {
     return exprList.iexampleLike(example);
diff --git a/src/main/java/io/ebeaninternal/server/grammer/EqlAdapter.java b/src/main/java/io/ebeaninternal/server/grammer/EqlAdapter.java
index b3ecad1c3..837e24d29 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/EqlAdapter.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/EqlAdapter.java
@@ -312,6 +312,8 @@ class EqlAdapter<T> extends EQLBaseListener {
         return EqlOperator.EQ;
       case IEQ:
         return EqlOperator.IEQ;
+      case INE:
+        return EqlOperator.INE;
       case NE:
         return EqlOperator.NE;
       // invert
@@ -401,4 +403,8 @@ class EqlAdapter<T> extends EQLBaseListener {
   public Expression ieq(String property, Object bindValue) {
     return query.getExpressionFactory().ieqObject(property, bindValue);
   }
+
+  public Expression ine(String property, Object bindValue) {
+    return query.getExpressionFactory().ineObject(property, bindValue);
+  }
 }
diff --git a/src/main/java/io/ebeaninternal/server/grammer/EqlAdapterHelper.java b/src/main/java/io/ebeaninternal/server/grammer/EqlAdapterHelper.java
index ebcf8521e..fabbcfe8e 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/EqlAdapterHelper.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/EqlAdapterHelper.java
@@ -65,6 +65,9 @@ class EqlAdapterHelper {
       case NE:
         peekExprList().ne(path, bind(value));
         break;
+      case INE:
+        peekExprList().add(owner.ine(path, bind(value)));
+        break;
       case GT:
         peekExprList().gt(path, bind(value));
         break;
diff --git a/src/main/java/io/ebeaninternal/server/grammer/EqlOperator.java b/src/main/java/io/ebeaninternal/server/grammer/EqlOperator.java
index 73cab1063..b3cb4c6ba 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/EqlOperator.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/EqlOperator.java
@@ -5,6 +5,7 @@ enum EqlOperator {
   EQ,
   IEQ,
   NE,
+  INE,
   LT,
   LTE,
   GT,
diff --git a/src/main/java/io/ebeaninternal/server/grammer/OperatorMapping.java b/src/main/java/io/ebeaninternal/server/grammer/OperatorMapping.java
index d7a588856..8e6315eec 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/OperatorMapping.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/OperatorMapping.java
@@ -13,6 +13,7 @@ class OperatorMapping {
     map.put("ieq", EqlOperator.IEQ);
 
     map.put("ne", EqlOperator.NE);
+    map.put("ine", EqlOperator.INE);
     map.put("<>", EqlOperator.NE);
     map.put("!=", EqlOperator.NE);
 
diff --git a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQL.tokens b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQL.tokens
index c6d1f969f..a475c2939 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQL.tokens
+++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQL.tokens
@@ -55,15 +55,16 @@ T__53=54
 T__54=55
 T__55=56
 T__56=57
-INPUT_VARIABLE=58
-PATH_VARIABLE=59
-BOOLEAN_LITERAL=60
-NUMBER_LITERAL=61
-DOUBLE=62
-INT=63
-ZERO=64
-STRING_LITERAL=65
-WS=66
+T__57=58
+INPUT_VARIABLE=59
+PATH_VARIABLE=60
+BOOLEAN_LITERAL=61
+NUMBER_LITERAL=62
+DOUBLE=63
+INT=64
+ZERO=65
+STRING_LITERAL=66
+WS=67
 'select'=1
 '('=2
 ')'=3
@@ -121,4 +122,5 @@ WS=66
 '!='=55
 'ne'=56
 'ieq'=57
-'0'=64
+'ine'=58
+'0'=65
diff --git a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLBaseListener.java b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLBaseListener.java
index e368fb917..28d89cc14 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLBaseListener.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLBaseListener.java
@@ -1,4 +1,4 @@
-// Generated from /home/rob/github/ebean/src/test/resources/EQL.g4 by ANTLR 4.7
+// Generated from C:/dev/ebean/ebean/src/test/resources/EQL.g4 by ANTLR 4.7.1
 package io.ebeaninternal.server.grammer.antlr;
 
 import org.antlr.v4.runtime.ParserRuleContext;
@@ -6,15 +6,17 @@ import org.antlr.v4.runtime.tree.ErrorNode;
 import org.antlr.v4.runtime.tree.TerminalNode;
 
 /**
- * This class provides an empty implementation of {@link EQLListener},
- * which can be extended to create a listener which only needs to handle a subset
- * of the available methods.
+ * This class provides an empty implementation of {@link EQLListener}, which can
+ * be extended to create a listener which only needs to handle a subset of the
+ * available methods.
  */
 public class EQLBaseListener implements EQLListener {
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterSelect_statement(EQLParser.Select_statementContext ctx) {
@@ -22,8 +24,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitSelect_statement(EQLParser.Select_statementContext ctx) {
@@ -31,8 +35,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterSelect_clause(EQLParser.Select_clauseContext ctx) {
@@ -40,8 +46,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitSelect_clause(EQLParser.Select_clauseContext ctx) {
@@ -49,8 +57,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterDistinct(EQLParser.DistinctContext ctx) {
@@ -58,8 +68,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitDistinct(EQLParser.DistinctContext ctx) {
@@ -67,8 +79,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterFetch_clause(EQLParser.Fetch_clauseContext ctx) {
@@ -76,8 +90,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitFetch_clause(EQLParser.Fetch_clauseContext ctx) {
@@ -85,8 +101,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterWhere_clause(EQLParser.Where_clauseContext ctx) {
@@ -94,8 +112,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitWhere_clause(EQLParser.Where_clauseContext ctx) {
@@ -103,8 +123,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterOrderby_clause(EQLParser.Orderby_clauseContext ctx) {
@@ -112,8 +134,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitOrderby_clause(EQLParser.Orderby_clauseContext ctx) {
@@ -121,8 +145,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterOrderby_property(EQLParser.Orderby_propertyContext ctx) {
@@ -130,8 +156,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitOrderby_property(EQLParser.Orderby_propertyContext ctx) {
@@ -139,8 +167,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterNulls_firstlast(EQLParser.Nulls_firstlastContext ctx) {
@@ -148,8 +178,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitNulls_firstlast(EQLParser.Nulls_firstlastContext ctx) {
@@ -157,8 +189,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterAsc_desc(EQLParser.Asc_descContext ctx) {
@@ -166,8 +200,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitAsc_desc(EQLParser.Asc_descContext ctx) {
@@ -175,8 +211,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterLimit_clause(EQLParser.Limit_clauseContext ctx) {
@@ -184,8 +222,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitLimit_clause(EQLParser.Limit_clauseContext ctx) {
@@ -193,8 +233,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterOffset_clause(EQLParser.Offset_clauseContext ctx) {
@@ -202,8 +244,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitOffset_clause(EQLParser.Offset_clauseContext ctx) {
@@ -211,8 +255,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterFetch_path(EQLParser.Fetch_pathContext ctx) {
@@ -220,8 +266,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitFetch_path(EQLParser.Fetch_pathContext ctx) {
@@ -229,8 +277,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterFetch_property_set(EQLParser.Fetch_property_setContext ctx) {
@@ -238,8 +288,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitFetch_property_set(EQLParser.Fetch_property_setContext ctx) {
@@ -247,8 +299,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterFetch_property_group(EQLParser.Fetch_property_groupContext ctx) {
@@ -256,8 +310,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitFetch_property_group(EQLParser.Fetch_property_groupContext ctx) {
@@ -265,8 +321,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterFetch_property(EQLParser.Fetch_propertyContext ctx) {
@@ -274,8 +332,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitFetch_property(EQLParser.Fetch_propertyContext ctx) {
@@ -283,8 +343,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterFetch_query_hint(EQLParser.Fetch_query_hintContext ctx) {
@@ -292,8 +354,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitFetch_query_hint(EQLParser.Fetch_query_hintContext ctx) {
@@ -301,8 +365,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterFetch_lazy_hint(EQLParser.Fetch_lazy_hintContext ctx) {
@@ -310,8 +376,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitFetch_lazy_hint(EQLParser.Fetch_lazy_hintContext ctx) {
@@ -319,8 +387,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterFetch_option(EQLParser.Fetch_optionContext ctx) {
@@ -328,8 +398,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitFetch_option(EQLParser.Fetch_optionContext ctx) {
@@ -337,8 +409,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterFetch_query_option(EQLParser.Fetch_query_optionContext ctx) {
@@ -346,8 +420,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitFetch_query_option(EQLParser.Fetch_query_optionContext ctx) {
@@ -355,8 +431,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterFetch_lazy_option(EQLParser.Fetch_lazy_optionContext ctx) {
@@ -364,8 +442,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitFetch_lazy_option(EQLParser.Fetch_lazy_optionContext ctx) {
@@ -373,8 +453,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterFetch_batch_size(EQLParser.Fetch_batch_sizeContext ctx) {
@@ -382,8 +464,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitFetch_batch_size(EQLParser.Fetch_batch_sizeContext ctx) {
@@ -391,8 +475,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterConditional_expression(EQLParser.Conditional_expressionContext ctx) {
@@ -400,8 +486,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitConditional_expression(EQLParser.Conditional_expressionContext ctx) {
@@ -409,8 +497,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterConditional_term(EQLParser.Conditional_termContext ctx) {
@@ -418,8 +508,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitConditional_term(EQLParser.Conditional_termContext ctx) {
@@ -427,8 +519,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterConditional_factor(EQLParser.Conditional_factorContext ctx) {
@@ -436,8 +530,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitConditional_factor(EQLParser.Conditional_factorContext ctx) {
@@ -445,8 +541,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterConditional_primary(EQLParser.Conditional_primaryContext ctx) {
@@ -454,8 +552,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitConditional_primary(EQLParser.Conditional_primaryContext ctx) {
@@ -463,8 +563,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterAny_expression(EQLParser.Any_expressionContext ctx) {
@@ -472,8 +574,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitAny_expression(EQLParser.Any_expressionContext ctx) {
@@ -481,8 +585,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterIn_expression(EQLParser.In_expressionContext ctx) {
@@ -490,8 +596,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitIn_expression(EQLParser.In_expressionContext ctx) {
@@ -499,8 +607,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterIn_value(EQLParser.In_valueContext ctx) {
@@ -508,8 +618,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitIn_value(EQLParser.In_valueContext ctx) {
@@ -517,8 +629,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterBetween_expression(EQLParser.Between_expressionContext ctx) {
@@ -526,8 +640,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitBetween_expression(EQLParser.Between_expressionContext ctx) {
@@ -535,8 +651,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterPropertyBetween_expression(EQLParser.PropertyBetween_expressionContext ctx) {
@@ -544,8 +662,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitPropertyBetween_expression(EQLParser.PropertyBetween_expressionContext ctx) {
@@ -553,8 +673,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterIsNull_expression(EQLParser.IsNull_expressionContext ctx) {
@@ -562,8 +684,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitIsNull_expression(EQLParser.IsNull_expressionContext ctx) {
@@ -571,8 +695,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterIsNotNull_expression(EQLParser.IsNotNull_expressionContext ctx) {
@@ -580,8 +706,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitIsNotNull_expression(EQLParser.IsNotNull_expressionContext ctx) {
@@ -589,8 +717,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterIsEmpty_expression(EQLParser.IsEmpty_expressionContext ctx) {
@@ -598,8 +728,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitIsEmpty_expression(EQLParser.IsEmpty_expressionContext ctx) {
@@ -607,8 +739,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterIsNotEmpty_expression(EQLParser.IsNotEmpty_expressionContext ctx) {
@@ -616,8 +750,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitIsNotEmpty_expression(EQLParser.IsNotEmpty_expressionContext ctx) {
@@ -625,8 +761,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterLike_expression(EQLParser.Like_expressionContext ctx) {
@@ -634,8 +772,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitLike_expression(EQLParser.Like_expressionContext ctx) {
@@ -643,8 +783,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterLike_op(EQLParser.Like_opContext ctx) {
@@ -652,8 +794,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitLike_op(EQLParser.Like_opContext ctx) {
@@ -661,8 +805,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterComparison_expression(EQLParser.Comparison_expressionContext ctx) {
@@ -670,8 +816,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitComparison_expression(EQLParser.Comparison_expressionContext ctx) {
@@ -679,8 +827,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterComparison_operator(EQLParser.Comparison_operatorContext ctx) {
@@ -688,8 +838,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitComparison_operator(EQLParser.Comparison_operatorContext ctx) {
@@ -697,8 +849,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterValue_expression(EQLParser.Value_expressionContext ctx) {
@@ -706,8 +860,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitValue_expression(EQLParser.Value_expressionContext ctx) {
@@ -715,8 +871,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterLiteral(EQLParser.LiteralContext ctx) {
@@ -724,8 +882,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitLiteral(EQLParser.LiteralContext ctx) {
@@ -733,8 +893,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void enterEveryRule(ParserRuleContext ctx) {
@@ -742,8 +904,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void exitEveryRule(ParserRuleContext ctx) {
@@ -751,8 +915,10 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void visitTerminal(TerminalNode node) {
@@ -760,10 +926,12 @@ public class EQLBaseListener implements EQLListener {
 
   /**
    * {@inheritDoc}
+   *
    * <p>
-   * <p>The default implementation does nothing.</p>
+   * The default implementation does nothing.
+   * </p>
    */
   @Override
   public void visitErrorNode(ErrorNode node) {
   }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.java b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.java
index b0c5076a4..dc0486a0f 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.java
@@ -1,77 +1,55 @@
-// Generated from /home/rob/github/ebean/src/test/resources/EQL.g4 by ANTLR 4.7
+// Generated from C:/dev/ebean/ebean/src/test/resources/EQL.g4 by ANTLR 4.7.1
 package io.ebeaninternal.server.grammer.antlr;
 
-import org.antlr.v4.runtime.CharStream;
 import org.antlr.v4.runtime.Lexer;
-import org.antlr.v4.runtime.RuntimeMetaData;
-import org.antlr.v4.runtime.Vocabulary;
-import org.antlr.v4.runtime.VocabularyImpl;
-import org.antlr.v4.runtime.atn.ATN;
-import org.antlr.v4.runtime.atn.ATNDeserializer;
-import org.antlr.v4.runtime.atn.LexerATNSimulator;
-import org.antlr.v4.runtime.atn.PredictionContextCache;
+import org.antlr.v4.runtime.CharStream;
+import org.antlr.v4.runtime.Token;
+import org.antlr.v4.runtime.TokenStream;
+import org.antlr.v4.runtime.*;
+import org.antlr.v4.runtime.atn.*;
 import org.antlr.v4.runtime.dfa.DFA;
+import org.antlr.v4.runtime.misc.*;
 
-@SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"})
+@SuppressWarnings({ "all", "warnings", "unchecked", "unused", "cast" })
 public class EQLLexer extends Lexer {
   static {
-    RuntimeMetaData.checkVersion("4.7", RuntimeMetaData.VERSION);
+    RuntimeMetaData.checkVersion("4.7.1", RuntimeMetaData.VERSION);
   }
 
   protected static final DFA[] _decisionToDFA;
-  protected static final PredictionContextCache _sharedContextCache =
-    new PredictionContextCache();
-  public static final int
-    T__0 = 1, T__1 = 2, T__2 = 3, T__3 = 4, T__4 = 5, T__5 = 6, T__6 = 7, T__7 = 8, T__8 = 9,
-    T__9 = 10, T__10 = 11, T__11 = 12, T__12 = 13, T__13 = 14, T__14 = 15, T__15 = 16, T__16 = 17,
-    T__17 = 18, T__18 = 19, T__19 = 20, T__20 = 21, T__21 = 22, T__22 = 23, T__23 = 24,
-    T__24 = 25, T__25 = 26, T__26 = 27, T__27 = 28, T__28 = 29, T__29 = 30, T__30 = 31,
-    T__31 = 32, T__32 = 33, T__33 = 34, T__34 = 35, T__35 = 36, T__36 = 37, T__37 = 38,
-    T__38 = 39, T__39 = 40, T__40 = 41, T__41 = 42, T__42 = 43, T__43 = 44, T__44 = 45,
-    T__45 = 46, T__46 = 47, T__47 = 48, T__48 = 49, T__49 = 50, T__50 = 51, T__51 = 52,
-    T__52 = 53, T__53 = 54, T__54 = 55, T__55 = 56, T__56 = 57, INPUT_VARIABLE = 58, PATH_VARIABLE = 59,
-    BOOLEAN_LITERAL = 60, NUMBER_LITERAL = 61, DOUBLE = 62, INT = 63, ZERO = 64, STRING_LITERAL = 65,
-    WS = 66;
-  public static String[] channelNames = {
-    "DEFAULT_TOKEN_CHANNEL", "HIDDEN"
-  };
+  protected static final PredictionContextCache _sharedContextCache = new PredictionContextCache();
+  public static final int T__0 = 1, T__1 = 2, T__2 = 3, T__3 = 4, T__4 = 5, T__5 = 6, T__6 = 7, T__7 = 8, T__8 = 9,
+      T__9 = 10, T__10 = 11, T__11 = 12, T__12 = 13, T__13 = 14, T__14 = 15, T__15 = 16, T__16 = 17, T__17 = 18,
+      T__18 = 19, T__19 = 20, T__20 = 21, T__21 = 22, T__22 = 23, T__23 = 24, T__24 = 25, T__25 = 26, T__26 = 27,
+      T__27 = 28, T__28 = 29, T__29 = 30, T__30 = 31, T__31 = 32, T__32 = 33, T__33 = 34, T__34 = 35, T__35 = 36,
+      T__36 = 37, T__37 = 38, T__38 = 39, T__39 = 40, T__40 = 41, T__41 = 42, T__42 = 43, T__43 = 44, T__44 = 45,
+      T__45 = 46, T__46 = 47, T__47 = 48, T__48 = 49, T__49 = 50, T__50 = 51, T__51 = 52, T__52 = 53, T__53 = 54,
+      T__54 = 55, T__55 = 56, T__56 = 57, T__57 = 58, INPUT_VARIABLE = 59, PATH_VARIABLE = 60, BOOLEAN_LITERAL = 61,
+      NUMBER_LITERAL = 62, DOUBLE = 63, INT = 64, ZERO = 65, STRING_LITERAL = 66, WS = 67;
+  public static String[] channelNames = { "DEFAULT_TOKEN_CHANNEL", "HIDDEN" };
 
-  public static String[] modeNames = {
-    "DEFAULT_MODE"
-  };
+  public static String[] modeNames = { "DEFAULT_MODE" };
 
-  public static final String[] ruleNames = {
-    "T__0", "T__1", "T__2", "T__3", "T__4", "T__5", "T__6", "T__7", "T__8",
-    "T__9", "T__10", "T__11", "T__12", "T__13", "T__14", "T__15", "T__16",
-    "T__17", "T__18", "T__19", "T__20", "T__21", "T__22", "T__23", "T__24",
-    "T__25", "T__26", "T__27", "T__28", "T__29", "T__30", "T__31", "T__32",
-    "T__33", "T__34", "T__35", "T__36", "T__37", "T__38", "T__39", "T__40",
-    "T__41", "T__42", "T__43", "T__44", "T__45", "T__46", "T__47", "T__48",
-    "T__49", "T__50", "T__51", "T__52", "T__53", "T__54", "T__55", "T__56",
-    "INPUT_VARIABLE", "PATH_VARIABLE", "BOOLEAN_LITERAL", "NUMBER_LITERAL",
-    "DOUBLE", "INT", "ZERO", "STRING_LITERAL", "WS"
-  };
+  public static final String[] ruleNames = { "T__0", "T__1", "T__2", "T__3", "T__4", "T__5", "T__6", "T__7", "T__8",
+      "T__9", "T__10", "T__11", "T__12", "T__13", "T__14", "T__15", "T__16", "T__17", "T__18", "T__19", "T__20",
+      "T__21", "T__22", "T__23", "T__24", "T__25", "T__26", "T__27", "T__28", "T__29", "T__30", "T__31", "T__32",
+      "T__33", "T__34", "T__35", "T__36", "T__37", "T__38", "T__39", "T__40", "T__41", "T__42", "T__43", "T__44",
+      "T__45", "T__46", "T__47", "T__48", "T__49", "T__50", "T__51", "T__52", "T__53", "T__54", "T__55", "T__56",
+      "T__57", "INPUT_VARIABLE", "PATH_VARIABLE", "BOOLEAN_LITERAL", "NUMBER_LITERAL", "DOUBLE", "INT", "ZERO",
+      "STRING_LITERAL", "WS" };
 
-  private static final String[] _LITERAL_NAMES = {
-    null, "'select'", "'('", "')'", "'distinct'", "'where'", "'order'", "'by'",
-    "','", "'nulls'", "'first'", "'last'", "'asc'", "'desc'", "'limit'", "'offset'",
-    "'fetch'", "'+'", "'query'", "'lazy'", "'or'", "'and'", "'not'", "'in'",
-    "'between'", "'is'", "'null'", "'isNull'", "'isNotNull'", "'notNull'",
-    "'empty'", "'isEmpty'", "'isNotEmpty'", "'notEmpty'", "'like'", "'ilike'",
-    "'contains'", "'icontains'", "'startsWith'", "'istartsWith'", "'endsWith'",
-    "'iendsWith'", "'='", "'eq'", "'>'", "'gt'", "'>='", "'ge'", "'gte'",
-    "'<'", "'lt'", "'<='", "'le'", "'lte'", "'<>'", "'!='", "'ne'", "'ieq'",
-    null, null, null, null, null, null, "'0'"
-  };
-  private static final String[] _SYMBOLIC_NAMES = {
-    null, null, null, null, null, null, null, null, null, null, null, null,
-    null, null, null, null, null, null, null, null, null, null, null, null,
-    null, null, null, null, null, null, null, null, null, null, null, null,
-    null, null, null, null, null, null, null, null, null, null, null, null,
-    null, null, null, null, null, null, null, null, null, null, "INPUT_VARIABLE",
-    "PATH_VARIABLE", "BOOLEAN_LITERAL", "NUMBER_LITERAL", "DOUBLE", "INT",
-    "ZERO", "STRING_LITERAL", "WS"
-  };
+  private static final String[] _LITERAL_NAMES = { null, "'select'", "'('", "')'", "'distinct'", "'where'", "'order'",
+      "'by'", "','", "'nulls'", "'first'", "'last'", "'asc'", "'desc'", "'limit'", "'offset'", "'fetch'", "'+'",
+      "'query'", "'lazy'", "'or'", "'and'", "'not'", "'in'", "'between'", "'is'", "'null'", "'isNull'", "'isNotNull'",
+      "'notNull'", "'empty'", "'isEmpty'", "'isNotEmpty'", "'notEmpty'", "'like'", "'ilike'", "'contains'",
+      "'icontains'", "'startsWith'", "'istartsWith'", "'endsWith'", "'iendsWith'", "'='", "'eq'", "'>'", "'gt'", "'>='",
+      "'ge'", "'gte'", "'<'", "'lt'", "'<='", "'le'", "'lte'", "'<>'", "'!='", "'ne'", "'ieq'", "'ine'", null, null,
+      null, null, null, null, "'0'" };
+  private static final String[] _SYMBOLIC_NAMES = { null, null, null, null, null, null, null, null, null, null, null,
+      null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
+      null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
+      null, null, null, null, null, null, null, null, null, null, "INPUT_VARIABLE", "PATH_VARIABLE", "BOOLEAN_LITERAL",
+      "NUMBER_LITERAL", "DOUBLE", "INT", "ZERO", "STRING_LITERAL", "WS" };
   public static final Vocabulary VOCABULARY = new VocabularyImpl(_LITERAL_NAMES, _SYMBOLIC_NAMES);
 
   /**
@@ -79,7 +57,6 @@ public class EQLLexer extends Lexer {
    */
   @Deprecated
   public static final String[] tokenNames;
-
   static {
     tokenNames = new String[_SYMBOLIC_NAMES.length];
     for (int i = 0; i < tokenNames.length; i++) {
@@ -106,7 +83,6 @@ public class EQLLexer extends Lexer {
     return VOCABULARY;
   }
 
-
   public EQLLexer(CharStream input) {
     super(input);
     _interp = new LexerATNSimulator(this, _ATN, _decisionToDFA, _sharedContextCache);
@@ -142,180 +118,178 @@ public class EQLLexer extends Lexer {
     return _ATN;
   }
 
-  public static final String _serializedATN =
-    "\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\2D\u0200\b\1\4\2\t" +
-      "\2\4\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\4\n\t\n\4\13" +
-      "\t\13\4\f\t\f\4\r\t\r\4\16\t\16\4\17\t\17\4\20\t\20\4\21\t\21\4\22\t\22" +
-      "\4\23\t\23\4\24\t\24\4\25\t\25\4\26\t\26\4\27\t\27\4\30\t\30\4\31\t\31" +
-      "\4\32\t\32\4\33\t\33\4\34\t\34\4\35\t\35\4\36\t\36\4\37\t\37\4 \t \4!" +
-      "\t!\4\"\t\"\4#\t#\4$\t$\4%\t%\4&\t&\4\'\t\'\4(\t(\4)\t)\4*\t*\4+\t+\4" +
-      ",\t,\4-\t-\4.\t.\4/\t/\4\60\t\60\4\61\t\61\4\62\t\62\4\63\t\63\4\64\t" +
-      "\64\4\65\t\65\4\66\t\66\4\67\t\67\48\t8\49\t9\4:\t:\4;\t;\4<\t<\4=\t=" +
-      "\4>\t>\4?\t?\4@\t@\4A\tA\4B\tB\4C\tC\3\2\3\2\3\2\3\2\3\2\3\2\3\2\3\3\3" +
-      "\3\3\4\3\4\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\6\3\6\3\6\3\6\3\6\3\6" +
-      "\3\7\3\7\3\7\3\7\3\7\3\7\3\b\3\b\3\b\3\t\3\t\3\n\3\n\3\n\3\n\3\n\3\n\3" +
-      "\13\3\13\3\13\3\13\3\13\3\13\3\f\3\f\3\f\3\f\3\f\3\r\3\r\3\r\3\r\3\16" +
-      "\3\16\3\16\3\16\3\16\3\17\3\17\3\17\3\17\3\17\3\17\3\20\3\20\3\20\3\20" +
-      "\3\20\3\20\3\20\3\21\3\21\3\21\3\21\3\21\3\21\3\22\3\22\3\23\3\23\3\23" +
-      "\3\23\3\23\3\23\3\24\3\24\3\24\3\24\3\24\3\25\3\25\3\25\3\26\3\26\3\26" +
-      "\3\26\3\27\3\27\3\27\3\27\3\30\3\30\3\30\3\31\3\31\3\31\3\31\3\31\3\31" +
-      "\3\31\3\31\3\32\3\32\3\32\3\33\3\33\3\33\3\33\3\33\3\34\3\34\3\34\3\34" +
-      "\3\34\3\34\3\34\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\36" +
-      "\3\36\3\36\3\36\3\36\3\36\3\36\3\36\3\37\3\37\3\37\3\37\3\37\3\37\3 \3" +
-      " \3 \3 \3 \3 \3 \3 \3!\3!\3!\3!\3!\3!\3!\3!\3!\3!\3!\3\"\3\"\3\"\3\"\3" +
-      "\"\3\"\3\"\3\"\3\"\3#\3#\3#\3#\3#\3$\3$\3$\3$\3$\3$\3%\3%\3%\3%\3%\3%" +
-      "\3%\3%\3%\3&\3&\3&\3&\3&\3&\3&\3&\3&\3&\3\'\3\'\3\'\3\'\3\'\3\'\3\'\3" +
-      "\'\3\'\3\'\3\'\3(\3(\3(\3(\3(\3(\3(\3(\3(\3(\3(\3(\3)\3)\3)\3)\3)\3)\3" +
-      ")\3)\3)\3*\3*\3*\3*\3*\3*\3*\3*\3*\3*\3+\3+\3,\3,\3,\3-\3-\3.\3.\3.\3" +
-      "/\3/\3/\3\60\3\60\3\60\3\61\3\61\3\61\3\61\3\62\3\62\3\63\3\63\3\63\3" +
-      "\64\3\64\3\64\3\65\3\65\3\65\3\66\3\66\3\66\3\66\3\67\3\67\3\67\38\38" +
-      "\38\39\39\39\3:\3:\3:\3:\3;\3;\3;\7;\u01bb\n;\f;\16;\u01be\13;\3<\3<\7" +
-      "<\u01c2\n<\f<\16<\u01c5\13<\3=\3=\3=\3=\3=\3=\3=\3=\3=\5=\u01d0\n=\3>" +
-      "\5>\u01d3\n>\3>\3>\5>\u01d7\n>\3>\3>\5>\u01db\n>\3?\6?\u01de\n?\r?\16" +
-      "?\u01df\3?\3?\7?\u01e4\n?\f?\16?\u01e7\13?\3@\3@\7@\u01eb\n@\f@\16@\u01ee" +
-      "\13@\3A\3A\3B\3B\3B\3B\7B\u01f6\nB\fB\16B\u01f9\13B\3B\3B\3C\3C\3C\3C" +
-      "\2\2D\3\3\5\4\7\5\t\6\13\7\r\b\17\t\21\n\23\13\25\f\27\r\31\16\33\17\35" +
-      "\20\37\21!\22#\23%\24\'\25)\26+\27-\30/\31\61\32\63\33\65\34\67\359\36" +
-      ";\37= ?!A\"C#E$G%I&K\'M(O)Q*S+U,W-Y.[/]\60_\61a\62c\63e\64g\65i\66k\67" +
-      "m8o9q:s;u<w=y>{?}@\177A\u0081B\u0083C\u0085D\3\2\t\5\2C\\aac|\6\2\62;" +
-      "C\\aac|\7\2\60\60\62;C\\aac|\3\2\62;\3\2\63;\3\2))\5\2\13\f\17\17\"\"" +
-      "\2\u020b\2\3\3\2\2\2\2\5\3\2\2\2\2\7\3\2\2\2\2\t\3\2\2\2\2\13\3\2\2\2" +
-      "\2\r\3\2\2\2\2\17\3\2\2\2\2\21\3\2\2\2\2\23\3\2\2\2\2\25\3\2\2\2\2\27" +
-      "\3\2\2\2\2\31\3\2\2\2\2\33\3\2\2\2\2\35\3\2\2\2\2\37\3\2\2\2\2!\3\2\2" +
-      "\2\2#\3\2\2\2\2%\3\2\2\2\2\'\3\2\2\2\2)\3\2\2\2\2+\3\2\2\2\2-\3\2\2\2" +
-      "\2/\3\2\2\2\2\61\3\2\2\2\2\63\3\2\2\2\2\65\3\2\2\2\2\67\3\2\2\2\29\3\2" +
-      "\2\2\2;\3\2\2\2\2=\3\2\2\2\2?\3\2\2\2\2A\3\2\2\2\2C\3\2\2\2\2E\3\2\2\2" +
-      "\2G\3\2\2\2\2I\3\2\2\2\2K\3\2\2\2\2M\3\2\2\2\2O\3\2\2\2\2Q\3\2\2\2\2S" +
-      "\3\2\2\2\2U\3\2\2\2\2W\3\2\2\2\2Y\3\2\2\2\2[\3\2\2\2\2]\3\2\2\2\2_\3\2" +
-      "\2\2\2a\3\2\2\2\2c\3\2\2\2\2e\3\2\2\2\2g\3\2\2\2\2i\3\2\2\2\2k\3\2\2\2" +
-      "\2m\3\2\2\2\2o\3\2\2\2\2q\3\2\2\2\2s\3\2\2\2\2u\3\2\2\2\2w\3\2\2\2\2y" +
-      "\3\2\2\2\2{\3\2\2\2\2}\3\2\2\2\2\177\3\2\2\2\2\u0081\3\2\2\2\2\u0083\3" +
-      "\2\2\2\2\u0085\3\2\2\2\3\u0087\3\2\2\2\5\u008e\3\2\2\2\7\u0090\3\2\2\2" +
-      "\t\u0092\3\2\2\2\13\u009b\3\2\2\2\r\u00a1\3\2\2\2\17\u00a7\3\2\2\2\21" +
-      "\u00aa\3\2\2\2\23\u00ac\3\2\2\2\25\u00b2\3\2\2\2\27\u00b8\3\2\2\2\31\u00bd" +
-      "\3\2\2\2\33\u00c1\3\2\2\2\35\u00c6\3\2\2\2\37\u00cc\3\2\2\2!\u00d3\3\2" +
-      "\2\2#\u00d9\3\2\2\2%\u00db\3\2\2\2\'\u00e1\3\2\2\2)\u00e6\3\2\2\2+\u00e9" +
-      "\3\2\2\2-\u00ed\3\2\2\2/\u00f1\3\2\2\2\61\u00f4\3\2\2\2\63\u00fc\3\2\2" +
-      "\2\65\u00ff\3\2\2\2\67\u0104\3\2\2\29\u010b\3\2\2\2;\u0115\3\2\2\2=\u011d" +
-      "\3\2\2\2?\u0123\3\2\2\2A\u012b\3\2\2\2C\u0136\3\2\2\2E\u013f\3\2\2\2G" +
-      "\u0144\3\2\2\2I\u014a\3\2\2\2K\u0153\3\2\2\2M\u015d\3\2\2\2O\u0168\3\2" +
-      "\2\2Q\u0174\3\2\2\2S\u017d\3\2\2\2U\u0187\3\2\2\2W\u0189\3\2\2\2Y\u018c" +
-      "\3\2\2\2[\u018e\3\2\2\2]\u0191\3\2\2\2_\u0194\3\2\2\2a\u0197\3\2\2\2c" +
-      "\u019b\3\2\2\2e\u019d\3\2\2\2g\u01a0\3\2\2\2i\u01a3\3\2\2\2k\u01a6\3\2" +
-      "\2\2m\u01aa\3\2\2\2o\u01ad\3\2\2\2q\u01b0\3\2\2\2s\u01b3\3\2\2\2u\u01b7" +
-      "\3\2\2\2w\u01bf\3\2\2\2y\u01cf\3\2\2\2{\u01da\3\2\2\2}\u01dd\3\2\2\2\177" +
-      "\u01e8\3\2\2\2\u0081\u01ef\3\2\2\2\u0083\u01f1\3\2\2\2\u0085\u01fc\3\2" +
-      "\2\2\u0087\u0088\7u\2\2\u0088\u0089\7g\2\2\u0089\u008a\7n\2\2\u008a\u008b" +
-      "\7g\2\2\u008b\u008c\7e\2\2\u008c\u008d\7v\2\2\u008d\4\3\2\2\2\u008e\u008f" +
-      "\7*\2\2\u008f\6\3\2\2\2\u0090\u0091\7+\2\2\u0091\b\3\2\2\2\u0092\u0093" +
-      "\7f\2\2\u0093\u0094\7k\2\2\u0094\u0095\7u\2\2\u0095\u0096\7v\2\2\u0096" +
-      "\u0097\7k\2\2\u0097\u0098\7p\2\2\u0098\u0099\7e\2\2\u0099\u009a\7v\2\2" +
-      "\u009a\n\3\2\2\2\u009b\u009c\7y\2\2\u009c\u009d\7j\2\2\u009d\u009e\7g" +
-      "\2\2\u009e\u009f\7t\2\2\u009f\u00a0\7g\2\2\u00a0\f\3\2\2\2\u00a1\u00a2" +
-      "\7q\2\2\u00a2\u00a3\7t\2\2\u00a3\u00a4\7f\2\2\u00a4\u00a5\7g\2\2\u00a5" +
-      "\u00a6\7t\2\2\u00a6\16\3\2\2\2\u00a7\u00a8\7d\2\2\u00a8\u00a9\7{\2\2\u00a9" +
-      "\20\3\2\2\2\u00aa\u00ab\7.\2\2\u00ab\22\3\2\2\2\u00ac\u00ad\7p\2\2\u00ad" +
-      "\u00ae\7w\2\2\u00ae\u00af\7n\2\2\u00af\u00b0\7n\2\2\u00b0\u00b1\7u\2\2" +
-      "\u00b1\24\3\2\2\2\u00b2\u00b3\7h\2\2\u00b3\u00b4\7k\2\2\u00b4\u00b5\7" +
-      "t\2\2\u00b5\u00b6\7u\2\2\u00b6\u00b7\7v\2\2\u00b7\26\3\2\2\2\u00b8\u00b9" +
-      "\7n\2\2\u00b9\u00ba\7c\2\2\u00ba\u00bb\7u\2\2\u00bb\u00bc\7v\2\2\u00bc" +
-      "\30\3\2\2\2\u00bd\u00be\7c\2\2\u00be\u00bf\7u\2\2\u00bf\u00c0\7e\2\2\u00c0" +
-      "\32\3\2\2\2\u00c1\u00c2\7f\2\2\u00c2\u00c3\7g\2\2\u00c3\u00c4\7u\2\2\u00c4" +
-      "\u00c5\7e\2\2\u00c5\34\3\2\2\2\u00c6\u00c7\7n\2\2\u00c7\u00c8\7k\2\2\u00c8" +
-      "\u00c9\7o\2\2\u00c9\u00ca\7k\2\2\u00ca\u00cb\7v\2\2\u00cb\36\3\2\2\2\u00cc" +
-      "\u00cd\7q\2\2\u00cd\u00ce\7h\2\2\u00ce\u00cf\7h\2\2\u00cf\u00d0\7u\2\2" +
-      "\u00d0\u00d1\7g\2\2\u00d1\u00d2\7v\2\2\u00d2 \3\2\2\2\u00d3\u00d4\7h\2" +
-      "\2\u00d4\u00d5\7g\2\2\u00d5\u00d6\7v\2\2\u00d6\u00d7\7e\2\2\u00d7\u00d8" +
-      "\7j\2\2\u00d8\"\3\2\2\2\u00d9\u00da\7-\2\2\u00da$\3\2\2\2\u00db\u00dc" +
-      "\7s\2\2\u00dc\u00dd\7w\2\2\u00dd\u00de\7g\2\2\u00de\u00df\7t\2\2\u00df" +
-      "\u00e0\7{\2\2\u00e0&\3\2\2\2\u00e1\u00e2\7n\2\2\u00e2\u00e3\7c\2\2\u00e3" +
-      "\u00e4\7|\2\2\u00e4\u00e5\7{\2\2\u00e5(\3\2\2\2\u00e6\u00e7\7q\2\2\u00e7" +
-      "\u00e8\7t\2\2\u00e8*\3\2\2\2\u00e9\u00ea\7c\2\2\u00ea\u00eb\7p\2\2\u00eb" +
-      "\u00ec\7f\2\2\u00ec,\3\2\2\2\u00ed\u00ee\7p\2\2\u00ee\u00ef\7q\2\2\u00ef" +
-      "\u00f0\7v\2\2\u00f0.\3\2\2\2\u00f1\u00f2\7k\2\2\u00f2\u00f3\7p\2\2\u00f3" +
-      "\60\3\2\2\2\u00f4\u00f5\7d\2\2\u00f5\u00f6\7g\2\2\u00f6\u00f7\7v\2\2\u00f7" +
-      "\u00f8\7y\2\2\u00f8\u00f9\7g\2\2\u00f9\u00fa\7g\2\2\u00fa\u00fb\7p\2\2" +
-      "\u00fb\62\3\2\2\2\u00fc\u00fd\7k\2\2\u00fd\u00fe\7u\2\2\u00fe\64\3\2\2" +
-      "\2\u00ff\u0100\7p\2\2\u0100\u0101\7w\2\2\u0101\u0102\7n\2\2\u0102\u0103" +
-      "\7n\2\2\u0103\66\3\2\2\2\u0104\u0105\7k\2\2\u0105\u0106\7u\2\2\u0106\u0107" +
-      "\7P\2\2\u0107\u0108\7w\2\2\u0108\u0109\7n\2\2\u0109\u010a\7n\2\2\u010a" +
-      "8\3\2\2\2\u010b\u010c\7k\2\2\u010c\u010d\7u\2\2\u010d\u010e\7P\2\2\u010e" +
-      "\u010f\7q\2\2\u010f\u0110\7v\2\2\u0110\u0111\7P\2\2\u0111\u0112\7w\2\2" +
-      "\u0112\u0113\7n\2\2\u0113\u0114\7n\2\2\u0114:\3\2\2\2\u0115\u0116\7p\2" +
-      "\2\u0116\u0117\7q\2\2\u0117\u0118\7v\2\2\u0118\u0119\7P\2\2\u0119\u011a" +
-      "\7w\2\2\u011a\u011b\7n\2\2\u011b\u011c\7n\2\2\u011c<\3\2\2\2\u011d\u011e" +
-      "\7g\2\2\u011e\u011f\7o\2\2\u011f\u0120\7r\2\2\u0120\u0121\7v\2\2\u0121" +
-      "\u0122\7{\2\2\u0122>\3\2\2\2\u0123\u0124\7k\2\2\u0124\u0125\7u\2\2\u0125" +
-      "\u0126\7G\2\2\u0126\u0127\7o\2\2\u0127\u0128\7r\2\2\u0128\u0129\7v\2\2" +
-      "\u0129\u012a\7{\2\2\u012a@\3\2\2\2\u012b\u012c\7k\2\2\u012c\u012d\7u\2" +
-      "\2\u012d\u012e\7P\2\2\u012e\u012f\7q\2\2\u012f\u0130\7v\2\2\u0130\u0131" +
-      "\7G\2\2\u0131\u0132\7o\2\2\u0132\u0133\7r\2\2\u0133\u0134\7v\2\2\u0134" +
-      "\u0135\7{\2\2\u0135B\3\2\2\2\u0136\u0137\7p\2\2\u0137\u0138\7q\2\2\u0138" +
-      "\u0139\7v\2\2\u0139\u013a\7G\2\2\u013a\u013b\7o\2\2\u013b\u013c\7r\2\2" +
-      "\u013c\u013d\7v\2\2\u013d\u013e\7{\2\2\u013eD\3\2\2\2\u013f\u0140\7n\2" +
-      "\2\u0140\u0141\7k\2\2\u0141\u0142\7m\2\2\u0142\u0143\7g\2\2\u0143F\3\2" +
-      "\2\2\u0144\u0145\7k\2\2\u0145\u0146\7n\2\2\u0146\u0147\7k\2\2\u0147\u0148" +
-      "\7m\2\2\u0148\u0149\7g\2\2\u0149H\3\2\2\2\u014a\u014b\7e\2\2\u014b\u014c" +
-      "\7q\2\2\u014c\u014d\7p\2\2\u014d\u014e\7v\2\2\u014e\u014f\7c\2\2\u014f" +
-      "\u0150\7k\2\2\u0150\u0151\7p\2\2\u0151\u0152\7u\2\2\u0152J\3\2\2\2\u0153" +
-      "\u0154\7k\2\2\u0154\u0155\7e\2\2\u0155\u0156\7q\2\2\u0156\u0157\7p\2\2" +
-      "\u0157\u0158\7v\2\2\u0158\u0159\7c\2\2\u0159\u015a\7k\2\2\u015a\u015b" +
-      "\7p\2\2\u015b\u015c\7u\2\2\u015cL\3\2\2\2\u015d\u015e\7u\2\2\u015e\u015f" +
-      "\7v\2\2\u015f\u0160\7c\2\2\u0160\u0161\7t\2\2\u0161\u0162\7v\2\2\u0162" +
-      "\u0163\7u\2\2\u0163\u0164\7Y\2\2\u0164\u0165\7k\2\2\u0165\u0166\7v\2\2" +
-      "\u0166\u0167\7j\2\2\u0167N\3\2\2\2\u0168\u0169\7k\2\2\u0169\u016a\7u\2" +
-      "\2\u016a\u016b\7v\2\2\u016b\u016c\7c\2\2\u016c\u016d\7t\2\2\u016d\u016e" +
-      "\7v\2\2\u016e\u016f\7u\2\2\u016f\u0170\7Y\2\2\u0170\u0171\7k\2\2\u0171" +
-      "\u0172\7v\2\2\u0172\u0173\7j\2\2\u0173P\3\2\2\2\u0174\u0175\7g\2\2\u0175" +
-      "\u0176\7p\2\2\u0176\u0177\7f\2\2\u0177\u0178\7u\2\2\u0178\u0179\7Y\2\2" +
-      "\u0179\u017a\7k\2\2\u017a\u017b\7v\2\2\u017b\u017c\7j\2\2\u017cR\3\2\2" +
-      "\2\u017d\u017e\7k\2\2\u017e\u017f\7g\2\2\u017f\u0180\7p\2\2\u0180\u0181" +
-      "\7f\2\2\u0181\u0182\7u\2\2\u0182\u0183\7Y\2\2\u0183\u0184\7k\2\2\u0184" +
-      "\u0185\7v\2\2\u0185\u0186\7j\2\2\u0186T\3\2\2\2\u0187\u0188\7?\2\2\u0188" +
-      "V\3\2\2\2\u0189\u018a\7g\2\2\u018a\u018b\7s\2\2\u018bX\3\2\2\2\u018c\u018d" +
-      "\7@\2\2\u018dZ\3\2\2\2\u018e\u018f\7i\2\2\u018f\u0190\7v\2\2\u0190\\\3" +
-      "\2\2\2\u0191\u0192\7@\2\2\u0192\u0193\7?\2\2\u0193^\3\2\2\2\u0194\u0195" +
-      "\7i\2\2\u0195\u0196\7g\2\2\u0196`\3\2\2\2\u0197\u0198\7i\2\2\u0198\u0199" +
-      "\7v\2\2\u0199\u019a\7g\2\2\u019ab\3\2\2\2\u019b\u019c\7>\2\2\u019cd\3" +
-      "\2\2\2\u019d\u019e\7n\2\2\u019e\u019f\7v\2\2\u019ff\3\2\2\2\u01a0\u01a1" +
-      "\7>\2\2\u01a1\u01a2\7?\2\2\u01a2h\3\2\2\2\u01a3\u01a4\7n\2\2\u01a4\u01a5" +
-      "\7g\2\2\u01a5j\3\2\2\2\u01a6\u01a7\7n\2\2\u01a7\u01a8\7v\2\2\u01a8\u01a9" +
-      "\7g\2\2\u01a9l\3\2\2\2\u01aa\u01ab\7>\2\2\u01ab\u01ac\7@\2\2\u01acn\3" +
-      "\2\2\2\u01ad\u01ae\7#\2\2\u01ae\u01af\7?\2\2\u01afp\3\2\2\2\u01b0\u01b1" +
-      "\7p\2\2\u01b1\u01b2\7g\2\2\u01b2r\3\2\2\2\u01b3\u01b4\7k\2\2\u01b4\u01b5" +
-      "\7g\2\2\u01b5\u01b6\7s\2\2\u01b6t\3\2\2\2\u01b7\u01b8\7<\2\2\u01b8\u01bc" +
-      "\t\2\2\2\u01b9\u01bb\t\3\2\2\u01ba\u01b9\3\2\2\2\u01bb\u01be\3\2\2\2\u01bc" +
-      "\u01ba\3\2\2\2\u01bc\u01bd\3\2\2\2\u01bdv\3\2\2\2\u01be\u01bc\3\2\2\2" +
-      "\u01bf\u01c3\t\2\2\2\u01c0\u01c2\t\4\2\2\u01c1\u01c0\3\2\2\2\u01c2\u01c5" +
-      "\3\2\2\2\u01c3\u01c1\3\2\2\2\u01c3\u01c4\3\2\2\2\u01c4x\3\2\2\2\u01c5" +
-      "\u01c3\3\2\2\2\u01c6\u01c7\7v\2\2\u01c7\u01c8\7t\2\2\u01c8\u01c9\7w\2" +
-      "\2\u01c9\u01d0\7g\2\2\u01ca\u01cb\7h\2\2\u01cb\u01cc\7c\2\2\u01cc\u01cd" +
-      "\7n\2\2\u01cd\u01ce\7u\2\2\u01ce\u01d0\7g\2\2\u01cf\u01c6\3\2\2\2\u01cf" +
-      "\u01ca\3\2\2\2\u01d0z\3\2\2\2\u01d1\u01d3\7/\2\2\u01d2\u01d1\3\2\2\2\u01d2" +
-      "\u01d3\3\2\2\2\u01d3\u01d4\3\2\2\2\u01d4\u01db\5}?\2\u01d5\u01d7\7/\2" +
-      "\2\u01d6\u01d5\3\2\2\2\u01d6\u01d7\3\2\2\2\u01d7\u01d8\3\2\2\2\u01d8\u01db" +
-      "\5\177@\2\u01d9\u01db\5\u0081A\2\u01da\u01d2\3\2\2\2\u01da\u01d6\3\2\2" +
-      "\2\u01da\u01d9\3\2\2\2\u01db|\3\2\2\2\u01dc\u01de\t\5\2\2\u01dd\u01dc" +
-      "\3\2\2\2\u01de\u01df\3\2\2\2\u01df\u01dd\3\2\2\2\u01df\u01e0\3\2\2\2\u01e0" +
-      "\u01e1\3\2\2\2\u01e1\u01e5\7\60\2\2\u01e2\u01e4\t\5\2\2\u01e3\u01e2\3" +
-      "\2\2\2\u01e4\u01e7\3\2\2\2\u01e5\u01e3\3\2\2\2\u01e5\u01e6\3\2\2\2\u01e6" +
-      "~\3\2\2\2\u01e7\u01e5\3\2\2\2\u01e8\u01ec\t\6\2\2\u01e9\u01eb\t\5\2\2" +
-      "\u01ea\u01e9\3\2\2\2\u01eb\u01ee\3\2\2\2\u01ec\u01ea\3\2\2\2\u01ec\u01ed" +
-      "\3\2\2\2\u01ed\u0080\3\2\2\2\u01ee\u01ec\3\2\2\2\u01ef\u01f0\7\62\2\2" +
-      "\u01f0\u0082\3\2\2\2\u01f1\u01f7\7)\2\2\u01f2\u01f6\n\7\2\2\u01f3\u01f4" +
-      "\7)\2\2\u01f4\u01f6\7)\2\2\u01f5\u01f2\3\2\2\2\u01f5\u01f3\3\2\2\2\u01f6" +
-      "\u01f9\3\2\2\2\u01f7\u01f5\3\2\2\2\u01f7\u01f8\3\2\2\2\u01f8\u01fa\3\2" +
-      "\2\2\u01f9\u01f7\3\2\2\2\u01fa\u01fb\7)\2\2\u01fb\u0084\3\2\2\2\u01fc" +
-      "\u01fd\t\b\2\2\u01fd\u01fe\3\2\2\2\u01fe\u01ff\bC\2\2\u01ff\u0086\3\2" +
-      "\2\2\16\2\u01bc\u01c3\u01cf\u01d2\u01d6\u01da\u01df\u01e5\u01ec\u01f5" +
-      "\u01f7\3\b\2\2";
-  public static final ATN _ATN =
-    new ATNDeserializer().deserialize(_serializedATN.toCharArray());
-
+  public static final String _serializedATN = "\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\2E\u0206\b\1\4\2\t"
+      + "\2\4\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\4\n\t\n\4\13"
+      + "\t\13\4\f\t\f\4\r\t\r\4\16\t\16\4\17\t\17\4\20\t\20\4\21\t\21\4\22\t\22"
+      + "\4\23\t\23\4\24\t\24\4\25\t\25\4\26\t\26\4\27\t\27\4\30\t\30\4\31\t\31"
+      + "\4\32\t\32\4\33\t\33\4\34\t\34\4\35\t\35\4\36\t\36\4\37\t\37\4 \t \4!"
+      + "\t!\4\"\t\"\4#\t#\4$\t$\4%\t%\4&\t&\4\'\t\'\4(\t(\4)\t)\4*\t*\4+\t+\4"
+      + ",\t,\4-\t-\4.\t.\4/\t/\4\60\t\60\4\61\t\61\4\62\t\62\4\63\t\63\4\64\t"
+      + "\64\4\65\t\65\4\66\t\66\4\67\t\67\48\t8\49\t9\4:\t:\4;\t;\4<\t<\4=\t="
+      + "\4>\t>\4?\t?\4@\t@\4A\tA\4B\tB\4C\tC\4D\tD\3\2\3\2\3\2\3\2\3\2\3\2\3\2"
+      + "\3\3\3\3\3\4\3\4\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\5\3\6\3\6\3\6\3\6\3"
+      + "\6\3\6\3\7\3\7\3\7\3\7\3\7\3\7\3\b\3\b\3\b\3\t\3\t\3\n\3\n\3\n\3\n\3\n"
+      + "\3\n\3\13\3\13\3\13\3\13\3\13\3\13\3\f\3\f\3\f\3\f\3\f\3\r\3\r\3\r\3\r"
+      + "\3\16\3\16\3\16\3\16\3\16\3\17\3\17\3\17\3\17\3\17\3\17\3\20\3\20\3\20"
+      + "\3\20\3\20\3\20\3\20\3\21\3\21\3\21\3\21\3\21\3\21\3\22\3\22\3\23\3\23"
+      + "\3\23\3\23\3\23\3\23\3\24\3\24\3\24\3\24\3\24\3\25\3\25\3\25\3\26\3\26"
+      + "\3\26\3\26\3\27\3\27\3\27\3\27\3\30\3\30\3\30\3\31\3\31\3\31\3\31\3\31"
+      + "\3\31\3\31\3\31\3\32\3\32\3\32\3\33\3\33\3\33\3\33\3\33\3\34\3\34\3\34"
+      + "\3\34\3\34\3\34\3\34\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\35\3\35"
+      + "\3\36\3\36\3\36\3\36\3\36\3\36\3\36\3\36\3\37\3\37\3\37\3\37\3\37\3\37"
+      + "\3 \3 \3 \3 \3 \3 \3 \3 \3!\3!\3!\3!\3!\3!\3!\3!\3!\3!\3!\3\"\3\"\3\""
+      + "\3\"\3\"\3\"\3\"\3\"\3\"\3#\3#\3#\3#\3#\3$\3$\3$\3$\3$\3$\3%\3%\3%\3%"
+      + "\3%\3%\3%\3%\3%\3&\3&\3&\3&\3&\3&\3&\3&\3&\3&\3\'\3\'\3\'\3\'\3\'\3\'"
+      + "\3\'\3\'\3\'\3\'\3\'\3(\3(\3(\3(\3(\3(\3(\3(\3(\3(\3(\3(\3)\3)\3)\3)\3"
+      + ")\3)\3)\3)\3)\3*\3*\3*\3*\3*\3*\3*\3*\3*\3*\3+\3+\3,\3,\3,\3-\3-\3.\3"
+      + ".\3.\3/\3/\3/\3\60\3\60\3\60\3\61\3\61\3\61\3\61\3\62\3\62\3\63\3\63\3"
+      + "\63\3\64\3\64\3\64\3\65\3\65\3\65\3\66\3\66\3\66\3\66\3\67\3\67\3\67\3"
+      + "8\38\38\39\39\39\3:\3:\3:\3:\3;\3;\3;\3;\3<\3<\3<\7<\u01c1\n<\f<\16<\u01c4"
+      + "\13<\3=\3=\7=\u01c8\n=\f=\16=\u01cb\13=\3>\3>\3>\3>\3>\3>\3>\3>\3>\5>"
+      + "\u01d6\n>\3?\5?\u01d9\n?\3?\3?\5?\u01dd\n?\3?\3?\5?\u01e1\n?\3@\6@\u01e4"
+      + "\n@\r@\16@\u01e5\3@\3@\7@\u01ea\n@\f@\16@\u01ed\13@\3A\3A\7A\u01f1\nA"
+      + "\fA\16A\u01f4\13A\3B\3B\3C\3C\3C\3C\7C\u01fc\nC\fC\16C\u01ff\13C\3C\3"
+      + "C\3D\3D\3D\3D\2\2E\3\3\5\4\7\5\t\6\13\7\r\b\17\t\21\n\23\13\25\f\27\r"
+      + "\31\16\33\17\35\20\37\21!\22#\23%\24\'\25)\26+\27-\30/\31\61\32\63\33"
+      + "\65\34\67\359\36;\37= ?!A\"C#E$G%I&K\'M(O)Q*S+U,W-Y.[/]\60_\61a\62c\63"
+      + "e\64g\65i\66k\67m8o9q:s;u<w=y>{?}@\177A\u0081B\u0083C\u0085D\u0087E\3"
+      + "\2\t\5\2C\\aac|\6\2\62;C\\aac|\7\2\60\60\62;C\\aac|\3\2\62;\3\2\63;\3"
+      + "\2))\5\2\13\f\17\17\"\"\2\u0211\2\3\3\2\2\2\2\5\3\2\2\2\2\7\3\2\2\2\2"
+      + "\t\3\2\2\2\2\13\3\2\2\2\2\r\3\2\2\2\2\17\3\2\2\2\2\21\3\2\2\2\2\23\3\2"
+      + "\2\2\2\25\3\2\2\2\2\27\3\2\2\2\2\31\3\2\2\2\2\33\3\2\2\2\2\35\3\2\2\2"
+      + "\2\37\3\2\2\2\2!\3\2\2\2\2#\3\2\2\2\2%\3\2\2\2\2\'\3\2\2\2\2)\3\2\2\2"
+      + "\2+\3\2\2\2\2-\3\2\2\2\2/\3\2\2\2\2\61\3\2\2\2\2\63\3\2\2\2\2\65\3\2\2"
+      + "\2\2\67\3\2\2\2\29\3\2\2\2\2;\3\2\2\2\2=\3\2\2\2\2?\3\2\2\2\2A\3\2\2\2"
+      + "\2C\3\2\2\2\2E\3\2\2\2\2G\3\2\2\2\2I\3\2\2\2\2K\3\2\2\2\2M\3\2\2\2\2O"
+      + "\3\2\2\2\2Q\3\2\2\2\2S\3\2\2\2\2U\3\2\2\2\2W\3\2\2\2\2Y\3\2\2\2\2[\3\2"
+      + "\2\2\2]\3\2\2\2\2_\3\2\2\2\2a\3\2\2\2\2c\3\2\2\2\2e\3\2\2\2\2g\3\2\2\2"
+      + "\2i\3\2\2\2\2k\3\2\2\2\2m\3\2\2\2\2o\3\2\2\2\2q\3\2\2\2\2s\3\2\2\2\2u"
+      + "\3\2\2\2\2w\3\2\2\2\2y\3\2\2\2\2{\3\2\2\2\2}\3\2\2\2\2\177\3\2\2\2\2\u0081"
+      + "\3\2\2\2\2\u0083\3\2\2\2\2\u0085\3\2\2\2\2\u0087\3\2\2\2\3\u0089\3\2\2"
+      + "\2\5\u0090\3\2\2\2\7\u0092\3\2\2\2\t\u0094\3\2\2\2\13\u009d\3\2\2\2\r"
+      + "\u00a3\3\2\2\2\17\u00a9\3\2\2\2\21\u00ac\3\2\2\2\23\u00ae\3\2\2\2\25\u00b4"
+      + "\3\2\2\2\27\u00ba\3\2\2\2\31\u00bf\3\2\2\2\33\u00c3\3\2\2\2\35\u00c8\3"
+      + "\2\2\2\37\u00ce\3\2\2\2!\u00d5\3\2\2\2#\u00db\3\2\2\2%\u00dd\3\2\2\2\'"
+      + "\u00e3\3\2\2\2)\u00e8\3\2\2\2+\u00eb\3\2\2\2-\u00ef\3\2\2\2/\u00f3\3\2"
+      + "\2\2\61\u00f6\3\2\2\2\63\u00fe\3\2\2\2\65\u0101\3\2\2\2\67\u0106\3\2\2"
+      + "\29\u010d\3\2\2\2;\u0117\3\2\2\2=\u011f\3\2\2\2?\u0125\3\2\2\2A\u012d"
+      + "\3\2\2\2C\u0138\3\2\2\2E\u0141\3\2\2\2G\u0146\3\2\2\2I\u014c\3\2\2\2K"
+      + "\u0155\3\2\2\2M\u015f\3\2\2\2O\u016a\3\2\2\2Q\u0176\3\2\2\2S\u017f\3\2"
+      + "\2\2U\u0189\3\2\2\2W\u018b\3\2\2\2Y\u018e\3\2\2\2[\u0190\3\2\2\2]\u0193"
+      + "\3\2\2\2_\u0196\3\2\2\2a\u0199\3\2\2\2c\u019d\3\2\2\2e\u019f\3\2\2\2g"
+      + "\u01a2\3\2\2\2i\u01a5\3\2\2\2k\u01a8\3\2\2\2m\u01ac\3\2\2\2o\u01af\3\2"
+      + "\2\2q\u01b2\3\2\2\2s\u01b5\3\2\2\2u\u01b9\3\2\2\2w\u01bd\3\2\2\2y\u01c5"
+      + "\3\2\2\2{\u01d5\3\2\2\2}\u01e0\3\2\2\2\177\u01e3\3\2\2\2\u0081\u01ee\3"
+      + "\2\2\2\u0083\u01f5\3\2\2\2\u0085\u01f7\3\2\2\2\u0087\u0202\3\2\2\2\u0089"
+      + "\u008a\7u\2\2\u008a\u008b\7g\2\2\u008b\u008c\7n\2\2\u008c\u008d\7g\2\2"
+      + "\u008d\u008e\7e\2\2\u008e\u008f\7v\2\2\u008f\4\3\2\2\2\u0090\u0091\7*"
+      + "\2\2\u0091\6\3\2\2\2\u0092\u0093\7+\2\2\u0093\b\3\2\2\2\u0094\u0095\7"
+      + "f\2\2\u0095\u0096\7k\2\2\u0096\u0097\7u\2\2\u0097\u0098\7v\2\2\u0098\u0099"
+      + "\7k\2\2\u0099\u009a\7p\2\2\u009a\u009b\7e\2\2\u009b\u009c\7v\2\2\u009c"
+      + "\n\3\2\2\2\u009d\u009e\7y\2\2\u009e\u009f\7j\2\2\u009f\u00a0\7g\2\2\u00a0"
+      + "\u00a1\7t\2\2\u00a1\u00a2\7g\2\2\u00a2\f\3\2\2\2\u00a3\u00a4\7q\2\2\u00a4"
+      + "\u00a5\7t\2\2\u00a5\u00a6\7f\2\2\u00a6\u00a7\7g\2\2\u00a7\u00a8\7t\2\2"
+      + "\u00a8\16\3\2\2\2\u00a9\u00aa\7d\2\2\u00aa\u00ab\7{\2\2\u00ab\20\3\2\2"
+      + "\2\u00ac\u00ad\7.\2\2\u00ad\22\3\2\2\2\u00ae\u00af\7p\2\2\u00af\u00b0"
+      + "\7w\2\2\u00b0\u00b1\7n\2\2\u00b1\u00b2\7n\2\2\u00b2\u00b3\7u\2\2\u00b3"
+      + "\24\3\2\2\2\u00b4\u00b5\7h\2\2\u00b5\u00b6\7k\2\2\u00b6\u00b7\7t\2\2\u00b7"
+      + "\u00b8\7u\2\2\u00b8\u00b9\7v\2\2\u00b9\26\3\2\2\2\u00ba\u00bb\7n\2\2\u00bb"
+      + "\u00bc\7c\2\2\u00bc\u00bd\7u\2\2\u00bd\u00be\7v\2\2\u00be\30\3\2\2\2\u00bf"
+      + "\u00c0\7c\2\2\u00c0\u00c1\7u\2\2\u00c1\u00c2\7e\2\2\u00c2\32\3\2\2\2\u00c3"
+      + "\u00c4\7f\2\2\u00c4\u00c5\7g\2\2\u00c5\u00c6\7u\2\2\u00c6\u00c7\7e\2\2"
+      + "\u00c7\34\3\2\2\2\u00c8\u00c9\7n\2\2\u00c9\u00ca\7k\2\2\u00ca\u00cb\7"
+      + "o\2\2\u00cb\u00cc\7k\2\2\u00cc\u00cd\7v\2\2\u00cd\36\3\2\2\2\u00ce\u00cf"
+      + "\7q\2\2\u00cf\u00d0\7h\2\2\u00d0\u00d1\7h\2\2\u00d1\u00d2\7u\2\2\u00d2"
+      + "\u00d3\7g\2\2\u00d3\u00d4\7v\2\2\u00d4 \3\2\2\2\u00d5\u00d6\7h\2\2\u00d6"
+      + "\u00d7\7g\2\2\u00d7\u00d8\7v\2\2\u00d8\u00d9\7e\2\2\u00d9\u00da\7j\2\2"
+      + "\u00da\"\3\2\2\2\u00db\u00dc\7-\2\2\u00dc$\3\2\2\2\u00dd\u00de\7s\2\2"
+      + "\u00de\u00df\7w\2\2\u00df\u00e0\7g\2\2\u00e0\u00e1\7t\2\2\u00e1\u00e2"
+      + "\7{\2\2\u00e2&\3\2\2\2\u00e3\u00e4\7n\2\2\u00e4\u00e5\7c\2\2\u00e5\u00e6"
+      + "\7|\2\2\u00e6\u00e7\7{\2\2\u00e7(\3\2\2\2\u00e8\u00e9\7q\2\2\u00e9\u00ea"
+      + "\7t\2\2\u00ea*\3\2\2\2\u00eb\u00ec\7c\2\2\u00ec\u00ed\7p\2\2\u00ed\u00ee"
+      + "\7f\2\2\u00ee,\3\2\2\2\u00ef\u00f0\7p\2\2\u00f0\u00f1\7q\2\2\u00f1\u00f2"
+      + "\7v\2\2\u00f2.\3\2\2\2\u00f3\u00f4\7k\2\2\u00f4\u00f5\7p\2\2\u00f5\60"
+      + "\3\2\2\2\u00f6\u00f7\7d\2\2\u00f7\u00f8\7g\2\2\u00f8\u00f9\7v\2\2\u00f9"
+      + "\u00fa\7y\2\2\u00fa\u00fb\7g\2\2\u00fb\u00fc\7g\2\2\u00fc\u00fd\7p\2\2"
+      + "\u00fd\62\3\2\2\2\u00fe\u00ff\7k\2\2\u00ff\u0100\7u\2\2\u0100\64\3\2\2"
+      + "\2\u0101\u0102\7p\2\2\u0102\u0103\7w\2\2\u0103\u0104\7n\2\2\u0104\u0105"
+      + "\7n\2\2\u0105\66\3\2\2\2\u0106\u0107\7k\2\2\u0107\u0108\7u\2\2\u0108\u0109"
+      + "\7P\2\2\u0109\u010a\7w\2\2\u010a\u010b\7n\2\2\u010b\u010c\7n\2\2\u010c"
+      + "8\3\2\2\2\u010d\u010e\7k\2\2\u010e\u010f\7u\2\2\u010f\u0110\7P\2\2\u0110"
+      + "\u0111\7q\2\2\u0111\u0112\7v\2\2\u0112\u0113\7P\2\2\u0113\u0114\7w\2\2"
+      + "\u0114\u0115\7n\2\2\u0115\u0116\7n\2\2\u0116:\3\2\2\2\u0117\u0118\7p\2"
+      + "\2\u0118\u0119\7q\2\2\u0119\u011a\7v\2\2\u011a\u011b\7P\2\2\u011b\u011c"
+      + "\7w\2\2\u011c\u011d\7n\2\2\u011d\u011e\7n\2\2\u011e<\3\2\2\2\u011f\u0120"
+      + "\7g\2\2\u0120\u0121\7o\2\2\u0121\u0122\7r\2\2\u0122\u0123\7v\2\2\u0123"
+      + "\u0124\7{\2\2\u0124>\3\2\2\2\u0125\u0126\7k\2\2\u0126\u0127\7u\2\2\u0127"
+      + "\u0128\7G\2\2\u0128\u0129\7o\2\2\u0129\u012a\7r\2\2\u012a\u012b\7v\2\2"
+      + "\u012b\u012c\7{\2\2\u012c@\3\2\2\2\u012d\u012e\7k\2\2\u012e\u012f\7u\2"
+      + "\2\u012f\u0130\7P\2\2\u0130\u0131\7q\2\2\u0131\u0132\7v\2\2\u0132\u0133"
+      + "\7G\2\2\u0133\u0134\7o\2\2\u0134\u0135\7r\2\2\u0135\u0136\7v\2\2\u0136"
+      + "\u0137\7{\2\2\u0137B\3\2\2\2\u0138\u0139\7p\2\2\u0139\u013a\7q\2\2\u013a"
+      + "\u013b\7v\2\2\u013b\u013c\7G\2\2\u013c\u013d\7o\2\2\u013d\u013e\7r\2\2"
+      + "\u013e\u013f\7v\2\2\u013f\u0140\7{\2\2\u0140D\3\2\2\2\u0141\u0142\7n\2"
+      + "\2\u0142\u0143\7k\2\2\u0143\u0144\7m\2\2\u0144\u0145\7g\2\2\u0145F\3\2"
+      + "\2\2\u0146\u0147\7k\2\2\u0147\u0148\7n\2\2\u0148\u0149\7k\2\2\u0149\u014a"
+      + "\7m\2\2\u014a\u014b\7g\2\2\u014bH\3\2\2\2\u014c\u014d\7e\2\2\u014d\u014e"
+      + "\7q\2\2\u014e\u014f\7p\2\2\u014f\u0150\7v\2\2\u0150\u0151\7c\2\2\u0151"
+      + "\u0152\7k\2\2\u0152\u0153\7p\2\2\u0153\u0154\7u\2\2\u0154J\3\2\2\2\u0155"
+      + "\u0156\7k\2\2\u0156\u0157\7e\2\2\u0157\u0158\7q\2\2\u0158\u0159\7p\2\2"
+      + "\u0159\u015a\7v\2\2\u015a\u015b\7c\2\2\u015b\u015c\7k\2\2\u015c\u015d"
+      + "\7p\2\2\u015d\u015e\7u\2\2\u015eL\3\2\2\2\u015f\u0160\7u\2\2\u0160\u0161"
+      + "\7v\2\2\u0161\u0162\7c\2\2\u0162\u0163\7t\2\2\u0163\u0164\7v\2\2\u0164"
+      + "\u0165\7u\2\2\u0165\u0166\7Y\2\2\u0166\u0167\7k\2\2\u0167\u0168\7v\2\2"
+      + "\u0168\u0169\7j\2\2\u0169N\3\2\2\2\u016a\u016b\7k\2\2\u016b\u016c\7u\2"
+      + "\2\u016c\u016d\7v\2\2\u016d\u016e\7c\2\2\u016e\u016f\7t\2\2\u016f\u0170"
+      + "\7v\2\2\u0170\u0171\7u\2\2\u0171\u0172\7Y\2\2\u0172\u0173\7k\2\2\u0173"
+      + "\u0174\7v\2\2\u0174\u0175\7j\2\2\u0175P\3\2\2\2\u0176\u0177\7g\2\2\u0177"
+      + "\u0178\7p\2\2\u0178\u0179\7f\2\2\u0179\u017a\7u\2\2\u017a\u017b\7Y\2\2"
+      + "\u017b\u017c\7k\2\2\u017c\u017d\7v\2\2\u017d\u017e\7j\2\2\u017eR\3\2\2"
+      + "\2\u017f\u0180\7k\2\2\u0180\u0181\7g\2\2\u0181\u0182\7p\2\2\u0182\u0183"
+      + "\7f\2\2\u0183\u0184\7u\2\2\u0184\u0185\7Y\2\2\u0185\u0186\7k\2\2\u0186"
+      + "\u0187\7v\2\2\u0187\u0188\7j\2\2\u0188T\3\2\2\2\u0189\u018a\7?\2\2\u018a"
+      + "V\3\2\2\2\u018b\u018c\7g\2\2\u018c\u018d\7s\2\2\u018dX\3\2\2\2\u018e\u018f"
+      + "\7@\2\2\u018fZ\3\2\2\2\u0190\u0191\7i\2\2\u0191\u0192\7v\2\2\u0192\\\3"
+      + "\2\2\2\u0193\u0194\7@\2\2\u0194\u0195\7?\2\2\u0195^\3\2\2\2\u0196\u0197"
+      + "\7i\2\2\u0197\u0198\7g\2\2\u0198`\3\2\2\2\u0199\u019a\7i\2\2\u019a\u019b"
+      + "\7v\2\2\u019b\u019c\7g\2\2\u019cb\3\2\2\2\u019d\u019e\7>\2\2\u019ed\3"
+      + "\2\2\2\u019f\u01a0\7n\2\2\u01a0\u01a1\7v\2\2\u01a1f\3\2\2\2\u01a2\u01a3"
+      + "\7>\2\2\u01a3\u01a4\7?\2\2\u01a4h\3\2\2\2\u01a5\u01a6\7n\2\2\u01a6\u01a7"
+      + "\7g\2\2\u01a7j\3\2\2\2\u01a8\u01a9\7n\2\2\u01a9\u01aa\7v\2\2\u01aa\u01ab"
+      + "\7g\2\2\u01abl\3\2\2\2\u01ac\u01ad\7>\2\2\u01ad\u01ae\7@\2\2\u01aen\3"
+      + "\2\2\2\u01af\u01b0\7#\2\2\u01b0\u01b1\7?\2\2\u01b1p\3\2\2\2\u01b2\u01b3"
+      + "\7p\2\2\u01b3\u01b4\7g\2\2\u01b4r\3\2\2\2\u01b5\u01b6\7k\2\2\u01b6\u01b7"
+      + "\7g\2\2\u01b7\u01b8\7s\2\2\u01b8t\3\2\2\2\u01b9\u01ba\7k\2\2\u01ba\u01bb"
+      + "\7p\2\2\u01bb\u01bc\7g\2\2\u01bcv\3\2\2\2\u01bd\u01be\7<\2\2\u01be\u01c2"
+      + "\t\2\2\2\u01bf\u01c1\t\3\2\2\u01c0\u01bf\3\2\2\2\u01c1\u01c4\3\2\2\2\u01c2"
+      + "\u01c0\3\2\2\2\u01c2\u01c3\3\2\2\2\u01c3x\3\2\2\2\u01c4\u01c2\3\2\2\2"
+      + "\u01c5\u01c9\t\2\2\2\u01c6\u01c8\t\4\2\2\u01c7\u01c6\3\2\2\2\u01c8\u01cb"
+      + "\3\2\2\2\u01c9\u01c7\3\2\2\2\u01c9\u01ca\3\2\2\2\u01caz\3\2\2\2\u01cb"
+      + "\u01c9\3\2\2\2\u01cc\u01cd\7v\2\2\u01cd\u01ce\7t\2\2\u01ce\u01cf\7w\2"
+      + "\2\u01cf\u01d6\7g\2\2\u01d0\u01d1\7h\2\2\u01d1\u01d2\7c\2\2\u01d2\u01d3"
+      + "\7n\2\2\u01d3\u01d4\7u\2\2\u01d4\u01d6\7g\2\2\u01d5\u01cc\3\2\2\2\u01d5"
+      + "\u01d0\3\2\2\2\u01d6|\3\2\2\2\u01d7\u01d9\7/\2\2\u01d8\u01d7\3\2\2\2\u01d8"
+      + "\u01d9\3\2\2\2\u01d9\u01da\3\2\2\2\u01da\u01e1\5\177@\2\u01db\u01dd\7"
+      + "/\2\2\u01dc\u01db\3\2\2\2\u01dc\u01dd\3\2\2\2\u01dd\u01de\3\2\2\2\u01de"
+      + "\u01e1\5\u0081A\2\u01df\u01e1\5\u0083B\2\u01e0\u01d8\3\2\2\2\u01e0\u01dc"
+      + "\3\2\2\2\u01e0\u01df\3\2\2\2\u01e1~\3\2\2\2\u01e2\u01e4\t\5\2\2\u01e3"
+      + "\u01e2\3\2\2\2\u01e4\u01e5\3\2\2\2\u01e5\u01e3\3\2\2\2\u01e5\u01e6\3\2"
+      + "\2\2\u01e6\u01e7\3\2\2\2\u01e7\u01eb\7\60\2\2\u01e8\u01ea\t\5\2\2\u01e9"
+      + "\u01e8\3\2\2\2\u01ea\u01ed\3\2\2\2\u01eb\u01e9\3\2\2\2\u01eb\u01ec\3\2"
+      + "\2\2\u01ec\u0080\3\2\2\2\u01ed\u01eb\3\2\2\2\u01ee\u01f2\t\6\2\2\u01ef"
+      + "\u01f1\t\5\2\2\u01f0\u01ef\3\2\2\2\u01f1\u01f4\3\2\2\2\u01f2\u01f0\3\2"
+      + "\2\2\u01f2\u01f3\3\2\2\2\u01f3\u0082\3\2\2\2\u01f4\u01f2\3\2\2\2\u01f5"
+      + "\u01f6\7\62\2\2\u01f6\u0084\3\2\2\2\u01f7\u01fd\7)\2\2\u01f8\u01fc\n\7"
+      + "\2\2\u01f9\u01fa\7)\2\2\u01fa\u01fc\7)\2\2\u01fb\u01f8\3\2\2\2\u01fb\u01f9"
+      + "\3\2\2\2\u01fc\u01ff\3\2\2\2\u01fd\u01fb\3\2\2\2\u01fd\u01fe\3\2\2\2\u01fe"
+      + "\u0200\3\2\2\2\u01ff\u01fd\3\2\2\2\u0200\u0201\7)\2\2\u0201\u0086\3\2"
+      + "\2\2\u0202\u0203\t\b\2\2\u0203\u0204\3\2\2\2\u0204\u0205\bD\2\2\u0205"
+      + "\u0088\3\2\2\2\16\2\u01c2\u01c9\u01d5\u01d8\u01dc\u01e0\u01e5\u01eb\u01f2" + "\u01fb\u01fd\3\b\2\2";
+  public static final ATN _ATN = new ATNDeserializer().deserialize(_serializedATN.toCharArray());
   static {
     _decisionToDFA = new DFA[_ATN.getNumberOfDecisions()];
     for (int i = 0; i < _ATN.getNumberOfDecisions(); i++) {
       _decisionToDFA[i] = new DFA(_ATN.getDecisionState(i), i);
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.tokens b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.tokens
index c6d1f969f..a475c2939 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.tokens
+++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.tokens
@@ -55,15 +55,16 @@ T__53=54
 T__54=55
 T__55=56
 T__56=57
-INPUT_VARIABLE=58
-PATH_VARIABLE=59
-BOOLEAN_LITERAL=60
-NUMBER_LITERAL=61
-DOUBLE=62
-INT=63
-ZERO=64
-STRING_LITERAL=65
-WS=66
+T__57=58
+INPUT_VARIABLE=59
+PATH_VARIABLE=60
+BOOLEAN_LITERAL=61
+NUMBER_LITERAL=62
+DOUBLE=63
+INT=64
+ZERO=65
+STRING_LITERAL=66
+WS=67
 'select'=1
 '('=2
 ')'=3
@@ -121,4 +122,5 @@ WS=66
 '!='=55
 'ne'=56
 'ieq'=57
-'0'=64
+'ine'=58
+'0'=65
diff --git a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLListener.java b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLListener.java
index 6fddb3633..661d6c0d7 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLListener.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLListener.java
@@ -1,4 +1,4 @@
-// Generated from /home/rob/github/ebean/src/test/resources/EQL.g4 by ANTLR 4.7
+// Generated from C:/dev/ebean/ebean/src/test/resources/EQL.g4 by ANTLR 4.7.1
 package io.ebeaninternal.server.grammer.antlr;
 
 import org.antlr.v4.runtime.tree.ParseTreeListener;
@@ -11,560 +11,640 @@ public interface EQLListener extends ParseTreeListener {
   /**
    * Enter a parse tree produced by {@link EQLParser#select_statement}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterSelect_statement(EQLParser.Select_statementContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#select_statement}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitSelect_statement(EQLParser.Select_statementContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#select_clause}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterSelect_clause(EQLParser.Select_clauseContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#select_clause}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitSelect_clause(EQLParser.Select_clauseContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#distinct}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterDistinct(EQLParser.DistinctContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#distinct}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitDistinct(EQLParser.DistinctContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#fetch_clause}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterFetch_clause(EQLParser.Fetch_clauseContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#fetch_clause}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitFetch_clause(EQLParser.Fetch_clauseContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#where_clause}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterWhere_clause(EQLParser.Where_clauseContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#where_clause}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitWhere_clause(EQLParser.Where_clauseContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#orderby_clause}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterOrderby_clause(EQLParser.Orderby_clauseContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#orderby_clause}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitOrderby_clause(EQLParser.Orderby_clauseContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#orderby_property}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterOrderby_property(EQLParser.Orderby_propertyContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#orderby_property}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitOrderby_property(EQLParser.Orderby_propertyContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#nulls_firstlast}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterNulls_firstlast(EQLParser.Nulls_firstlastContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#nulls_firstlast}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitNulls_firstlast(EQLParser.Nulls_firstlastContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#asc_desc}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterAsc_desc(EQLParser.Asc_descContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#asc_desc}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitAsc_desc(EQLParser.Asc_descContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#limit_clause}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterLimit_clause(EQLParser.Limit_clauseContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#limit_clause}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitLimit_clause(EQLParser.Limit_clauseContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#offset_clause}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterOffset_clause(EQLParser.Offset_clauseContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#offset_clause}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitOffset_clause(EQLParser.Offset_clauseContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#fetch_path}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterFetch_path(EQLParser.Fetch_pathContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#fetch_path}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitFetch_path(EQLParser.Fetch_pathContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#fetch_property_set}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterFetch_property_set(EQLParser.Fetch_property_setContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#fetch_property_set}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitFetch_property_set(EQLParser.Fetch_property_setContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#fetch_property_group}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterFetch_property_group(EQLParser.Fetch_property_groupContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#fetch_property_group}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitFetch_property_group(EQLParser.Fetch_property_groupContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#fetch_property}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterFetch_property(EQLParser.Fetch_propertyContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#fetch_property}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitFetch_property(EQLParser.Fetch_propertyContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#fetch_query_hint}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterFetch_query_hint(EQLParser.Fetch_query_hintContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#fetch_query_hint}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitFetch_query_hint(EQLParser.Fetch_query_hintContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#fetch_lazy_hint}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterFetch_lazy_hint(EQLParser.Fetch_lazy_hintContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#fetch_lazy_hint}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitFetch_lazy_hint(EQLParser.Fetch_lazy_hintContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#fetch_option}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterFetch_option(EQLParser.Fetch_optionContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#fetch_option}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitFetch_option(EQLParser.Fetch_optionContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#fetch_query_option}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterFetch_query_option(EQLParser.Fetch_query_optionContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#fetch_query_option}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitFetch_query_option(EQLParser.Fetch_query_optionContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#fetch_lazy_option}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterFetch_lazy_option(EQLParser.Fetch_lazy_optionContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#fetch_lazy_option}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitFetch_lazy_option(EQLParser.Fetch_lazy_optionContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#fetch_batch_size}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterFetch_batch_size(EQLParser.Fetch_batch_sizeContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#fetch_batch_size}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitFetch_batch_size(EQLParser.Fetch_batch_sizeContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#conditional_expression}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterConditional_expression(EQLParser.Conditional_expressionContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#conditional_expression}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitConditional_expression(EQLParser.Conditional_expressionContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#conditional_term}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterConditional_term(EQLParser.Conditional_termContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#conditional_term}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitConditional_term(EQLParser.Conditional_termContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#conditional_factor}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterConditional_factor(EQLParser.Conditional_factorContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#conditional_factor}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitConditional_factor(EQLParser.Conditional_factorContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#conditional_primary}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterConditional_primary(EQLParser.Conditional_primaryContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#conditional_primary}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitConditional_primary(EQLParser.Conditional_primaryContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#any_expression}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterAny_expression(EQLParser.Any_expressionContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#any_expression}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitAny_expression(EQLParser.Any_expressionContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#in_expression}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterIn_expression(EQLParser.In_expressionContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#in_expression}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitIn_expression(EQLParser.In_expressionContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#in_value}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterIn_value(EQLParser.In_valueContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#in_value}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitIn_value(EQLParser.In_valueContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#between_expression}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterBetween_expression(EQLParser.Between_expressionContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#between_expression}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitBetween_expression(EQLParser.Between_expressionContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#propertyBetween_expression}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterPropertyBetween_expression(EQLParser.PropertyBetween_expressionContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#propertyBetween_expression}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitPropertyBetween_expression(EQLParser.PropertyBetween_expressionContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#isNull_expression}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterIsNull_expression(EQLParser.IsNull_expressionContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#isNull_expression}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitIsNull_expression(EQLParser.IsNull_expressionContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#isNotNull_expression}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterIsNotNull_expression(EQLParser.IsNotNull_expressionContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#isNotNull_expression}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitIsNotNull_expression(EQLParser.IsNotNull_expressionContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#isEmpty_expression}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterIsEmpty_expression(EQLParser.IsEmpty_expressionContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#isEmpty_expression}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitIsEmpty_expression(EQLParser.IsEmpty_expressionContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#isNotEmpty_expression}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterIsNotEmpty_expression(EQLParser.IsNotEmpty_expressionContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#isNotEmpty_expression}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitIsNotEmpty_expression(EQLParser.IsNotEmpty_expressionContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#like_expression}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterLike_expression(EQLParser.Like_expressionContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#like_expression}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitLike_expression(EQLParser.Like_expressionContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#like_op}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterLike_op(EQLParser.Like_opContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#like_op}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitLike_op(EQLParser.Like_opContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#comparison_expression}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterComparison_expression(EQLParser.Comparison_expressionContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#comparison_expression}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitComparison_expression(EQLParser.Comparison_expressionContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#comparison_operator}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterComparison_operator(EQLParser.Comparison_operatorContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#comparison_operator}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitComparison_operator(EQLParser.Comparison_operatorContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#value_expression}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterValue_expression(EQLParser.Value_expressionContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#value_expression}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitValue_expression(EQLParser.Value_expressionContext ctx);
 
   /**
    * Enter a parse tree produced by {@link EQLParser#literal}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void enterLiteral(EQLParser.LiteralContext ctx);
 
   /**
    * Exit a parse tree produced by {@link EQLParser#literal}.
    *
-   * @param ctx the parse tree
+   * @param ctx
+   *          the parse tree
    */
   void exitLiteral(EQLParser.LiteralContext ctx);
-}
+}
\ No newline at end of file
diff --git a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLParser.java b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLParser.java
index 151146b94..67d3d0d5b 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLParser.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLParser.java
@@ -1,93 +1,63 @@
-// Generated from /home/rob/github/ebean/src/test/resources/EQL.g4 by ANTLR 4.7
+// Generated from C:/dev/ebean/ebean/src/test/resources/EQL.g4 by ANTLR 4.7.1
 package io.ebeaninternal.server.grammer.antlr;
 
-import org.antlr.v4.runtime.NoViableAltException;
-import org.antlr.v4.runtime.Parser;
-import org.antlr.v4.runtime.ParserRuleContext;
-import org.antlr.v4.runtime.RecognitionException;
-import org.antlr.v4.runtime.RuntimeMetaData;
-import org.antlr.v4.runtime.Token;
-import org.antlr.v4.runtime.TokenStream;
-import org.antlr.v4.runtime.Vocabulary;
-import org.antlr.v4.runtime.VocabularyImpl;
-import org.antlr.v4.runtime.atn.ATN;
-import org.antlr.v4.runtime.atn.ATNDeserializer;
-import org.antlr.v4.runtime.atn.ParserATNSimulator;
-import org.antlr.v4.runtime.atn.PredictionContextCache;
+import org.antlr.v4.runtime.atn.*;
 import org.antlr.v4.runtime.dfa.DFA;
-import org.antlr.v4.runtime.tree.ParseTreeListener;
-import org.antlr.v4.runtime.tree.TerminalNode;
-
+import org.antlr.v4.runtime.*;
+import org.antlr.v4.runtime.misc.*;
+import org.antlr.v4.runtime.tree.*;
 import java.util.List;
+import java.util.Iterator;
+import java.util.ArrayList;
 
-@SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"})
+@SuppressWarnings({ "all", "warnings", "unchecked", "unused", "cast" })
 public class EQLParser extends Parser {
   static {
-    RuntimeMetaData.checkVersion("4.7", RuntimeMetaData.VERSION);
+    RuntimeMetaData.checkVersion("4.7.1", RuntimeMetaData.VERSION);
   }
 
   protected static final DFA[] _decisionToDFA;
-  protected static final PredictionContextCache _sharedContextCache =
-    new PredictionContextCache();
-  public static final int
-    T__0 = 1, T__1 = 2, T__2 = 3, T__3 = 4, T__4 = 5, T__5 = 6, T__6 = 7, T__7 = 8, T__8 = 9,
-    T__9 = 10, T__10 = 11, T__11 = 12, T__12 = 13, T__13 = 14, T__14 = 15, T__15 = 16, T__16 = 17,
-    T__17 = 18, T__18 = 19, T__19 = 20, T__20 = 21, T__21 = 22, T__22 = 23, T__23 = 24,
-    T__24 = 25, T__25 = 26, T__26 = 27, T__27 = 28, T__28 = 29, T__29 = 30, T__30 = 31,
-    T__31 = 32, T__32 = 33, T__33 = 34, T__34 = 35, T__35 = 36, T__36 = 37, T__37 = 38,
-    T__38 = 39, T__39 = 40, T__40 = 41, T__41 = 42, T__42 = 43, T__43 = 44, T__44 = 45,
-    T__45 = 46, T__46 = 47, T__47 = 48, T__48 = 49, T__49 = 50, T__50 = 51, T__51 = 52,
-    T__52 = 53, T__53 = 54, T__54 = 55, T__55 = 56, T__56 = 57, INPUT_VARIABLE = 58, PATH_VARIABLE = 59,
-    BOOLEAN_LITERAL = 60, NUMBER_LITERAL = 61, DOUBLE = 62, INT = 63, ZERO = 64, STRING_LITERAL = 65,
-    WS = 66;
-  public static final int
-    RULE_select_statement = 0, RULE_select_clause = 1, RULE_distinct = 2,
-    RULE_fetch_clause = 3, RULE_where_clause = 4, RULE_orderby_clause = 5,
-    RULE_orderby_property = 6, RULE_nulls_firstlast = 7, RULE_asc_desc = 8,
-    RULE_limit_clause = 9, RULE_offset_clause = 10, RULE_fetch_path = 11,
-    RULE_fetch_property_set = 12, RULE_fetch_property_group = 13, RULE_fetch_property = 14,
-    RULE_fetch_query_hint = 15, RULE_fetch_lazy_hint = 16, RULE_fetch_option = 17,
-    RULE_fetch_query_option = 18, RULE_fetch_lazy_option = 19, RULE_fetch_batch_size = 20,
-    RULE_conditional_expression = 21, RULE_conditional_term = 22, RULE_conditional_factor = 23,
-    RULE_conditional_primary = 24, RULE_any_expression = 25, RULE_in_expression = 26,
-    RULE_in_value = 27, RULE_between_expression = 28, RULE_propertyBetween_expression = 29,
-    RULE_isNull_expression = 30, RULE_isNotNull_expression = 31, RULE_isEmpty_expression = 32,
-    RULE_isNotEmpty_expression = 33, RULE_like_expression = 34, RULE_like_op = 35,
-    RULE_comparison_expression = 36, RULE_comparison_operator = 37, RULE_value_expression = 38,
-    RULE_literal = 39;
-  public static final String[] ruleNames = {
-    "select_statement", "select_clause", "distinct", "fetch_clause", "where_clause",
-    "orderby_clause", "orderby_property", "nulls_firstlast", "asc_desc", "limit_clause",
-    "offset_clause", "fetch_path", "fetch_property_set", "fetch_property_group",
-    "fetch_property", "fetch_query_hint", "fetch_lazy_hint", "fetch_option",
-    "fetch_query_option", "fetch_lazy_option", "fetch_batch_size", "conditional_expression",
-    "conditional_term", "conditional_factor", "conditional_primary", "any_expression",
-    "in_expression", "in_value", "between_expression", "propertyBetween_expression",
-    "isNull_expression", "isNotNull_expression", "isEmpty_expression", "isNotEmpty_expression",
-    "like_expression", "like_op", "comparison_expression", "comparison_operator",
-    "value_expression", "literal"
-  };
+  protected static final PredictionContextCache _sharedContextCache = new PredictionContextCache();
+  public static final int T__0 = 1, T__1 = 2, T__2 = 3, T__3 = 4, T__4 = 5, T__5 = 6, T__6 = 7, T__7 = 8, T__8 = 9,
+      T__9 = 10, T__10 = 11, T__11 = 12, T__12 = 13, T__13 = 14, T__14 = 15, T__15 = 16, T__16 = 17, T__17 = 18,
+      T__18 = 19, T__19 = 20, T__20 = 21, T__21 = 22, T__22 = 23, T__23 = 24, T__24 = 25, T__25 = 26, T__26 = 27,
+      T__27 = 28, T__28 = 29, T__29 = 30, T__30 = 31, T__31 = 32, T__32 = 33, T__33 = 34, T__34 = 35, T__35 = 36,
+      T__36 = 37, T__37 = 38, T__38 = 39, T__39 = 40, T__40 = 41, T__41 = 42, T__42 = 43, T__43 = 44, T__44 = 45,
+      T__45 = 46, T__46 = 47, T__47 = 48, T__48 = 49, T__49 = 50, T__50 = 51, T__51 = 52, T__52 = 53, T__53 = 54,
+      T__54 = 55, T__55 = 56, T__56 = 57, T__57 = 58, INPUT_VARIABLE = 59, PATH_VARIABLE = 60, BOOLEAN_LITERAL = 61,
+      NUMBER_LITERAL = 62, DOUBLE = 63, INT = 64, ZERO = 65, STRING_LITERAL = 66, WS = 67;
+  public static final int RULE_select_statement = 0, RULE_select_clause = 1, RULE_distinct = 2, RULE_fetch_clause = 3,
+      RULE_where_clause = 4, RULE_orderby_clause = 5, RULE_orderby_property = 6, RULE_nulls_firstlast = 7,
+      RULE_asc_desc = 8, RULE_limit_clause = 9, RULE_offset_clause = 10, RULE_fetch_path = 11,
+      RULE_fetch_property_set = 12, RULE_fetch_property_group = 13, RULE_fetch_property = 14,
+      RULE_fetch_query_hint = 15, RULE_fetch_lazy_hint = 16, RULE_fetch_option = 17, RULE_fetch_query_option = 18,
+      RULE_fetch_lazy_option = 19, RULE_fetch_batch_size = 20, RULE_conditional_expression = 21,
+      RULE_conditional_term = 22, RULE_conditional_factor = 23, RULE_conditional_primary = 24, RULE_any_expression = 25,
+      RULE_in_expression = 26, RULE_in_value = 27, RULE_between_expression = 28, RULE_propertyBetween_expression = 29,
+      RULE_isNull_expression = 30, RULE_isNotNull_expression = 31, RULE_isEmpty_expression = 32,
+      RULE_isNotEmpty_expression = 33, RULE_like_expression = 34, RULE_like_op = 35, RULE_comparison_expression = 36,
+      RULE_comparison_operator = 37, RULE_value_expression = 38, RULE_literal = 39;
+  public static final String[] ruleNames = { "select_statement", "select_clause", "distinct", "fetch_clause",
+      "where_clause", "orderby_clause", "orderby_property", "nulls_firstlast", "asc_desc", "limit_clause",
+      "offset_clause", "fetch_path", "fetch_property_set", "fetch_property_group", "fetch_property", "fetch_query_hint",
+      "fetch_lazy_hint", "fetch_option", "fetch_query_option", "fetch_lazy_option", "fetch_batch_size",
+      "conditional_expression", "conditional_term", "conditional_factor", "conditional_primary", "any_expression",
+      "in_expression", "in_value", "between_expression", "propertyBetween_expression", "isNull_expression",
+      "isNotNull_expression", "isEmpty_expression", "isNotEmpty_expression", "like_expression", "like_op",
+      "comparison_expression", "comparison_operator", "value_expression", "literal" };
 
-  private static final String[] _LITERAL_NAMES = {
-    null, "'select'", "'('", "')'", "'distinct'", "'where'", "'order'", "'by'",
-    "','", "'nulls'", "'first'", "'last'", "'asc'", "'desc'", "'limit'", "'offset'",
-    "'fetch'", "'+'", "'query'", "'lazy'", "'or'", "'and'", "'not'", "'in'",
-    "'between'", "'is'", "'null'", "'isNull'", "'isNotNull'", "'notNull'",
-    "'empty'", "'isEmpty'", "'isNotEmpty'", "'notEmpty'", "'like'", "'ilike'",
-    "'contains'", "'icontains'", "'startsWith'", "'istartsWith'", "'endsWith'",
-    "'iendsWith'", "'='", "'eq'", "'>'", "'gt'", "'>='", "'ge'", "'gte'",
-    "'<'", "'lt'", "'<='", "'le'", "'lte'", "'<>'", "'!='", "'ne'", "'ieq'",
-    null, null, null, null, null, null, "'0'"
-  };
-  private static final String[] _SYMBOLIC_NAMES = {
-    null, null, null, null, null, null, null, null, null, null, null, null,
-    null, null, null, null, null, null, null, null, null, null, null, null,
-    null, null, null, null, null, null, null, null, null, null, null, null,
-    null, null, null, null, null, null, null, null, null, null, null, null,
-    null, null, null, null, null, null, null, null, null, null, "INPUT_VARIABLE",
-    "PATH_VARIABLE", "BOOLEAN_LITERAL", "NUMBER_LITERAL", "DOUBLE", "INT",
-    "ZERO", "STRING_LITERAL", "WS"
-  };
+  private static final String[] _LITERAL_NAMES = { null, "'select'", "'('", "')'", "'distinct'", "'where'", "'order'",
+      "'by'", "','", "'nulls'", "'first'", "'last'", "'asc'", "'desc'", "'limit'", "'offset'", "'fetch'", "'+'",
+      "'query'", "'lazy'", "'or'", "'and'", "'not'", "'in'", "'between'", "'is'", "'null'", "'isNull'", "'isNotNull'",
+      "'notNull'", "'empty'", "'isEmpty'", "'isNotEmpty'", "'notEmpty'", "'like'", "'ilike'", "'contains'",
+      "'icontains'", "'startsWith'", "'istartsWith'", "'endsWith'", "'iendsWith'", "'='", "'eq'", "'>'", "'gt'", "'>='",
+      "'ge'", "'gte'", "'<'", "'lt'", "'<='", "'le'", "'lte'", "'<>'", "'!='", "'ne'", "'ieq'", "'ine'", null, null,
+      null, null, null, null, "'0'" };
+  private static final String[] _SYMBOLIC_NAMES = { null, null, null, null, null, null, null, null, null, null, null,
+      null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
+      null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
+      null, null, null, null, null, null, null, null, null, null, "INPUT_VARIABLE", "PATH_VARIABLE", "BOOLEAN_LITERAL",
+      "NUMBER_LITERAL", "DOUBLE", "INT", "ZERO", "STRING_LITERAL", "WS" };
   public static final Vocabulary VOCABULARY = new VocabularyImpl(_LITERAL_NAMES, _SYMBOLIC_NAMES);
 
   /**
@@ -95,7 +65,6 @@ public class EQLParser extends Parser {
    */
   @Deprecated
   public static final String[] tokenNames;
-
   static {
     tokenNames = new String[_SYMBOLIC_NAMES.length];
     for (int i = 0; i < tokenNames.length; i++) {
@@ -187,12 +156,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterSelect_statement(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterSelect_statement(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitSelect_statement(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitSelect_statement(this);
     }
   }
 
@@ -290,12 +261,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterSelect_clause(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterSelect_clause(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitSelect_clause(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitSelect_clause(this);
     }
   }
 
@@ -347,12 +320,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterDistinct(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterDistinct(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitDistinct(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitDistinct(this);
     }
   }
 
@@ -391,12 +366,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterFetch_clause(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterFetch_clause(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitFetch_clause(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitFetch_clause(this);
     }
   }
 
@@ -435,12 +412,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterWhere_clause(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterWhere_clause(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitWhere_clause(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitWhere_clause(this);
     }
   }
 
@@ -485,12 +464,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterOrderby_clause(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterOrderby_clause(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitOrderby_clause(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitOrderby_clause(this);
     }
   }
 
@@ -558,12 +539,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterOrderby_property(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterOrderby_property(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitOrderby_property(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitOrderby_property(this);
     }
   }
 
@@ -619,12 +602,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterNulls_firstlast(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterNulls_firstlast(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitNulls_firstlast(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitNulls_firstlast(this);
     }
   }
 
@@ -635,23 +620,21 @@ public class EQLParser extends Parser {
       setState(136);
       _errHandler.sync(this);
       switch (getInterpreter().adaptivePredict(_input, 9, _ctx)) {
-        case 1:
-          enterOuterAlt(_localctx, 1);
-        {
-          setState(132);
-          match(T__8);
-          setState(133);
-          match(T__9);
-        }
+      case 1:
+        enterOuterAlt(_localctx, 1); {
+        setState(132);
+        match(T__8);
+        setState(133);
+        match(T__9);
+      }
         break;
-        case 2:
-          enterOuterAlt(_localctx, 2);
-        {
-          setState(134);
-          match(T__8);
-          setState(135);
-          match(T__10);
-        }
+      case 2:
+        enterOuterAlt(_localctx, 2); {
+        setState(134);
+        match(T__8);
+        setState(135);
+        match(T__10);
+      }
         break;
       }
     } catch (RecognitionException re) {
@@ -676,12 +659,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterAsc_desc(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterAsc_desc(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitAsc_desc(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitAsc_desc(this);
     }
   }
 
@@ -697,7 +682,8 @@ public class EQLParser extends Parser {
         if (!(_la == T__11 || _la == T__12)) {
           _errHandler.recoverInline(this);
         } else {
-          if (_input.LA(1) == Token.EOF) matchedEOF = true;
+          if (_input.LA(1) == Token.EOF)
+            matchedEOF = true;
           _errHandler.reportMatch(this);
           consume();
         }
@@ -732,12 +718,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterLimit_clause(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterLimit_clause(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitLimit_clause(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitLimit_clause(this);
     }
   }
 
@@ -789,12 +777,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterOffset_clause(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterOffset_clause(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitOffset_clause(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitOffset_clause(this);
     }
   }
 
@@ -843,12 +833,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterFetch_path(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterFetch_path(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitFetch_path(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitFetch_path(this);
     }
   }
 
@@ -910,12 +902,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterFetch_property_set(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterFetch_property_set(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitFetch_property_set(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitFetch_property_set(this);
     }
   }
 
@@ -962,12 +956,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterFetch_property_group(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterFetch_property_group(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitFetch_property_group(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitFetch_property_group(this);
     }
   }
 
@@ -1031,12 +1027,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterFetch_property(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterFetch_property(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitFetch_property(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitFetch_property(this);
     }
   }
 
@@ -1047,26 +1045,23 @@ public class EQLParser extends Parser {
       setState(171);
       _errHandler.sync(this);
       switch (getInterpreter().adaptivePredict(_input, 14, _ctx)) {
-        case 1:
-          enterOuterAlt(_localctx, 1);
-        {
-          setState(168);
-          match(PATH_VARIABLE);
-        }
+      case 1:
+        enterOuterAlt(_localctx, 1); {
+        setState(168);
+        match(PATH_VARIABLE);
+      }
         break;
-        case 2:
-          enterOuterAlt(_localctx, 2);
-        {
-          setState(169);
-          fetch_query_hint();
-        }
+      case 2:
+        enterOuterAlt(_localctx, 2); {
+        setState(169);
+        fetch_query_hint();
+      }
         break;
-        case 3:
-          enterOuterAlt(_localctx, 3);
-        {
-          setState(170);
-          fetch_lazy_hint();
-        }
+      case 3:
+        enterOuterAlt(_localctx, 3); {
+        setState(170);
+        fetch_lazy_hint();
+      }
         break;
       }
     } catch (RecognitionException re) {
@@ -1095,12 +1090,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterFetch_query_hint(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterFetch_query_hint(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitFetch_query_hint(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitFetch_query_hint(this);
     }
   }
 
@@ -1141,12 +1138,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterFetch_lazy_hint(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterFetch_lazy_hint(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitFetch_lazy_hint(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitFetch_lazy_hint(this);
     }
   }
 
@@ -1191,12 +1190,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterFetch_option(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterFetch_option(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitFetch_option(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitFetch_option(this);
     }
   }
 
@@ -1207,22 +1208,20 @@ public class EQLParser extends Parser {
       setState(181);
       _errHandler.sync(this);
       switch (_input.LA(1)) {
-        case T__17:
-          enterOuterAlt(_localctx, 1);
-        {
-          setState(179);
-          fetch_query_option();
-        }
+      case T__17:
+        enterOuterAlt(_localctx, 1); {
+        setState(179);
+        fetch_query_option();
+      }
         break;
-        case T__18:
-          enterOuterAlt(_localctx, 2);
-        {
-          setState(180);
-          fetch_lazy_option();
-        }
+      case T__18:
+        enterOuterAlt(_localctx, 2); {
+        setState(180);
+        fetch_lazy_option();
+      }
         break;
-        default:
-          throw new NoViableAltException(this);
+      default:
+        throw new NoViableAltException(this);
       }
     } catch (RecognitionException re) {
       _localctx.exception = re;
@@ -1250,12 +1249,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterFetch_query_option(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterFetch_query_option(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitFetch_query_option(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitFetch_query_option(this);
     }
   }
 
@@ -1305,12 +1306,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterFetch_lazy_option(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterFetch_lazy_option(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitFetch_lazy_option(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitFetch_lazy_option(this);
     }
   }
 
@@ -1360,12 +1363,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterFetch_batch_size(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterFetch_batch_size(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitFetch_batch_size(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitFetch_batch_size(this);
     }
   }
 
@@ -1412,12 +1417,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterConditional_expression(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterConditional_expression(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitConditional_expression(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitConditional_expression(this);
     }
   }
 
@@ -1477,12 +1484,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterConditional_term(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterConditional_term(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitConditional_term(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitConditional_term(this);
     }
   }
 
@@ -1538,12 +1547,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterConditional_factor(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterConditional_factor(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitConditional_factor(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitConditional_factor(this);
     }
   }
 
@@ -1597,12 +1608,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterConditional_primary(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterConditional_primary(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitConditional_primary(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitConditional_primary(this);
     }
   }
 
@@ -1613,23 +1626,21 @@ public class EQLParser extends Parser {
       setState(221);
       _errHandler.sync(this);
       switch (getInterpreter().adaptivePredict(_input, 21, _ctx)) {
-        case 1:
-          enterOuterAlt(_localctx, 1);
-        {
-          setState(216);
-          any_expression();
-        }
+      case 1:
+        enterOuterAlt(_localctx, 1); {
+        setState(216);
+        any_expression();
+      }
         break;
-        case 2:
-          enterOuterAlt(_localctx, 2);
-        {
-          setState(217);
-          match(T__1);
-          setState(218);
-          conditional_expression();
-          setState(219);
-          match(T__2);
-        }
+      case 2:
+        enterOuterAlt(_localctx, 2); {
+        setState(217);
+        match(T__1);
+        setState(218);
+        conditional_expression();
+        setState(219);
+        match(T__2);
+      }
         break;
       }
     } catch (RecognitionException re) {
@@ -1694,12 +1705,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterAny_expression(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterAny_expression(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitAny_expression(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitAny_expression(this);
     }
   }
 
@@ -1710,79 +1723,69 @@ public class EQLParser extends Parser {
       setState(236);
       _errHandler.sync(this);
       switch (getInterpreter().adaptivePredict(_input, 22, _ctx)) {
-        case 1:
-          enterOuterAlt(_localctx, 1);
-        {
-          setState(223);
-          comparison_expression();
-        }
+      case 1:
+        enterOuterAlt(_localctx, 1); {
+        setState(223);
+        comparison_expression();
+      }
         break;
-        case 2:
-          enterOuterAlt(_localctx, 2);
-        {
-          setState(224);
-          like_expression();
-        }
+      case 2:
+        enterOuterAlt(_localctx, 2); {
+        setState(224);
+        like_expression();
+      }
         break;
-        case 3:
-          enterOuterAlt(_localctx, 3);
-        {
-          setState(225);
-          between_expression();
-        }
+      case 3:
+        enterOuterAlt(_localctx, 3); {
+        setState(225);
+        between_expression();
+      }
         break;
-        case 4:
-          enterOuterAlt(_localctx, 4);
-        {
-          setState(226);
-          propertyBetween_expression();
-        }
+      case 4:
+        enterOuterAlt(_localctx, 4); {
+        setState(226);
+        propertyBetween_expression();
+      }
         break;
-        case 5:
-          enterOuterAlt(_localctx, 5);
-        {
-          setState(227);
-          in_expression();
-        }
+      case 5:
+        enterOuterAlt(_localctx, 5); {
+        setState(227);
+        in_expression();
+      }
         break;
-        case 6:
-          enterOuterAlt(_localctx, 6);
-        {
-          setState(228);
-          isNull_expression();
-        }
+      case 6:
+        enterOuterAlt(_localctx, 6); {
+        setState(228);
+        isNull_expression();
+      }
         break;
-        case 7:
-          enterOuterAlt(_localctx, 7);
-        {
-          setState(229);
-          isNotNull_expression();
-        }
+      case 7:
+        enterOuterAlt(_localctx, 7); {
+        setState(229);
+        isNotNull_expression();
+      }
         break;
-        case 8:
-          enterOuterAlt(_localctx, 8);
-        {
-          setState(230);
-          isEmpty_expression();
-        }
+      case 8:
+        enterOuterAlt(_localctx, 8); {
+        setState(230);
+        isEmpty_expression();
+      }
         break;
-        case 9:
-          enterOuterAlt(_localctx, 9);
-        {
-          setState(231);
-          isNotEmpty_expression();
-        }
+      case 9:
+        enterOuterAlt(_localctx, 9); {
+        setState(231);
+        isNotEmpty_expression();
+      }
         break;
-        case 10:
-          enterOuterAlt(_localctx, 10);
-        {
-          setState(232);
-          match(T__1);
-          setState(233);
-          any_expression();
-          setState(234);
-          match(T__2);
-        }
+      case 10:
+        enterOuterAlt(_localctx, 10); {
+        setState(232);
+        match(T__1);
+        setState(233);
+        any_expression();
+        setState(234);
+        match(T__2);
+      }
         break;
       }
     } catch (RecognitionException re) {
@@ -1815,12 +1818,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterIn_expression(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterIn_expression(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitIn_expression(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitIn_expression(this);
     }
   }
 
@@ -1871,12 +1876,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterIn_value(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterIn_value(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitIn_value(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitIn_value(this);
     }
   }
 
@@ -1888,42 +1895,40 @@ public class EQLParser extends Parser {
       setState(254);
       _errHandler.sync(this);
       switch (_input.LA(1)) {
-        case INPUT_VARIABLE:
-          enterOuterAlt(_localctx, 1);
-        {
-          setState(242);
-          match(INPUT_VARIABLE);
-        }
+      case INPUT_VARIABLE:
+        enterOuterAlt(_localctx, 1); {
+        setState(242);
+        match(INPUT_VARIABLE);
+      }
         break;
-        case T__1:
-          enterOuterAlt(_localctx, 2);
-        {
-          setState(243);
-          match(T__1);
-          setState(244);
-          value_expression();
-          setState(249);
+      case T__1:
+        enterOuterAlt(_localctx, 2); {
+        setState(243);
+        match(T__1);
+        setState(244);
+        value_expression();
+        setState(249);
+        _errHandler.sync(this);
+        _la = _input.LA(1);
+        while (_la == T__7) {
+          {
+            {
+              setState(245);
+              match(T__7);
+              setState(246);
+              value_expression();
+            }
+          }
+          setState(251);
           _errHandler.sync(this);
           _la = _input.LA(1);
-          while (_la == T__7) {
-            {
-              {
-                setState(245);
-                match(T__7);
-                setState(246);
-                value_expression();
-              }
-            }
-            setState(251);
-            _errHandler.sync(this);
-            _la = _input.LA(1);
-          }
-          setState(252);
-          match(T__2);
         }
+        setState(252);
+        match(T__2);
+      }
         break;
-        default:
-          throw new NoViableAltException(this);
+      default:
+        throw new NoViableAltException(this);
       }
     } catch (RecognitionException re) {
       _localctx.exception = re;
@@ -1959,12 +1964,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterBetween_expression(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterBetween_expression(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitBetween_expression(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitBetween_expression(this);
     }
   }
 
@@ -2019,12 +2026,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterPropertyBetween_expression(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterPropertyBetween_expression(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitPropertyBetween_expression(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitPropertyBetween_expression(this);
     }
   }
 
@@ -2071,12 +2080,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterIsNull_expression(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterIsNull_expression(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitIsNull_expression(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitIsNull_expression(this);
     }
   }
 
@@ -2087,25 +2098,23 @@ public class EQLParser extends Parser {
       setState(273);
       _errHandler.sync(this);
       switch (getInterpreter().adaptivePredict(_input, 25, _ctx)) {
-        case 1:
-          enterOuterAlt(_localctx, 1);
-        {
-          setState(268);
-          match(PATH_VARIABLE);
-          setState(269);
-          match(T__24);
-          setState(270);
-          match(T__25);
-        }
+      case 1:
+        enterOuterAlt(_localctx, 1); {
+        setState(268);
+        match(PATH_VARIABLE);
+        setState(269);
+        match(T__24);
+        setState(270);
+        match(T__25);
+      }
         break;
-        case 2:
-          enterOuterAlt(_localctx, 2);
-        {
-          setState(271);
-          match(PATH_VARIABLE);
-          setState(272);
-          match(T__26);
-        }
+      case 2:
+        enterOuterAlt(_localctx, 2); {
+        setState(271);
+        match(PATH_VARIABLE);
+        setState(272);
+        match(T__26);
+      }
         break;
       }
     } catch (RecognitionException re) {
@@ -2134,12 +2143,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterIsNotNull_expression(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterIsNotNull_expression(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitIsNotNull_expression(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitIsNotNull_expression(this);
     }
   }
 
@@ -2150,36 +2161,33 @@ public class EQLParser extends Parser {
       setState(283);
       _errHandler.sync(this);
       switch (getInterpreter().adaptivePredict(_input, 26, _ctx)) {
-        case 1:
-          enterOuterAlt(_localctx, 1);
-        {
-          setState(275);
-          match(PATH_VARIABLE);
-          setState(276);
-          match(T__24);
-          setState(277);
-          match(T__21);
-          setState(278);
-          match(T__25);
-        }
+      case 1:
+        enterOuterAlt(_localctx, 1); {
+        setState(275);
+        match(PATH_VARIABLE);
+        setState(276);
+        match(T__24);
+        setState(277);
+        match(T__21);
+        setState(278);
+        match(T__25);
+      }
         break;
-        case 2:
-          enterOuterAlt(_localctx, 2);
-        {
-          setState(279);
-          match(PATH_VARIABLE);
-          setState(280);
-          match(T__27);
-        }
+      case 2:
+        enterOuterAlt(_localctx, 2); {
+        setState(279);
+        match(PATH_VARIABLE);
+        setState(280);
+        match(T__27);
+      }
         break;
-        case 3:
-          enterOuterAlt(_localctx, 3);
-        {
-          setState(281);
-          match(PATH_VARIABLE);
-          setState(282);
-          match(T__28);
-        }
+      case 3:
+        enterOuterAlt(_localctx, 3); {
+        setState(281);
+        match(PATH_VARIABLE);
+        setState(282);
+        match(T__28);
+      }
         break;
       }
     } catch (RecognitionException re) {
@@ -2208,12 +2216,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterIsEmpty_expression(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterIsEmpty_expression(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitIsEmpty_expression(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitIsEmpty_expression(this);
     }
   }
 
@@ -2224,25 +2234,23 @@ public class EQLParser extends Parser {
       setState(290);
       _errHandler.sync(this);
       switch (getInterpreter().adaptivePredict(_input, 27, _ctx)) {
-        case 1:
-          enterOuterAlt(_localctx, 1);
-        {
-          setState(285);
-          match(PATH_VARIABLE);
-          setState(286);
-          match(T__24);
-          setState(287);
-          match(T__29);
-        }
+      case 1:
+        enterOuterAlt(_localctx, 1); {
+        setState(285);
+        match(PATH_VARIABLE);
+        setState(286);
+        match(T__24);
+        setState(287);
+        match(T__29);
+      }
         break;
-        case 2:
-          enterOuterAlt(_localctx, 2);
-        {
-          setState(288);
-          match(PATH_VARIABLE);
-          setState(289);
-          match(T__30);
-        }
+      case 2:
+        enterOuterAlt(_localctx, 2); {
+        setState(288);
+        match(PATH_VARIABLE);
+        setState(289);
+        match(T__30);
+      }
         break;
       }
     } catch (RecognitionException re) {
@@ -2271,12 +2279,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterIsNotEmpty_expression(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterIsNotEmpty_expression(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitIsNotEmpty_expression(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitIsNotEmpty_expression(this);
     }
   }
 
@@ -2287,36 +2297,33 @@ public class EQLParser extends Parser {
       setState(300);
       _errHandler.sync(this);
       switch (getInterpreter().adaptivePredict(_input, 28, _ctx)) {
-        case 1:
-          enterOuterAlt(_localctx, 1);
-        {
-          setState(292);
-          match(PATH_VARIABLE);
-          setState(293);
-          match(T__24);
-          setState(294);
-          match(T__21);
-          setState(295);
-          match(T__29);
-        }
+      case 1:
+        enterOuterAlt(_localctx, 1); {
+        setState(292);
+        match(PATH_VARIABLE);
+        setState(293);
+        match(T__24);
+        setState(294);
+        match(T__21);
+        setState(295);
+        match(T__29);
+      }
         break;
-        case 2:
-          enterOuterAlt(_localctx, 2);
-        {
-          setState(296);
-          match(PATH_VARIABLE);
-          setState(297);
-          match(T__31);
-        }
+      case 2:
+        enterOuterAlt(_localctx, 2); {
+        setState(296);
+        match(PATH_VARIABLE);
+        setState(297);
+        match(T__31);
+      }
         break;
-        case 3:
-          enterOuterAlt(_localctx, 3);
-        {
-          setState(298);
-          match(PATH_VARIABLE);
-          setState(299);
-          match(T__32);
-        }
+      case 3:
+        enterOuterAlt(_localctx, 3); {
+        setState(298);
+        match(PATH_VARIABLE);
+        setState(299);
+        match(T__32);
+      }
         break;
       }
     } catch (RecognitionException re) {
@@ -2353,12 +2360,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterLike_expression(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterLike_expression(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitLike_expression(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitLike_expression(this);
     }
   }
 
@@ -2397,12 +2406,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterLike_op(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterLike_op(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitLike_op(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitLike_op(this);
     }
   }
 
@@ -2415,10 +2426,12 @@ public class EQLParser extends Parser {
       {
         setState(306);
         _la = _input.LA(1);
-        if (!((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << T__33) | (1L << T__34) | (1L << T__35) | (1L << T__36) | (1L << T__37) | (1L << T__38) | (1L << T__39) | (1L << T__40))) != 0))) {
+        if (!((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << T__33) | (1L << T__34) | (1L << T__35) | (1L << T__36)
+            | (1L << T__37) | (1L << T__38) | (1L << T__39) | (1L << T__40))) != 0))) {
           _errHandler.recoverInline(this);
         } else {
-          if (_input.LA(1) == Token.EOF) matchedEOF = true;
+          if (_input.LA(1) == Token.EOF)
+            matchedEOF = true;
           _errHandler.reportMatch(this);
           consume();
         }
@@ -2457,12 +2470,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterComparison_expression(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterComparison_expression(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitComparison_expression(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitComparison_expression(this);
     }
   }
 
@@ -2473,33 +2488,31 @@ public class EQLParser extends Parser {
       setState(316);
       _errHandler.sync(this);
       switch (_input.LA(1)) {
-        case PATH_VARIABLE:
-          enterOuterAlt(_localctx, 1);
-        {
-          setState(308);
-          match(PATH_VARIABLE);
-          setState(309);
-          comparison_operator();
-          setState(310);
-          value_expression();
-        }
+      case PATH_VARIABLE:
+        enterOuterAlt(_localctx, 1); {
+        setState(308);
+        match(PATH_VARIABLE);
+        setState(309);
+        comparison_operator();
+        setState(310);
+        value_expression();
+      }
         break;
-        case INPUT_VARIABLE:
-        case BOOLEAN_LITERAL:
-        case NUMBER_LITERAL:
-        case STRING_LITERAL:
-          enterOuterAlt(_localctx, 2);
-        {
-          setState(312);
-          value_expression();
-          setState(313);
-          comparison_operator();
-          setState(314);
-          match(PATH_VARIABLE);
-        }
+      case INPUT_VARIABLE:
+      case BOOLEAN_LITERAL:
+      case NUMBER_LITERAL:
+      case STRING_LITERAL:
+        enterOuterAlt(_localctx, 2); {
+        setState(312);
+        value_expression();
+        setState(313);
+        comparison_operator();
+        setState(314);
+        match(PATH_VARIABLE);
+      }
         break;
-        default:
-          throw new NoViableAltException(this);
+      default:
+        throw new NoViableAltException(this);
       }
     } catch (RecognitionException re) {
       _localctx.exception = re;
@@ -2523,12 +2536,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterComparison_operator(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterComparison_operator(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitComparison_operator(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitComparison_operator(this);
     }
   }
 
@@ -2541,10 +2556,14 @@ public class EQLParser extends Parser {
       {
         setState(318);
         _la = _input.LA(1);
-        if (!((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << T__41) | (1L << T__42) | (1L << T__43) | (1L << T__44) | (1L << T__45) | (1L << T__46) | (1L << T__47) | (1L << T__48) | (1L << T__49) | (1L << T__50) | (1L << T__51) | (1L << T__52) | (1L << T__53) | (1L << T__54) | (1L << T__55) | (1L << T__56))) != 0))) {
+        if (!((((_la) & ~0x3f) == 0 && ((1L << _la)
+            & ((1L << T__41) | (1L << T__42) | (1L << T__43) | (1L << T__44) | (1L << T__45) | (1L << T__46)
+                | (1L << T__47) | (1L << T__48) | (1L << T__49) | (1L << T__50) | (1L << T__51) | (1L << T__52)
+                | (1L << T__53) | (1L << T__54) | (1L << T__55) | (1L << T__56) | (1L << T__57))) != 0))) {
           _errHandler.recoverInline(this);
         } else {
-          if (_input.LA(1) == Token.EOF) matchedEOF = true;
+          if (_input.LA(1) == Token.EOF)
+            matchedEOF = true;
           _errHandler.reportMatch(this);
           consume();
         }
@@ -2579,12 +2598,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterValue_expression(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterValue_expression(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitValue_expression(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitValue_expression(this);
     }
   }
 
@@ -2595,24 +2616,22 @@ public class EQLParser extends Parser {
       setState(322);
       _errHandler.sync(this);
       switch (_input.LA(1)) {
-        case BOOLEAN_LITERAL:
-        case NUMBER_LITERAL:
-        case STRING_LITERAL:
-          enterOuterAlt(_localctx, 1);
-        {
-          setState(320);
-          literal();
-        }
+      case BOOLEAN_LITERAL:
+      case NUMBER_LITERAL:
+      case STRING_LITERAL:
+        enterOuterAlt(_localctx, 1); {
+        setState(320);
+        literal();
+      }
         break;
-        case INPUT_VARIABLE:
-          enterOuterAlt(_localctx, 2);
-        {
-          setState(321);
-          match(INPUT_VARIABLE);
-        }
+      case INPUT_VARIABLE:
+        enterOuterAlt(_localctx, 2); {
+        setState(321);
+        match(INPUT_VARIABLE);
+      }
         break;
-        default:
-          throw new NoViableAltException(this);
+      default:
+        throw new NoViableAltException(this);
       }
     } catch (RecognitionException re) {
       _localctx.exception = re;
@@ -2648,12 +2667,14 @@ public class EQLParser extends Parser {
 
     @Override
     public void enterRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).enterLiteral(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).enterLiteral(this);
     }
 
     @Override
     public void exitRule(ParseTreeListener listener) {
-      if (listener instanceof EQLListener) ((EQLListener) listener).exitLiteral(this);
+      if (listener instanceof EQLListener)
+        ((EQLListener) listener).exitLiteral(this);
     }
   }
 
@@ -2666,10 +2687,12 @@ public class EQLParser extends Parser {
       {
         setState(324);
         _la = _input.LA(1);
-        if (!(((((_la - 60)) & ~0x3f) == 0 && ((1L << (_la - 60)) & ((1L << (BOOLEAN_LITERAL - 60)) | (1L << (NUMBER_LITERAL - 60)) | (1L << (STRING_LITERAL - 60)))) != 0))) {
+        if (!(((((_la - 61)) & ~0x3f) == 0 && ((1L << (_la - 61)) & ((1L << (BOOLEAN_LITERAL - 61))
+            | (1L << (NUMBER_LITERAL - 61)) | (1L << (STRING_LITERAL - 61)))) != 0))) {
           _errHandler.recoverInline(this);
         } else {
-          if (_input.LA(1) == Token.EOF) matchedEOF = true;
+          if (_input.LA(1) == Token.EOF)
+            matchedEOF = true;
           _errHandler.reportMatch(this);
           consume();
         }
@@ -2684,123 +2707,119 @@ public class EQLParser extends Parser {
     return _localctx;
   }
 
-  public static final String _serializedATN =
-    "\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\3D\u0149\4\2\t\2\4" +
-      "\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\4\n\t\n\4\13\t" +
-      "\13\4\f\t\f\4\r\t\r\4\16\t\16\4\17\t\17\4\20\t\20\4\21\t\21\4\22\t\22" +
-      "\4\23\t\23\4\24\t\24\4\25\t\25\4\26\t\26\4\27\t\27\4\30\t\30\4\31\t\31" +
-      "\4\32\t\32\4\33\t\33\4\34\t\34\4\35\t\35\4\36\t\36\4\37\t\37\4 \t \4!" +
-      "\t!\4\"\t\"\4#\t#\4$\t$\4%\t%\4&\t&\4\'\t\'\4(\t(\4)\t)\3\2\5\2T\n\2\3" +
-      "\2\7\2W\n\2\f\2\16\2Z\13\2\3\2\5\2]\n\2\3\2\5\2`\n\2\3\2\5\2c\n\2\3\2" +
-      "\3\2\3\3\3\3\5\3i\n\3\3\3\3\3\3\3\3\3\3\4\3\4\3\5\3\5\3\6\3\6\3\6\3\7" +
-      "\3\7\3\7\3\7\3\7\7\7{\n\7\f\7\16\7~\13\7\3\b\3\b\5\b\u0082\n\b\3\b\5\b" +
-      "\u0085\n\b\3\t\3\t\3\t\3\t\5\t\u008b\n\t\3\n\3\n\3\13\3\13\3\13\5\13\u0092" +
-      "\n\13\3\f\3\f\3\f\3\r\3\r\5\r\u0099\n\r\3\r\3\r\5\r\u009d\n\r\3\16\3\16" +
-      "\3\16\3\16\3\17\3\17\3\17\7\17\u00a6\n\17\f\17\16\17\u00a9\13\17\3\20" +
-      "\3\20\3\20\5\20\u00ae\n\20\3\21\3\21\3\21\3\22\3\22\3\22\3\23\3\23\5\23" +
-      "\u00b8\n\23\3\24\3\24\5\24\u00bc\n\24\3\25\3\25\5\25\u00c0\n\25\3\26\3" +
-      "\26\3\26\3\26\3\27\3\27\3\27\7\27\u00c9\n\27\f\27\16\27\u00cc\13\27\3" +
-      "\30\3\30\3\30\7\30\u00d1\n\30\f\30\16\30\u00d4\13\30\3\31\5\31\u00d7\n" +
-      "\31\3\31\3\31\3\32\3\32\3\32\3\32\3\32\5\32\u00e0\n\32\3\33\3\33\3\33" +
-      "\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\5\33\u00ef\n\33\3\34" +
-      "\3\34\3\34\3\34\3\35\3\35\3\35\3\35\3\35\7\35\u00fa\n\35\f\35\16\35\u00fd" +
-      "\13\35\3\35\3\35\5\35\u0101\n\35\3\36\3\36\3\36\3\36\3\36\3\36\3\37\3" +
-      "\37\3\37\3\37\3\37\3\37\3 \3 \3 \3 \3 \5 \u0114\n \3!\3!\3!\3!\3!\3!\3" +
-      "!\3!\5!\u011e\n!\3\"\3\"\3\"\3\"\3\"\5\"\u0125\n\"\3#\3#\3#\3#\3#\3#\3" +
-      "#\3#\5#\u012f\n#\3$\3$\3$\3$\3%\3%\3&\3&\3&\3&\3&\3&\3&\3&\5&\u013f\n" +
-      "&\3\'\3\'\3(\3(\5(\u0145\n(\3)\3)\3)\2\2*\2\4\6\b\n\f\16\20\22\24\26\30" +
-      "\32\34\36 \"$&(*,.\60\62\64\668:<>@BDFHJLNP\2\6\3\2\16\17\3\2$+\3\2,;" +
-      "\4\2>?CC\2\u014a\2S\3\2\2\2\4f\3\2\2\2\6n\3\2\2\2\bp\3\2\2\2\nr\3\2\2" +
-      "\2\fu\3\2\2\2\16\177\3\2\2\2\20\u008a\3\2\2\2\22\u008c\3\2\2\2\24\u008e" +
-      "\3\2\2\2\26\u0093\3\2\2\2\30\u0096\3\2\2\2\32\u009e\3\2\2\2\34\u00a2\3" +
-      "\2\2\2\36\u00ad\3\2\2\2 \u00af\3\2\2\2\"\u00b2\3\2\2\2$\u00b7\3\2\2\2" +
-      "&\u00b9\3\2\2\2(\u00bd\3\2\2\2*\u00c1\3\2\2\2,\u00c5\3\2\2\2.\u00cd\3" +
-      "\2\2\2\60\u00d6\3\2\2\2\62\u00df\3\2\2\2\64\u00ee\3\2\2\2\66\u00f0\3\2" +
-      "\2\28\u0100\3\2\2\2:\u0102\3\2\2\2<\u0108\3\2\2\2>\u0113\3\2\2\2@\u011d" +
-      "\3\2\2\2B\u0124\3\2\2\2D\u012e\3\2\2\2F\u0130\3\2\2\2H\u0134\3\2\2\2J" +
-      "\u013e\3\2\2\2L\u0140\3\2\2\2N\u0144\3\2\2\2P\u0146\3\2\2\2RT\5\4\3\2" +
-      "SR\3\2\2\2ST\3\2\2\2TX\3\2\2\2UW\5\b\5\2VU\3\2\2\2WZ\3\2\2\2XV\3\2\2\2" +
-      "XY\3\2\2\2Y\\\3\2\2\2ZX\3\2\2\2[]\5\n\6\2\\[\3\2\2\2\\]\3\2\2\2]_\3\2" +
-      "\2\2^`\5\f\7\2_^\3\2\2\2_`\3\2\2\2`b\3\2\2\2ac\5\24\13\2ba\3\2\2\2bc\3" +
-      "\2\2\2cd\3\2\2\2de\7\2\2\3e\3\3\2\2\2fh\7\3\2\2gi\5\6\4\2hg\3\2\2\2hi" +
-      "\3\2\2\2ij\3\2\2\2jk\7\4\2\2kl\5\34\17\2lm\7\5\2\2m\5\3\2\2\2no\7\6\2" +
-      "\2o\7\3\2\2\2pq\5\30\r\2q\t\3\2\2\2rs\7\7\2\2st\5,\27\2t\13\3\2\2\2uv" +
-      "\7\b\2\2vw\7\t\2\2w|\5\16\b\2xy\7\n\2\2y{\5\16\b\2zx\3\2\2\2{~\3\2\2\2" +
-      "|z\3\2\2\2|}\3\2\2\2}\r\3\2\2\2~|\3\2\2\2\177\u0081\7=\2\2\u0080\u0082" +
-      "\5\22\n\2\u0081\u0080\3\2\2\2\u0081\u0082\3\2\2\2\u0082\u0084\3\2\2\2" +
-      "\u0083\u0085\5\20\t\2\u0084\u0083\3\2\2\2\u0084\u0085\3\2\2\2\u0085\17" +
-      "\3\2\2\2\u0086\u0087\7\13\2\2\u0087\u008b\7\f\2\2\u0088\u0089\7\13\2\2" +
-      "\u0089\u008b\7\r\2\2\u008a\u0086\3\2\2\2\u008a\u0088\3\2\2\2\u008b\21" +
-      "\3\2\2\2\u008c\u008d\t\2\2\2\u008d\23\3\2\2\2\u008e\u008f\7\20\2\2\u008f" +
-      "\u0091\7?\2\2\u0090\u0092\5\26\f\2\u0091\u0090\3\2\2\2\u0091\u0092\3\2" +
-      "\2\2\u0092\25\3\2\2\2\u0093\u0094\7\21\2\2\u0094\u0095\7?\2\2\u0095\27" +
-      "\3\2\2\2\u0096\u0098\7\22\2\2\u0097\u0099\5$\23\2\u0098\u0097\3\2\2\2" +
-      "\u0098\u0099\3\2\2\2\u0099\u009a\3\2\2\2\u009a\u009c\7=\2\2\u009b\u009d" +
-      "\5\32\16\2\u009c\u009b\3\2\2\2\u009c\u009d\3\2\2\2\u009d\31\3\2\2\2\u009e" +
-      "\u009f\7\4\2\2\u009f\u00a0\5\34\17\2\u00a0\u00a1\7\5\2\2\u00a1\33\3\2" +
-      "\2\2\u00a2\u00a7\5\36\20\2\u00a3\u00a4\7\n\2\2\u00a4\u00a6\5\36\20\2\u00a5" +
-      "\u00a3\3\2\2\2\u00a6\u00a9\3\2\2\2\u00a7\u00a5\3\2\2\2\u00a7\u00a8\3\2" +
-      "\2\2\u00a8\35\3\2\2\2\u00a9\u00a7\3\2\2\2\u00aa\u00ae\7=\2\2\u00ab\u00ae" +
-      "\5 \21\2\u00ac\u00ae\5\"\22\2\u00ad\u00aa\3\2\2\2\u00ad\u00ab\3\2\2\2" +
-      "\u00ad\u00ac\3\2\2\2\u00ae\37\3\2\2\2\u00af\u00b0\7\23\2\2\u00b0\u00b1" +
-      "\5&\24\2\u00b1!\3\2\2\2\u00b2\u00b3\7\23\2\2\u00b3\u00b4\5(\25\2\u00b4" +
-      "#\3\2\2\2\u00b5\u00b8\5&\24\2\u00b6\u00b8\5(\25\2\u00b7\u00b5\3\2\2\2" +
-      "\u00b7\u00b6\3\2\2\2\u00b8%\3\2\2\2\u00b9\u00bb\7\24\2\2\u00ba\u00bc\5" +
-      "*\26\2\u00bb\u00ba\3\2\2\2\u00bb\u00bc\3\2\2\2\u00bc\'\3\2\2\2\u00bd\u00bf" +
-      "\7\25\2\2\u00be\u00c0\5*\26\2\u00bf\u00be\3\2\2\2\u00bf\u00c0\3\2\2\2" +
-      "\u00c0)\3\2\2\2\u00c1\u00c2\7\4\2\2\u00c2\u00c3\7?\2\2\u00c3\u00c4\7\5" +
-      "\2\2\u00c4+\3\2\2\2\u00c5\u00ca\5.\30\2\u00c6\u00c7\7\26\2\2\u00c7\u00c9" +
-      "\5.\30\2\u00c8\u00c6\3\2\2\2\u00c9\u00cc\3\2\2\2\u00ca\u00c8\3\2\2\2\u00ca" +
-      "\u00cb\3\2\2\2\u00cb-\3\2\2\2\u00cc\u00ca\3\2\2\2\u00cd\u00d2\5\60\31" +
-      "\2\u00ce\u00cf\7\27\2\2\u00cf\u00d1\5\60\31\2\u00d0\u00ce\3\2\2\2\u00d1" +
-      "\u00d4\3\2\2\2\u00d2\u00d0\3\2\2\2\u00d2\u00d3\3\2\2\2\u00d3/\3\2\2\2" +
-      "\u00d4\u00d2\3\2\2\2\u00d5\u00d7\7\30\2\2\u00d6\u00d5\3\2\2\2\u00d6\u00d7" +
-      "\3\2\2\2\u00d7\u00d8\3\2\2\2\u00d8\u00d9\5\62\32\2\u00d9\61\3\2\2\2\u00da" +
-      "\u00e0\5\64\33\2\u00db\u00dc\7\4\2\2\u00dc\u00dd\5,\27\2\u00dd\u00de\7" +
-      "\5\2\2\u00de\u00e0\3\2\2\2\u00df\u00da\3\2\2\2\u00df\u00db\3\2\2\2\u00e0" +
-      "\63\3\2\2\2\u00e1\u00ef\5J&\2\u00e2\u00ef\5F$\2\u00e3\u00ef\5:\36\2\u00e4" +
-      "\u00ef\5<\37\2\u00e5\u00ef\5\66\34\2\u00e6\u00ef\5> \2\u00e7\u00ef\5@" +
-      "!\2\u00e8\u00ef\5B\"\2\u00e9\u00ef\5D#\2\u00ea\u00eb\7\4\2\2\u00eb\u00ec" +
-      "\5\64\33\2\u00ec\u00ed\7\5\2\2\u00ed\u00ef\3\2\2\2\u00ee\u00e1\3\2\2\2" +
-      "\u00ee\u00e2\3\2\2\2\u00ee\u00e3\3\2\2\2\u00ee\u00e4\3\2\2\2\u00ee\u00e5" +
-      "\3\2\2\2\u00ee\u00e6\3\2\2\2\u00ee\u00e7\3\2\2\2\u00ee\u00e8\3\2\2\2\u00ee" +
-      "\u00e9\3\2\2\2\u00ee\u00ea\3\2\2\2\u00ef\65\3\2\2\2\u00f0\u00f1\7=\2\2" +
-      "\u00f1\u00f2\7\31\2\2\u00f2\u00f3\58\35\2\u00f3\67\3\2\2\2\u00f4\u0101" +
-      "\7<\2\2\u00f5\u00f6\7\4\2\2\u00f6\u00fb\5N(\2\u00f7\u00f8\7\n\2\2\u00f8" +
-      "\u00fa\5N(\2\u00f9\u00f7\3\2\2\2\u00fa\u00fd\3\2\2\2\u00fb\u00f9\3\2\2" +
-      "\2\u00fb\u00fc\3\2\2\2\u00fc\u00fe\3\2\2\2\u00fd\u00fb\3\2\2\2\u00fe\u00ff" +
-      "\7\5\2\2\u00ff\u0101\3\2\2\2\u0100\u00f4\3\2\2\2\u0100\u00f5\3\2\2\2\u0101" +
-      "9\3\2\2\2\u0102\u0103\7=\2\2\u0103\u0104\7\32\2\2\u0104\u0105\5N(\2\u0105" +
-      "\u0106\7\27\2\2\u0106\u0107\5N(\2\u0107;\3\2\2\2\u0108\u0109\5N(\2\u0109" +
-      "\u010a\7\32\2\2\u010a\u010b\7=\2\2\u010b\u010c\7\27\2\2\u010c\u010d\7" +
-      "=\2\2\u010d=\3\2\2\2\u010e\u010f\7=\2\2\u010f\u0110\7\33\2\2\u0110\u0114" +
-      "\7\34\2\2\u0111\u0112\7=\2\2\u0112\u0114\7\35\2\2\u0113\u010e\3\2\2\2" +
-      "\u0113\u0111\3\2\2\2\u0114?\3\2\2\2\u0115\u0116\7=\2\2\u0116\u0117\7\33" +
-      "\2\2\u0117\u0118\7\30\2\2\u0118\u011e\7\34\2\2\u0119\u011a\7=\2\2\u011a" +
-      "\u011e\7\36\2\2\u011b\u011c\7=\2\2\u011c\u011e\7\37\2\2\u011d\u0115\3" +
-      "\2\2\2\u011d\u0119\3\2\2\2\u011d\u011b\3\2\2\2\u011eA\3\2\2\2\u011f\u0120" +
-      "\7=\2\2\u0120\u0121\7\33\2\2\u0121\u0125\7 \2\2\u0122\u0123\7=\2\2\u0123" +
-      "\u0125\7!\2\2\u0124\u011f\3\2\2\2\u0124\u0122\3\2\2\2\u0125C\3\2\2\2\u0126" +
-      "\u0127\7=\2\2\u0127\u0128\7\33\2\2\u0128\u0129\7\30\2\2\u0129\u012f\7" +
-      " \2\2\u012a\u012b\7=\2\2\u012b\u012f\7\"\2\2\u012c\u012d\7=\2\2\u012d" +
-      "\u012f\7#\2\2\u012e\u0126\3\2\2\2\u012e\u012a\3\2\2\2\u012e\u012c\3\2" +
-      "\2\2\u012fE\3\2\2\2\u0130\u0131\7=\2\2\u0131\u0132\5H%\2\u0132\u0133\5" +
-      "N(\2\u0133G\3\2\2\2\u0134\u0135\t\3\2\2\u0135I\3\2\2\2\u0136\u0137\7=" +
-      "\2\2\u0137\u0138\5L\'\2\u0138\u0139\5N(\2\u0139\u013f\3\2\2\2\u013a\u013b" +
-      "\5N(\2\u013b\u013c\5L\'\2\u013c\u013d\7=\2\2\u013d\u013f\3\2\2\2\u013e" +
-      "\u0136\3\2\2\2\u013e\u013a\3\2\2\2\u013fK\3\2\2\2\u0140\u0141\t\4\2\2" +
-      "\u0141M\3\2\2\2\u0142\u0145\5P)\2\u0143\u0145\7<\2\2\u0144\u0142\3\2\2" +
-      "\2\u0144\u0143\3\2\2\2\u0145O\3\2\2\2\u0146\u0147\t\5\2\2\u0147Q\3\2\2" +
-      "\2!SX\\_bh|\u0081\u0084\u008a\u0091\u0098\u009c\u00a7\u00ad\u00b7\u00bb" +
-      "\u00bf\u00ca\u00d2\u00d6\u00df\u00ee\u00fb\u0100\u0113\u011d\u0124\u012e" +
-      "\u013e\u0144";
-  public static final ATN _ATN =
-    new ATNDeserializer().deserialize(_serializedATN.toCharArray());
-
+  public static final String _serializedATN = "\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\3E\u0149\4\2\t\2\4"
+      + "\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\4\n\t\n\4\13\t"
+      + "\13\4\f\t\f\4\r\t\r\4\16\t\16\4\17\t\17\4\20\t\20\4\21\t\21\4\22\t\22"
+      + "\4\23\t\23\4\24\t\24\4\25\t\25\4\26\t\26\4\27\t\27\4\30\t\30\4\31\t\31"
+      + "\4\32\t\32\4\33\t\33\4\34\t\34\4\35\t\35\4\36\t\36\4\37\t\37\4 \t \4!"
+      + "\t!\4\"\t\"\4#\t#\4$\t$\4%\t%\4&\t&\4\'\t\'\4(\t(\4)\t)\3\2\5\2T\n\2\3"
+      + "\2\7\2W\n\2\f\2\16\2Z\13\2\3\2\5\2]\n\2\3\2\5\2`\n\2\3\2\5\2c\n\2\3\2"
+      + "\3\2\3\3\3\3\5\3i\n\3\3\3\3\3\3\3\3\3\3\4\3\4\3\5\3\5\3\6\3\6\3\6\3\7"
+      + "\3\7\3\7\3\7\3\7\7\7{\n\7\f\7\16\7~\13\7\3\b\3\b\5\b\u0082\n\b\3\b\5\b"
+      + "\u0085\n\b\3\t\3\t\3\t\3\t\5\t\u008b\n\t\3\n\3\n\3\13\3\13\3\13\5\13\u0092"
+      + "\n\13\3\f\3\f\3\f\3\r\3\r\5\r\u0099\n\r\3\r\3\r\5\r\u009d\n\r\3\16\3\16"
+      + "\3\16\3\16\3\17\3\17\3\17\7\17\u00a6\n\17\f\17\16\17\u00a9\13\17\3\20"
+      + "\3\20\3\20\5\20\u00ae\n\20\3\21\3\21\3\21\3\22\3\22\3\22\3\23\3\23\5\23"
+      + "\u00b8\n\23\3\24\3\24\5\24\u00bc\n\24\3\25\3\25\5\25\u00c0\n\25\3\26\3"
+      + "\26\3\26\3\26\3\27\3\27\3\27\7\27\u00c9\n\27\f\27\16\27\u00cc\13\27\3"
+      + "\30\3\30\3\30\7\30\u00d1\n\30\f\30\16\30\u00d4\13\30\3\31\5\31\u00d7\n"
+      + "\31\3\31\3\31\3\32\3\32\3\32\3\32\3\32\5\32\u00e0\n\32\3\33\3\33\3\33"
+      + "\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\3\33\5\33\u00ef\n\33\3\34"
+      + "\3\34\3\34\3\34\3\35\3\35\3\35\3\35\3\35\7\35\u00fa\n\35\f\35\16\35\u00fd"
+      + "\13\35\3\35\3\35\5\35\u0101\n\35\3\36\3\36\3\36\3\36\3\36\3\36\3\37\3"
+      + "\37\3\37\3\37\3\37\3\37\3 \3 \3 \3 \3 \5 \u0114\n \3!\3!\3!\3!\3!\3!\3"
+      + "!\3!\5!\u011e\n!\3\"\3\"\3\"\3\"\3\"\5\"\u0125\n\"\3#\3#\3#\3#\3#\3#\3"
+      + "#\3#\5#\u012f\n#\3$\3$\3$\3$\3%\3%\3&\3&\3&\3&\3&\3&\3&\3&\5&\u013f\n"
+      + "&\3\'\3\'\3(\3(\5(\u0145\n(\3)\3)\3)\2\2*\2\4\6\b\n\f\16\20\22\24\26\30"
+      + "\32\34\36 \"$&(*,.\60\62\64\668:<>@BDFHJLNP\2\6\3\2\16\17\3\2$+\3\2,<"
+      + "\4\2?@DD\2\u014a\2S\3\2\2\2\4f\3\2\2\2\6n\3\2\2\2\bp\3\2\2\2\nr\3\2\2"
+      + "\2\fu\3\2\2\2\16\177\3\2\2\2\20\u008a\3\2\2\2\22\u008c\3\2\2\2\24\u008e"
+      + "\3\2\2\2\26\u0093\3\2\2\2\30\u0096\3\2\2\2\32\u009e\3\2\2\2\34\u00a2\3"
+      + "\2\2\2\36\u00ad\3\2\2\2 \u00af\3\2\2\2\"\u00b2\3\2\2\2$\u00b7\3\2\2\2"
+      + "&\u00b9\3\2\2\2(\u00bd\3\2\2\2*\u00c1\3\2\2\2,\u00c5\3\2\2\2.\u00cd\3"
+      + "\2\2\2\60\u00d6\3\2\2\2\62\u00df\3\2\2\2\64\u00ee\3\2\2\2\66\u00f0\3\2"
+      + "\2\28\u0100\3\2\2\2:\u0102\3\2\2\2<\u0108\3\2\2\2>\u0113\3\2\2\2@\u011d"
+      + "\3\2\2\2B\u0124\3\2\2\2D\u012e\3\2\2\2F\u0130\3\2\2\2H\u0134\3\2\2\2J"
+      + "\u013e\3\2\2\2L\u0140\3\2\2\2N\u0144\3\2\2\2P\u0146\3\2\2\2RT\5\4\3\2"
+      + "SR\3\2\2\2ST\3\2\2\2TX\3\2\2\2UW\5\b\5\2VU\3\2\2\2WZ\3\2\2\2XV\3\2\2\2"
+      + "XY\3\2\2\2Y\\\3\2\2\2ZX\3\2\2\2[]\5\n\6\2\\[\3\2\2\2\\]\3\2\2\2]_\3\2"
+      + "\2\2^`\5\f\7\2_^\3\2\2\2_`\3\2\2\2`b\3\2\2\2ac\5\24\13\2ba\3\2\2\2bc\3"
+      + "\2\2\2cd\3\2\2\2de\7\2\2\3e\3\3\2\2\2fh\7\3\2\2gi\5\6\4\2hg\3\2\2\2hi"
+      + "\3\2\2\2ij\3\2\2\2jk\7\4\2\2kl\5\34\17\2lm\7\5\2\2m\5\3\2\2\2no\7\6\2"
+      + "\2o\7\3\2\2\2pq\5\30\r\2q\t\3\2\2\2rs\7\7\2\2st\5,\27\2t\13\3\2\2\2uv"
+      + "\7\b\2\2vw\7\t\2\2w|\5\16\b\2xy\7\n\2\2y{\5\16\b\2zx\3\2\2\2{~\3\2\2\2"
+      + "|z\3\2\2\2|}\3\2\2\2}\r\3\2\2\2~|\3\2\2\2\177\u0081\7>\2\2\u0080\u0082"
+      + "\5\22\n\2\u0081\u0080\3\2\2\2\u0081\u0082\3\2\2\2\u0082\u0084\3\2\2\2"
+      + "\u0083\u0085\5\20\t\2\u0084\u0083\3\2\2\2\u0084\u0085\3\2\2\2\u0085\17"
+      + "\3\2\2\2\u0086\u0087\7\13\2\2\u0087\u008b\7\f\2\2\u0088\u0089\7\13\2\2"
+      + "\u0089\u008b\7\r\2\2\u008a\u0086\3\2\2\2\u008a\u0088\3\2\2\2\u008b\21"
+      + "\3\2\2\2\u008c\u008d\t\2\2\2\u008d\23\3\2\2\2\u008e\u008f\7\20\2\2\u008f"
+      + "\u0091\7@\2\2\u0090\u0092\5\26\f\2\u0091\u0090\3\2\2\2\u0091\u0092\3\2"
+      + "\2\2\u0092\25\3\2\2\2\u0093\u0094\7\21\2\2\u0094\u0095\7@\2\2\u0095\27"
+      + "\3\2\2\2\u0096\u0098\7\22\2\2\u0097\u0099\5$\23\2\u0098\u0097\3\2\2\2"
+      + "\u0098\u0099\3\2\2\2\u0099\u009a\3\2\2\2\u009a\u009c\7>\2\2\u009b\u009d"
+      + "\5\32\16\2\u009c\u009b\3\2\2\2\u009c\u009d\3\2\2\2\u009d\31\3\2\2\2\u009e"
+      + "\u009f\7\4\2\2\u009f\u00a0\5\34\17\2\u00a0\u00a1\7\5\2\2\u00a1\33\3\2"
+      + "\2\2\u00a2\u00a7\5\36\20\2\u00a3\u00a4\7\n\2\2\u00a4\u00a6\5\36\20\2\u00a5"
+      + "\u00a3\3\2\2\2\u00a6\u00a9\3\2\2\2\u00a7\u00a5\3\2\2\2\u00a7\u00a8\3\2"
+      + "\2\2\u00a8\35\3\2\2\2\u00a9\u00a7\3\2\2\2\u00aa\u00ae\7>\2\2\u00ab\u00ae"
+      + "\5 \21\2\u00ac\u00ae\5\"\22\2\u00ad\u00aa\3\2\2\2\u00ad\u00ab\3\2\2\2"
+      + "\u00ad\u00ac\3\2\2\2\u00ae\37\3\2\2\2\u00af\u00b0\7\23\2\2\u00b0\u00b1"
+      + "\5&\24\2\u00b1!\3\2\2\2\u00b2\u00b3\7\23\2\2\u00b3\u00b4\5(\25\2\u00b4"
+      + "#\3\2\2\2\u00b5\u00b8\5&\24\2\u00b6\u00b8\5(\25\2\u00b7\u00b5\3\2\2\2"
+      + "\u00b7\u00b6\3\2\2\2\u00b8%\3\2\2\2\u00b9\u00bb\7\24\2\2\u00ba\u00bc\5"
+      + "*\26\2\u00bb\u00ba\3\2\2\2\u00bb\u00bc\3\2\2\2\u00bc\'\3\2\2\2\u00bd\u00bf"
+      + "\7\25\2\2\u00be\u00c0\5*\26\2\u00bf\u00be\3\2\2\2\u00bf\u00c0\3\2\2\2"
+      + "\u00c0)\3\2\2\2\u00c1\u00c2\7\4\2\2\u00c2\u00c3\7@\2\2\u00c3\u00c4\7\5"
+      + "\2\2\u00c4+\3\2\2\2\u00c5\u00ca\5.\30\2\u00c6\u00c7\7\26\2\2\u00c7\u00c9"
+      + "\5.\30\2\u00c8\u00c6\3\2\2\2\u00c9\u00cc\3\2\2\2\u00ca\u00c8\3\2\2\2\u00ca"
+      + "\u00cb\3\2\2\2\u00cb-\3\2\2\2\u00cc\u00ca\3\2\2\2\u00cd\u00d2\5\60\31"
+      + "\2\u00ce\u00cf\7\27\2\2\u00cf\u00d1\5\60\31\2\u00d0\u00ce\3\2\2\2\u00d1"
+      + "\u00d4\3\2\2\2\u00d2\u00d0\3\2\2\2\u00d2\u00d3\3\2\2\2\u00d3/\3\2\2\2"
+      + "\u00d4\u00d2\3\2\2\2\u00d5\u00d7\7\30\2\2\u00d6\u00d5\3\2\2\2\u00d6\u00d7"
+      + "\3\2\2\2\u00d7\u00d8\3\2\2\2\u00d8\u00d9\5\62\32\2\u00d9\61\3\2\2\2\u00da"
+      + "\u00e0\5\64\33\2\u00db\u00dc\7\4\2\2\u00dc\u00dd\5,\27\2\u00dd\u00de\7"
+      + "\5\2\2\u00de\u00e0\3\2\2\2\u00df\u00da\3\2\2\2\u00df\u00db\3\2\2\2\u00e0"
+      + "\63\3\2\2\2\u00e1\u00ef\5J&\2\u00e2\u00ef\5F$\2\u00e3\u00ef\5:\36\2\u00e4"
+      + "\u00ef\5<\37\2\u00e5\u00ef\5\66\34\2\u00e6\u00ef\5> \2\u00e7\u00ef\5@"
+      + "!\2\u00e8\u00ef\5B\"\2\u00e9\u00ef\5D#\2\u00ea\u00eb\7\4\2\2\u00eb\u00ec"
+      + "\5\64\33\2\u00ec\u00ed\7\5\2\2\u00ed\u00ef\3\2\2\2\u00ee\u00e1\3\2\2\2"
+      + "\u00ee\u00e2\3\2\2\2\u00ee\u00e3\3\2\2\2\u00ee\u00e4\3\2\2\2\u00ee\u00e5"
+      + "\3\2\2\2\u00ee\u00e6\3\2\2\2\u00ee\u00e7\3\2\2\2\u00ee\u00e8\3\2\2\2\u00ee"
+      + "\u00e9\3\2\2\2\u00ee\u00ea\3\2\2\2\u00ef\65\3\2\2\2\u00f0\u00f1\7>\2\2"
+      + "\u00f1\u00f2\7\31\2\2\u00f2\u00f3\58\35\2\u00f3\67\3\2\2\2\u00f4\u0101"
+      + "\7=\2\2\u00f5\u00f6\7\4\2\2\u00f6\u00fb\5N(\2\u00f7\u00f8\7\n\2\2\u00f8"
+      + "\u00fa\5N(\2\u00f9\u00f7\3\2\2\2\u00fa\u00fd\3\2\2\2\u00fb\u00f9\3\2\2"
+      + "\2\u00fb\u00fc\3\2\2\2\u00fc\u00fe\3\2\2\2\u00fd\u00fb\3\2\2\2\u00fe\u00ff"
+      + "\7\5\2\2\u00ff\u0101\3\2\2\2\u0100\u00f4\3\2\2\2\u0100\u00f5\3\2\2\2\u0101"
+      + "9\3\2\2\2\u0102\u0103\7>\2\2\u0103\u0104\7\32\2\2\u0104\u0105\5N(\2\u0105"
+      + "\u0106\7\27\2\2\u0106\u0107\5N(\2\u0107;\3\2\2\2\u0108\u0109\5N(\2\u0109"
+      + "\u010a\7\32\2\2\u010a\u010b\7>\2\2\u010b\u010c\7\27\2\2\u010c\u010d\7"
+      + ">\2\2\u010d=\3\2\2\2\u010e\u010f\7>\2\2\u010f\u0110\7\33\2\2\u0110\u0114"
+      + "\7\34\2\2\u0111\u0112\7>\2\2\u0112\u0114\7\35\2\2\u0113\u010e\3\2\2\2"
+      + "\u0113\u0111\3\2\2\2\u0114?\3\2\2\2\u0115\u0116\7>\2\2\u0116\u0117\7\33"
+      + "\2\2\u0117\u0118\7\30\2\2\u0118\u011e\7\34\2\2\u0119\u011a\7>\2\2\u011a"
+      + "\u011e\7\36\2\2\u011b\u011c\7>\2\2\u011c\u011e\7\37\2\2\u011d\u0115\3"
+      + "\2\2\2\u011d\u0119\3\2\2\2\u011d\u011b\3\2\2\2\u011eA\3\2\2\2\u011f\u0120"
+      + "\7>\2\2\u0120\u0121\7\33\2\2\u0121\u0125\7 \2\2\u0122\u0123\7>\2\2\u0123"
+      + "\u0125\7!\2\2\u0124\u011f\3\2\2\2\u0124\u0122\3\2\2\2\u0125C\3\2\2\2\u0126"
+      + "\u0127\7>\2\2\u0127\u0128\7\33\2\2\u0128\u0129\7\30\2\2\u0129\u012f\7"
+      + " \2\2\u012a\u012b\7>\2\2\u012b\u012f\7\"\2\2\u012c\u012d\7>\2\2\u012d"
+      + "\u012f\7#\2\2\u012e\u0126\3\2\2\2\u012e\u012a\3\2\2\2\u012e\u012c\3\2"
+      + "\2\2\u012fE\3\2\2\2\u0130\u0131\7>\2\2\u0131\u0132\5H%\2\u0132\u0133\5"
+      + "N(\2\u0133G\3\2\2\2\u0134\u0135\t\3\2\2\u0135I\3\2\2\2\u0136\u0137\7>"
+      + "\2\2\u0137\u0138\5L\'\2\u0138\u0139\5N(\2\u0139\u013f\3\2\2\2\u013a\u013b"
+      + "\5N(\2\u013b\u013c\5L\'\2\u013c\u013d\7>\2\2\u013d\u013f\3\2\2\2\u013e"
+      + "\u0136\3\2\2\2\u013e\u013a\3\2\2\2\u013fK\3\2\2\2\u0140\u0141\t\4\2\2"
+      + "\u0141M\3\2\2\2\u0142\u0145\5P)\2\u0143\u0145\7=\2\2\u0144\u0142\3\2\2"
+      + "\2\u0144\u0143\3\2\2\2\u0145O\3\2\2\2\u0146\u0147\t\5\2\2\u0147Q\3\2\2"
+      + "\2!SX\\_bh|\u0081\u0084\u008a\u0091\u0098\u009c\u00a7\u00ad\u00b7\u00bb"
+      + "\u00bf\u00ca\u00d2\u00d6\u00df\u00ee\u00fb\u0100\u0113\u011d\u0124\u012e" + "\u013e\u0144";
+  public static final ATN _ATN = new ATNDeserializer().deserialize(_serializedATN.toCharArray());
   static {
     _decisionToDFA = new DFA[_ATN.getNumberOfDecisions()];
     for (int i = 0; i < _ATN.getNumberOfDecisions(); i++) {
       _decisionToDFA[i] = new DFA(_ATN.getDecisionState(i), i);
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/test/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpressionTest.java b/src/test/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpressionTest.java
index 3e9e0ca45..4e1423cda 100644
--- a/src/test/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpressionTest.java
+++ b/src/test/java/io/ebeaninternal/server/expression/CaseInsensitiveEqualExpressionTest.java
@@ -8,7 +8,7 @@ import static org.assertj.core.api.StrictAssertions.assertThat;
 public class CaseInsensitiveEqualExpressionTest extends BaseExpressionTest {
 
   CaseInsensitiveEqualExpression exp(String propName, String value) {
-    return new CaseInsensitiveEqualExpression(propName, value);
+    return new CaseInsensitiveEqualExpression(propName, value, false);
   }
 
   @Test
diff --git a/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionFactoryTest.java b/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionFactoryTest.java
index 9244d229e..a7ad85e6b 100644
--- a/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionFactoryTest.java
+++ b/src/test/java/io/ebeaninternal/server/expression/DefaultExpressionFactoryTest.java
@@ -1,6 +1,8 @@
 package io.ebeaninternal.server.expression;
 
 import io.ebean.Expression;
+import io.ebeaninternal.api.SpiExpression;
+
 import org.junit.Test;
 
 import static org.assertj.core.api.StrictAssertions.assertThat;
@@ -8,6 +10,12 @@ import static org.assertj.core.api.StrictAssertions.assertThat;
 
 public class DefaultExpressionFactoryTest {
 
+  private String toQueryPlanHash(Expression expression) {
+    StringBuilder sb = new StringBuilder();
+    ((SpiExpression)expression).queryPlanHash(sb);
+    return sb.toString();
+
+  }
   @Test
   public void testLowerILike() throws Exception {
 
@@ -30,6 +38,7 @@ public class DefaultExpressionFactoryTest {
     DefaultExpressionFactory factory = new DefaultExpressionFactory(false, false);
     Expression expression = factory.eq("name", null);
     assertThat(expression).isInstanceOf(NullExpression.class);
+    assertThat(toQueryPlanHash(expression)).isEqualTo("Null[name]");
   }
 
   @Test
@@ -38,14 +47,24 @@ public class DefaultExpressionFactoryTest {
     DefaultExpressionFactory factory = new DefaultExpressionFactory(false, false);
     Expression expression = factory.ne("name", null);
     assertThat(expression).isInstanceOf(NullExpression.class);
+    assertThat(toQueryPlanHash(expression)).isEqualTo("NotNull[name]");
   }
-
   @Test
   public void testIeq() throws Exception {
 
     DefaultExpressionFactory factory = new DefaultExpressionFactory(false, false);
     Expression expression = factory.ieq("name", null);
     assertThat(expression).isInstanceOf(NullExpression.class);
+    assertThat(toQueryPlanHash(expression)).isEqualTo("Null[name]");
+  }
+
+  @Test
+  public void testIne() throws Exception {
+
+    DefaultExpressionFactory factory = new DefaultExpressionFactory(false, false);
+    Expression expression = factory.ine("name", null);
+    assertThat(expression).isInstanceOf(NullExpression.class);
+    assertThat(toQueryPlanHash(expression)).isEqualTo("NotNull[name]");
   }
 
   @Test
diff --git a/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java b/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java
index 2ccb97ce5..29ad43ae4 100644
--- a/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java
+++ b/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java
@@ -83,6 +83,15 @@ public class EqlParserTest extends BaseTestCase {
     assertThat(query.getGeneratedSql()).contains("where lower(t0.name) =?");
   }
 
+  @Test
+  public void where_ine() {
+
+    Query<Customer> query = parse("where name ine 'Rob'");
+    query.findList();
+
+    assertThat(query.getGeneratedSql()).contains("where lower(t0.name) !=?");
+  }
+
   @Test
   public void where_ieq_reverse() {
 
@@ -91,6 +100,15 @@ public class EqlParserTest extends BaseTestCase {
     assertThat(query.getGeneratedSql()).contains("where lower(t0.name) =?");
   }
 
+  @Test
+  public void where_ine_reverse() {
+
+    Query<Customer> query = parse("where 'Rob' ine name");
+    query.findList();
+
+    assertThat(query.getGeneratedSql()).contains("where lower(t0.name) !=?");
+  }
+
   @Test
   public void where_eq2() {
 
diff --git a/src/test/java/org/tests/query/TestQueryFilterCaseInsensitive.java b/src/test/java/org/tests/query/TestQueryFilterCaseInsensitive.java
new file mode 100644
index 000000000..8ddf3f181
--- /dev/null
+++ b/src/test/java/org/tests/query/TestQueryFilterCaseInsensitive.java
@@ -0,0 +1,116 @@
+package org.tests.query;
+
+import io.ebean.BaseTestCase;
+import io.ebean.Ebean;
+import org.tests.model.basic.Customer;
+import org.tests.model.basic.ResetBasicData;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestQueryFilterCaseInsensitive extends BaseTestCase {
+
+  @BeforeClass
+  public static void setup() {
+    ResetBasicData.reset();
+  }
+
+  @Test
+  public void testEq() {
+
+    // Note: this test uses only customer#1..#4
+
+    List<Customer> customers = Ebean.find(Customer.class).where()
+        .eq("name", "ROB") // case match
+        .le("id", 4).findList();
+
+    assertThat(customers).isEmpty();
+
+    customers = Ebean.find(Customer.class).where()
+        .ieq("name", "ROB") // case insensitive match
+        .le("id", 4).findList();
+
+    assertThat(customers).hasSize(1);
+  }
+
+  @Test
+  public void testNe() {
+    List<Customer> customers = Ebean.find(Customer.class).where()
+        .ne("name", "ROB") // case match
+        .le("id", 4).findList();
+
+    assertThat(customers).hasSize(4);
+
+    customers = Ebean.find(Customer.class).where()
+        .ine("name", "ROB") // case insensitive match
+        .le("id", 4).findList();
+
+    assertThat(customers).hasSize(3);
+
+  }
+
+  @Test
+  public void testLike() {
+    List<Customer> customers = Ebean.find(Customer.class).where()
+        .like("name", "%O%") // case match
+        .le("id", 4).findList();
+
+    assertThat(customers).isEmpty();
+
+    customers = Ebean.find(Customer.class).where()
+        .ilike("name", "%O%") // case insensitive match
+        .le("id", 4).findList();
+
+    assertThat(customers).hasSize(4); // Rob / Fiona / Cust No address / NocCust
+  }
+
+  @Test
+  public void testContains() {
+    List<Customer> customers = Ebean.find(Customer.class).where()
+        .contains("name", "O") // case match
+        .le("id", 4).findList();
+
+    assertThat(customers).isEmpty();
+
+    customers = Ebean.find(Customer.class).where()
+        .icontains("name", "O") // case insensitive match
+        .le("id", 4).findList();
+
+    assertThat(customers).hasSize(4); // Rob / Fiona / Cust No address / NocCust
+
+  }
+
+  @Test
+  public void testStartsWith() {
+    List<Customer> customers = Ebean.find(Customer.class).where()
+        .startsWith("name", "RO") // case match
+        .le("id", 4).findList();
+
+    assertThat(customers).isEmpty();
+
+    customers = Ebean.find(Customer.class).where()
+        .istartsWith("name", "RO") // case insensitive match
+        .le("id", 4).findList();
+
+    assertThat(customers).hasSize(1);
+  }
+
+  @Test
+  public void testEndsWith() {
+    List<Customer> customers = Ebean.find(Customer.class).where()
+        .endsWith("name", "OB") // case match
+        .le("id", 4).findList();
+
+    assertThat(customers).isEmpty();
+
+    customers = Ebean.find(Customer.class).where()
+        .iendsWith("name", "OB") // case insensitive match
+        .le("id", 4).findList();
+
+    assertThat(customers).hasSize(1);
+  }
+
+}
diff --git a/src/test/resources/EQL.g4 b/src/test/resources/EQL.g4
index 4e021172b..30aa67ae0 100644
--- a/src/test/resources/EQL.g4
+++ b/src/test/resources/EQL.g4
@@ -181,7 +181,8 @@ comparison_operator
    | '<'  | 'lt'
    | '<=' | 'le' | 'lte'
    | '<>' | '!=' | 'ne'
-   | 'ieq'
+   | 'ieq' 
+   | 'ine'
    ;
 
 value_expression