diff --git a/pom.xml b/pom.xml
index 8291abdc3..bf454b12d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -136,7 +136,7 @@
org.antlr
antlr4-runtime
- 4.6
+ 4.7.1
diff --git a/src/main/java/io/ebeaninternal/server/grammer/EqlParser.java b/src/main/java/io/ebeaninternal/server/grammer/EqlParser.java
index f4e8a184d..b65b8ada5 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/EqlParser.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/EqlParser.java
@@ -3,8 +3,8 @@ package io.ebeaninternal.server.grammer;
import io.ebeaninternal.api.SpiQuery;
import io.ebeaninternal.server.grammer.antlr.EQLLexer;
import io.ebeaninternal.server.grammer.antlr.EQLParser;
-import org.antlr.v4.runtime.ANTLRInputStream;
import org.antlr.v4.runtime.BaseErrorListener;
+import org.antlr.v4.runtime.CharStreams;
import org.antlr.v4.runtime.CommonTokenStream;
import org.antlr.v4.runtime.RecognitionException;
import org.antlr.v4.runtime.Recognizer;
@@ -22,7 +22,7 @@ public class EqlParser {
*/
public static void parse(String raw, SpiQuery query) {
- EQLLexer lexer = new EQLLexer(new ANTLRInputStream(raw));
+ EQLLexer lexer = new EQLLexer(CharStreams.fromString(raw));
CommonTokenStream tokens = new CommonTokenStream(lexer);
EQLParser parser = new EQLParser(tokens);
parser.addErrorListener(errorListener);
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 639967cb0..e368fb917 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.6
+// Generated from /home/rob/github/ebean/src/test/resources/EQL.g4 by ANTLR 4.7
package io.ebeaninternal.server.grammer.antlr;
import org.antlr.v4.runtime.ParserRuleContext;
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 040ef83e1..b0c5076a4 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLLexer.java
@@ -1,9 +1,8 @@
-// Generated from /home/rob/github/ebean/src/test/resources/EQL.g4 by ANTLR 4.6
+// Generated from /home/rob/github/ebean/src/test/resources/EQL.g4 by ANTLR 4.7
package io.ebeaninternal.server.grammer.antlr;
import org.antlr.v4.runtime.CharStream;
import org.antlr.v4.runtime.Lexer;
-import org.antlr.v4.runtime.RecognitionException;
import org.antlr.v4.runtime.RuntimeMetaData;
import org.antlr.v4.runtime.Vocabulary;
import org.antlr.v4.runtime.VocabularyImpl;
@@ -16,7 +15,7 @@ import org.antlr.v4.runtime.dfa.DFA;
@SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"})
public class EQLLexer extends Lexer {
static {
- RuntimeMetaData.checkVersion("4.6", RuntimeMetaData.VERSION);
+ RuntimeMetaData.checkVersion("4.7", RuntimeMetaData.VERSION);
}
protected static final DFA[] _decisionToDFA;
@@ -33,6 +32,10 @@ public class EQLLexer extends Lexer {
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"
+ };
+
public static String[] modeNames = {
"DEFAULT_MODE"
};
@@ -104,12 +107,6 @@ public class EQLLexer extends Lexer {
}
- @Override
- public void recover(RecognitionException e) {
- throw new RuntimeException("Error in grammer - " + e.getMessage());
- }
-
-
public EQLLexer(CharStream input) {
super(input);
_interp = new LexerATNSimulator(this, _ATN, _decisionToDFA, _sharedContextCache);
@@ -130,6 +127,11 @@ public class EQLLexer extends Lexer {
return _serializedATN;
}
+ @Override
+ public String[] getChannelNames() {
+ return channelNames;
+ }
+
@Override
public String[] getModeNames() {
return modeNames;
@@ -141,7 +143,7 @@ public class EQLLexer extends Lexer {
}
public static final String _serializedATN =
- "\3\u0430\ud6d1\u8206\uad2d\u4417\uaef1\u8d80\uaadd\2D\u0200\b\1\4\2\t" +
+ "\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" +
@@ -177,22 +179,22 @@ public class EQLLexer extends Lexer {
";\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{?}@\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\"\"" +
- "\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\2" +
- "G\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\2" +
- "m\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" +
+ "\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" +
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 7d8e0738b..6fddb3633 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.6
+// Generated from /home/rob/github/ebean/src/test/resources/EQL.g4 by ANTLR 4.7
package io.ebeaninternal.server.grammer.antlr;
import org.antlr.v4.runtime.tree.ParseTreeListener;
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 57b0a573c..151146b94 100644
--- a/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLParser.java
+++ b/src/main/java/io/ebeaninternal/server/grammer/antlr/EQLParser.java
@@ -1,4 +1,4 @@
-// Generated from /home/rob/github/ebean/src/test/resources/EQL.g4 by ANTLR 4.6
+// Generated from /home/rob/github/ebean/src/test/resources/EQL.g4 by ANTLR 4.7
package io.ebeaninternal.server.grammer.antlr;
import org.antlr.v4.runtime.NoViableAltException;
@@ -23,7 +23,7 @@ import java.util.List;
@SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"})
public class EQLParser extends Parser {
static {
- RuntimeMetaData.checkVersion("4.6", RuntimeMetaData.VERSION);
+ RuntimeMetaData.checkVersion("4.7", RuntimeMetaData.VERSION);
}
protected static final DFA[] _decisionToDFA;
@@ -142,18 +142,16 @@ public class EQLParser extends Parser {
return _ATN;
}
-
-// @Override
-// public void reportError(RecognitionException e) {
-// throw new RuntimeException("Error in grammer - " + e.getMessage());
-// }
-
public EQLParser(TokenStream input) {
super(input);
_interp = new ParserATNSimulator(this, _ATN, _decisionToDFA, _sharedContextCache);
}
public static class Select_statementContext extends ParserRuleContext {
+ public TerminalNode EOF() {
+ return getToken(EQLParser.EOF, 0);
+ }
+
public Select_clauseContext select_clause() {
return getRuleContext(Select_clauseContext.class, 0);
}
@@ -259,6 +257,8 @@ public class EQLParser extends Parser {
}
}
+ setState(98);
+ match(EOF);
}
} catch (RecognitionException re) {
_localctx.exception = re;
@@ -306,23 +306,23 @@ public class EQLParser extends Parser {
try {
enterOuterAlt(_localctx, 1);
{
- setState(98);
- match(T__0);
setState(100);
+ match(T__0);
+ setState(102);
_errHandler.sync(this);
_la = _input.LA(1);
if (_la == T__3) {
{
- setState(99);
+ setState(101);
distinct();
}
}
- setState(102);
- match(T__1);
- setState(103);
- fetch_property_group();
setState(104);
+ match(T__1);
+ setState(105);
+ fetch_property_group();
+ setState(106);
match(T__2);
}
} catch (RecognitionException re) {
@@ -362,7 +362,7 @@ public class EQLParser extends Parser {
try {
enterOuterAlt(_localctx, 1);
{
- setState(106);
+ setState(108);
match(T__3);
}
} catch (RecognitionException re) {
@@ -406,7 +406,7 @@ public class EQLParser extends Parser {
try {
enterOuterAlt(_localctx, 1);
{
- setState(108);
+ setState(110);
fetch_path();
}
} catch (RecognitionException re) {
@@ -450,9 +450,9 @@ public class EQLParser extends Parser {
try {
enterOuterAlt(_localctx, 1);
{
- setState(110);
+ setState(112);
match(T__4);
- setState(111);
+ setState(113);
conditional_expression();
}
} catch (RecognitionException re) {
@@ -501,25 +501,25 @@ public class EQLParser extends Parser {
try {
enterOuterAlt(_localctx, 1);
{
- setState(113);
- match(T__5);
- setState(114);
- match(T__6);
setState(115);
+ match(T__5);
+ setState(116);
+ match(T__6);
+ setState(117);
orderby_property();
- setState(120);
+ setState(122);
_errHandler.sync(this);
_la = _input.LA(1);
while (_la == T__7) {
{
{
- setState(116);
+ setState(118);
match(T__7);
- setState(117);
+ setState(119);
orderby_property();
}
}
- setState(122);
+ setState(124);
_errHandler.sync(this);
_la = _input.LA(1);
}
@@ -574,24 +574,24 @@ public class EQLParser extends Parser {
try {
enterOuterAlt(_localctx, 1);
{
- setState(123);
- match(PATH_VARIABLE);
setState(125);
+ match(PATH_VARIABLE);
+ setState(127);
_errHandler.sync(this);
_la = _input.LA(1);
if (_la == T__11 || _la == T__12) {
{
- setState(124);
+ setState(126);
asc_desc();
}
}
- setState(128);
+ setState(130);
_errHandler.sync(this);
_la = _input.LA(1);
if (_la == T__8) {
{
- setState(127);
+ setState(129);
nulls_firstlast();
}
}
@@ -632,24 +632,24 @@ public class EQLParser extends Parser {
Nulls_firstlastContext _localctx = new Nulls_firstlastContext(_ctx, getState());
enterRule(_localctx, 14, RULE_nulls_firstlast);
try {
- setState(134);
+ setState(136);
_errHandler.sync(this);
switch (getInterpreter().adaptivePredict(_input, 9, _ctx)) {
case 1:
enterOuterAlt(_localctx, 1);
{
- setState(130);
+ setState(132);
match(T__8);
- setState(131);
+ setState(133);
match(T__9);
}
break;
case 2:
enterOuterAlt(_localctx, 2);
{
- setState(132);
+ setState(134);
match(T__8);
- setState(133);
+ setState(135);
match(T__10);
}
break;
@@ -692,7 +692,7 @@ public class EQLParser extends Parser {
try {
enterOuterAlt(_localctx, 1);
{
- setState(136);
+ setState(138);
_la = _input.LA(1);
if (!(_la == T__11 || _la == T__12)) {
_errHandler.recoverInline(this);
@@ -748,16 +748,16 @@ public class EQLParser extends Parser {
try {
enterOuterAlt(_localctx, 1);
{
- setState(138);
+ setState(140);
match(T__13);
- setState(139);
- match(NUMBER_LITERAL);
setState(141);
+ match(NUMBER_LITERAL);
+ setState(143);
_errHandler.sync(this);
_la = _input.LA(1);
if (_la == T__14) {
{
- setState(140);
+ setState(142);
offset_clause();
}
}
@@ -804,9 +804,9 @@ public class EQLParser extends Parser {
try {
enterOuterAlt(_localctx, 1);
{
- setState(143);
+ setState(145);
match(T__14);
- setState(144);
+ setState(146);
match(NUMBER_LITERAL);
}
} catch (RecognitionException re) {
@@ -859,26 +859,26 @@ public class EQLParser extends Parser {
try {
enterOuterAlt(_localctx, 1);
{
- setState(146);
- match(T__15);
setState(148);
+ match(T__15);
+ setState(150);
_errHandler.sync(this);
_la = _input.LA(1);
if (_la == T__17 || _la == T__18) {
{
- setState(147);
+ setState(149);
fetch_option();
}
}
- setState(150);
- match(PATH_VARIABLE);
setState(152);
+ match(PATH_VARIABLE);
+ setState(154);
_errHandler.sync(this);
_la = _input.LA(1);
if (_la == T__1) {
{
- setState(151);
+ setState(153);
fetch_property_set();
}
}
@@ -925,11 +925,11 @@ public class EQLParser extends Parser {
try {
enterOuterAlt(_localctx, 1);
{
- setState(154);
- match(T__1);
- setState(155);
- fetch_property_group();
setState(156);
+ match(T__1);
+ setState(157);
+ fetch_property_group();
+ setState(158);
match(T__2);
}
} catch (RecognitionException re) {
@@ -978,21 +978,21 @@ public class EQLParser extends Parser {
try {
enterOuterAlt(_localctx, 1);
{
- setState(158);
+ setState(160);
fetch_property();
- setState(163);
+ setState(165);
_errHandler.sync(this);
_la = _input.LA(1);
while (_la == T__7) {
{
{
- setState(159);
+ setState(161);
match(T__7);
- setState(160);
+ setState(162);
fetch_property();
}
}
- setState(165);
+ setState(167);
_errHandler.sync(this);
_la = _input.LA(1);
}
@@ -1044,27 +1044,27 @@ public class EQLParser extends Parser {
Fetch_propertyContext _localctx = new Fetch_propertyContext(_ctx, getState());
enterRule(_localctx, 28, RULE_fetch_property);
try {
- setState(169);
+ setState(171);
_errHandler.sync(this);
switch (getInterpreter().adaptivePredict(_input, 14, _ctx)) {
case 1:
enterOuterAlt(_localctx, 1);
{
- setState(166);
+ setState(168);
match(PATH_VARIABLE);
}
break;
case 2:
enterOuterAlt(_localctx, 2);
{
- setState(167);
+ setState(169);
fetch_query_hint();
}
break;
case 3:
enterOuterAlt(_localctx, 3);
{
- setState(168);
+ setState(170);
fetch_lazy_hint();
}
break;
@@ -1110,9 +1110,9 @@ public class EQLParser extends Parser {
try {
enterOuterAlt(_localctx, 1);
{
- setState(171);
+ setState(173);
match(T__16);
- setState(172);
+ setState(174);
fetch_query_option();
}
} catch (RecognitionException re) {
@@ -1156,9 +1156,9 @@ public class EQLParser extends Parser {
try {
enterOuterAlt(_localctx, 1);
{
- setState(174);
+ setState(176);
match(T__16);
- setState(175);
+ setState(177);
fetch_lazy_option();
}
} catch (RecognitionException re) {
@@ -1204,20 +1204,20 @@ public class EQLParser extends Parser {
Fetch_optionContext _localctx = new Fetch_optionContext(_ctx, getState());
enterRule(_localctx, 34, RULE_fetch_option);
try {
- setState(179);
+ setState(181);
_errHandler.sync(this);
switch (_input.LA(1)) {
case T__17:
enterOuterAlt(_localctx, 1);
{
- setState(177);
+ setState(179);
fetch_query_option();
}
break;
case T__18:
enterOuterAlt(_localctx, 2);
{
- setState(178);
+ setState(180);
fetch_lazy_option();
}
break;
@@ -1266,14 +1266,14 @@ public class EQLParser extends Parser {
try {
enterOuterAlt(_localctx, 1);
{
- setState(181);
- match(T__17);
setState(183);
+ match(T__17);
+ setState(185);
_errHandler.sync(this);
_la = _input.LA(1);
if (_la == T__1) {
{
- setState(182);
+ setState(184);
fetch_batch_size();
}
}
@@ -1321,14 +1321,14 @@ public class EQLParser extends Parser {
try {
enterOuterAlt(_localctx, 1);
{
- setState(185);
- match(T__18);
setState(187);
+ match(T__18);
+ setState(189);
_errHandler.sync(this);
_la = _input.LA(1);
if (_la == T__1) {
{
- setState(186);
+ setState(188);
fetch_batch_size();
}
}
@@ -1375,11 +1375,11 @@ public class EQLParser extends Parser {
try {
enterOuterAlt(_localctx, 1);
{
- setState(189);
- match(T__1);
- setState(190);
- match(NUMBER_LITERAL);
setState(191);
+ match(T__1);
+ setState(192);
+ match(NUMBER_LITERAL);
+ setState(193);
match(T__2);
}
} catch (RecognitionException re) {
@@ -1428,21 +1428,21 @@ public class EQLParser extends Parser {
try {
enterOuterAlt(_localctx, 1);
{
- setState(193);
+ setState(195);
conditional_term();
- setState(198);
+ setState(200);
_errHandler.sync(this);
_la = _input.LA(1);
while (_la == T__19) {
{
{
- setState(194);
+ setState(196);
match(T__19);
- setState(195);
+ setState(197);
conditional_term();
}
}
- setState(200);
+ setState(202);
_errHandler.sync(this);
_la = _input.LA(1);
}
@@ -1493,21 +1493,21 @@ public class EQLParser extends Parser {
try {
enterOuterAlt(_localctx, 1);
{
- setState(201);
+ setState(203);
conditional_factor();
- setState(206);
+ setState(208);
_errHandler.sync(this);
_la = _input.LA(1);
while (_la == T__20) {
{
{
- setState(202);
+ setState(204);
match(T__20);
- setState(203);
+ setState(205);
conditional_factor();
}
}
- setState(208);
+ setState(210);
_errHandler.sync(this);
_la = _input.LA(1);
}
@@ -1554,17 +1554,17 @@ public class EQLParser extends Parser {
try {
enterOuterAlt(_localctx, 1);
{
- setState(210);
+ setState(212);
_errHandler.sync(this);
_la = _input.LA(1);
if (_la == T__21) {
{
- setState(209);
+ setState(211);
match(T__21);
}
}
- setState(212);
+ setState(214);
conditional_primary();
}
} catch (RecognitionException re) {
@@ -1610,24 +1610,24 @@ public class EQLParser extends Parser {
Conditional_primaryContext _localctx = new Conditional_primaryContext(_ctx, getState());
enterRule(_localctx, 48, RULE_conditional_primary);
try {
- setState(219);
+ setState(221);
_errHandler.sync(this);
switch (getInterpreter().adaptivePredict(_input, 21, _ctx)) {
case 1:
enterOuterAlt(_localctx, 1);
{
- setState(214);
+ setState(216);
any_expression();
}
break;
case 2:
enterOuterAlt(_localctx, 2);
{
- setState(215);
- match(T__1);
- setState(216);
- conditional_expression();
setState(217);
+ match(T__1);
+ setState(218);
+ conditional_expression();
+ setState(219);
match(T__2);
}
break;
@@ -1707,80 +1707,80 @@ public class EQLParser extends Parser {
Any_expressionContext _localctx = new Any_expressionContext(_ctx, getState());
enterRule(_localctx, 50, RULE_any_expression);
try {
- setState(234);
+ setState(236);
_errHandler.sync(this);
switch (getInterpreter().adaptivePredict(_input, 22, _ctx)) {
case 1:
enterOuterAlt(_localctx, 1);
{
- setState(221);
+ setState(223);
comparison_expression();
}
break;
case 2:
enterOuterAlt(_localctx, 2);
{
- setState(222);
+ setState(224);
like_expression();
}
break;
case 3:
enterOuterAlt(_localctx, 3);
{
- setState(223);
+ setState(225);
between_expression();
}
break;
case 4:
enterOuterAlt(_localctx, 4);
{
- setState(224);
+ setState(226);
propertyBetween_expression();
}
break;
case 5:
enterOuterAlt(_localctx, 5);
{
- setState(225);
+ setState(227);
in_expression();
}
break;
case 6:
enterOuterAlt(_localctx, 6);
{
- setState(226);
+ setState(228);
isNull_expression();
}
break;
case 7:
enterOuterAlt(_localctx, 7);
{
- setState(227);
+ setState(229);
isNotNull_expression();
}
break;
case 8:
enterOuterAlt(_localctx, 8);
{
- setState(228);
+ setState(230);
isEmpty_expression();
}
break;
case 9:
enterOuterAlt(_localctx, 9);
{
- setState(229);
+ setState(231);
isNotEmpty_expression();
}
break;
case 10:
enterOuterAlt(_localctx, 10);
{
- setState(230);
- match(T__1);
- setState(231);
- any_expression();
setState(232);
+ match(T__1);
+ setState(233);
+ any_expression();
+ setState(234);
match(T__2);
}
break;
@@ -1830,11 +1830,11 @@ public class EQLParser extends Parser {
try {
enterOuterAlt(_localctx, 1);
{
- setState(236);
- match(PATH_VARIABLE);
- setState(237);
- match(T__22);
setState(238);
+ match(PATH_VARIABLE);
+ setState(239);
+ match(T__22);
+ setState(240);
in_value();
}
} catch (RecognitionException re) {
@@ -1885,40 +1885,40 @@ public class EQLParser extends Parser {
enterRule(_localctx, 54, RULE_in_value);
int _la;
try {
- setState(252);
+ setState(254);
_errHandler.sync(this);
switch (_input.LA(1)) {
case INPUT_VARIABLE:
enterOuterAlt(_localctx, 1);
{
- setState(240);
+ setState(242);
match(INPUT_VARIABLE);
}
break;
case T__1:
enterOuterAlt(_localctx, 2);
{
- setState(241);
+ setState(243);
match(T__1);
- setState(242);
+ setState(244);
value_expression();
- setState(247);
+ setState(249);
_errHandler.sync(this);
_la = _input.LA(1);
while (_la == T__7) {
{
{
- setState(243);
+ setState(245);
match(T__7);
- setState(244);
+ setState(246);
value_expression();
}
}
- setState(249);
+ setState(251);
_errHandler.sync(this);
_la = _input.LA(1);
}
- setState(250);
+ setState(252);
match(T__2);
}
break;
@@ -1974,16 +1974,16 @@ public class EQLParser extends Parser {
try {
enterOuterAlt(_localctx, 1);
{
- setState(254);
- match(PATH_VARIABLE);
- setState(255);
- match(T__23);
setState(256);
- value_expression();
+ match(PATH_VARIABLE);
setState(257);
- match(T__20);
+ match(T__23);
setState(258);
value_expression();
+ setState(259);
+ match(T__20);
+ setState(260);
+ value_expression();
}
} catch (RecognitionException re) {
_localctx.exception = re;
@@ -2034,16 +2034,16 @@ public class EQLParser extends Parser {
try {
enterOuterAlt(_localctx, 1);
{
- setState(260);
- value_expression();
- setState(261);
- match(T__23);
setState(262);
- match(PATH_VARIABLE);
+ value_expression();
setState(263);
- match(T__20);
+ match(T__23);
setState(264);
match(PATH_VARIABLE);
+ setState(265);
+ match(T__20);
+ setState(266);
+ match(PATH_VARIABLE);
}
} catch (RecognitionException re) {
_localctx.exception = re;
@@ -2084,26 +2084,26 @@ public class EQLParser extends Parser {
IsNull_expressionContext _localctx = new IsNull_expressionContext(_ctx, getState());
enterRule(_localctx, 60, RULE_isNull_expression);
try {
- setState(271);
+ setState(273);
_errHandler.sync(this);
switch (getInterpreter().adaptivePredict(_input, 25, _ctx)) {
case 1:
enterOuterAlt(_localctx, 1);
{
- setState(266);
- match(PATH_VARIABLE);
- setState(267);
- match(T__24);
setState(268);
+ match(PATH_VARIABLE);
+ setState(269);
+ match(T__24);
+ setState(270);
match(T__25);
}
break;
case 2:
enterOuterAlt(_localctx, 2);
{
- setState(269);
+ setState(271);
match(PATH_VARIABLE);
- setState(270);
+ setState(272);
match(T__26);
}
break;
@@ -2147,37 +2147,37 @@ public class EQLParser extends Parser {
IsNotNull_expressionContext _localctx = new IsNotNull_expressionContext(_ctx, getState());
enterRule(_localctx, 62, RULE_isNotNull_expression);
try {
- setState(281);
+ setState(283);
_errHandler.sync(this);
switch (getInterpreter().adaptivePredict(_input, 26, _ctx)) {
case 1:
enterOuterAlt(_localctx, 1);
{
- setState(273);
- match(PATH_VARIABLE);
- setState(274);
- match(T__24);
setState(275);
- match(T__21);
+ 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(277);
+ setState(279);
match(PATH_VARIABLE);
- setState(278);
+ setState(280);
match(T__27);
}
break;
case 3:
enterOuterAlt(_localctx, 3);
{
- setState(279);
+ setState(281);
match(PATH_VARIABLE);
- setState(280);
+ setState(282);
match(T__28);
}
break;
@@ -2221,26 +2221,26 @@ public class EQLParser extends Parser {
IsEmpty_expressionContext _localctx = new IsEmpty_expressionContext(_ctx, getState());
enterRule(_localctx, 64, RULE_isEmpty_expression);
try {
- setState(288);
+ setState(290);
_errHandler.sync(this);
switch (getInterpreter().adaptivePredict(_input, 27, _ctx)) {
case 1:
enterOuterAlt(_localctx, 1);
{
- setState(283);
- match(PATH_VARIABLE);
- setState(284);
- match(T__24);
setState(285);
+ match(PATH_VARIABLE);
+ setState(286);
+ match(T__24);
+ setState(287);
match(T__29);
}
break;
case 2:
enterOuterAlt(_localctx, 2);
{
- setState(286);
+ setState(288);
match(PATH_VARIABLE);
- setState(287);
+ setState(289);
match(T__30);
}
break;
@@ -2284,37 +2284,37 @@ public class EQLParser extends Parser {
IsNotEmpty_expressionContext _localctx = new IsNotEmpty_expressionContext(_ctx, getState());
enterRule(_localctx, 66, RULE_isNotEmpty_expression);
try {
- setState(298);
+ setState(300);
_errHandler.sync(this);
switch (getInterpreter().adaptivePredict(_input, 28, _ctx)) {
case 1:
enterOuterAlt(_localctx, 1);
{
- setState(290);
- match(PATH_VARIABLE);
- setState(291);
- match(T__24);
setState(292);
- match(T__21);
+ 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(294);
+ setState(296);
match(PATH_VARIABLE);
- setState(295);
+ setState(297);
match(T__31);
}
break;
case 3:
enterOuterAlt(_localctx, 3);
{
- setState(296);
+ setState(298);
match(PATH_VARIABLE);
- setState(297);
+ setState(299);
match(T__32);
}
break;
@@ -2368,11 +2368,11 @@ public class EQLParser extends Parser {
try {
enterOuterAlt(_localctx, 1);
{
- setState(300);
- match(PATH_VARIABLE);
- setState(301);
- like_op();
setState(302);
+ match(PATH_VARIABLE);
+ setState(303);
+ like_op();
+ setState(304);
value_expression();
}
} catch (RecognitionException re) {
@@ -2413,7 +2413,7 @@ public class EQLParser extends Parser {
try {
enterOuterAlt(_localctx, 1);
{
- setState(304);
+ 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))) {
_errHandler.recoverInline(this);
@@ -2470,17 +2470,17 @@ public class EQLParser extends Parser {
Comparison_expressionContext _localctx = new Comparison_expressionContext(_ctx, getState());
enterRule(_localctx, 72, RULE_comparison_expression);
try {
- setState(314);
+ setState(316);
_errHandler.sync(this);
switch (_input.LA(1)) {
case PATH_VARIABLE:
enterOuterAlt(_localctx, 1);
{
- setState(306);
- match(PATH_VARIABLE);
- setState(307);
- comparison_operator();
setState(308);
+ match(PATH_VARIABLE);
+ setState(309);
+ comparison_operator();
+ setState(310);
value_expression();
}
break;
@@ -2490,11 +2490,11 @@ public class EQLParser extends Parser {
case STRING_LITERAL:
enterOuterAlt(_localctx, 2);
{
- setState(310);
- value_expression();
- setState(311);
- comparison_operator();
setState(312);
+ value_expression();
+ setState(313);
+ comparison_operator();
+ setState(314);
match(PATH_VARIABLE);
}
break;
@@ -2539,7 +2539,7 @@ public class EQLParser extends Parser {
try {
enterOuterAlt(_localctx, 1);
{
- setState(316);
+ 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))) {
_errHandler.recoverInline(this);
@@ -2592,7 +2592,7 @@ public class EQLParser extends Parser {
Value_expressionContext _localctx = new Value_expressionContext(_ctx, getState());
enterRule(_localctx, 76, RULE_value_expression);
try {
- setState(320);
+ setState(322);
_errHandler.sync(this);
switch (_input.LA(1)) {
case BOOLEAN_LITERAL:
@@ -2600,14 +2600,14 @@ public class EQLParser extends Parser {
case STRING_LITERAL:
enterOuterAlt(_localctx, 1);
{
- setState(318);
+ setState(320);
literal();
}
break;
case INPUT_VARIABLE:
enterOuterAlt(_localctx, 2);
{
- setState(319);
+ setState(321);
match(INPUT_VARIABLE);
}
break;
@@ -2664,7 +2664,7 @@ public class EQLParser extends Parser {
try {
enterOuterAlt(_localctx, 1);
{
- setState(322);
+ 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))) {
_errHandler.recoverInline(this);
@@ -2685,114 +2685,115 @@ public class EQLParser extends Parser {
}
public static final String _serializedATN =
- "\3\u0430\ud6d1\u8206\uad2d\u4417\uaef1\u8d80\uaadd\3D\u0147\4\2\t\2\4" +
+ "\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\3" +
- "\3\3\5\3g\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\7y\n\7\f\7\16\7|\13\7\3\b\3\b\5\b\u0080\n\b\3\b\5\b\u0083\n" +
- "\b\3\t\3\t\3\t\3\t\5\t\u0089\n\t\3\n\3\n\3\13\3\13\3\13\5\13\u0090\n\13" +
- "\3\f\3\f\3\f\3\r\3\r\5\r\u0097\n\r\3\r\3\r\5\r\u009b\n\r\3\16\3\16\3\16" +
- "\3\16\3\17\3\17\3\17\7\17\u00a4\n\17\f\17\16\17\u00a7\13\17\3\20\3\20" +
- "\3\20\5\20\u00ac\n\20\3\21\3\21\3\21\3\22\3\22\3\22\3\23\3\23\5\23\u00b6" +
- "\n\23\3\24\3\24\5\24\u00ba\n\24\3\25\3\25\5\25\u00be\n\25\3\26\3\26\3" +
- "\26\3\26\3\27\3\27\3\27\7\27\u00c7\n\27\f\27\16\27\u00ca\13\27\3\30\3" +
- "\30\3\30\7\30\u00cf\n\30\f\30\16\30\u00d2\13\30\3\31\5\31\u00d5\n\31\3" +
- "\31\3\31\3\32\3\32\3\32\3\32\3\32\5\32\u00de\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\u00ed\n\33\3\34\3\34" +
- "\3\34\3\34\3\35\3\35\3\35\3\35\3\35\7\35\u00f8\n\35\f\35\16\35\u00fb\13" +
- "\35\3\35\3\35\5\35\u00ff\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 \u0112\n \3!\3!\3!\3!\3!\3!\3!\3" +
- "!\5!\u011c\n!\3\"\3\"\3\"\3\"\3\"\5\"\u0123\n\"\3#\3#\3#\3#\3#\3#\3#\3" +
- "#\5#\u012d\n#\3$\3$\3$\3$\3%\3%\3&\3&\3&\3&\3&\3&\3&\3&\5&\u013d\n&\3" +
- "\'\3\'\3(\3(\5(\u0143\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\u0148\2S\3\2\2\2\4d\3\2\2\2\6l\3\2\2\2\bn\3\2\2\2\np\3\2\2\2\fs\3" +
- "\2\2\2\16}\3\2\2\2\20\u0088\3\2\2\2\22\u008a\3\2\2\2\24\u008c\3\2\2\2" +
- "\26\u0091\3\2\2\2\30\u0094\3\2\2\2\32\u009c\3\2\2\2\34\u00a0\3\2\2\2\36" +
- "\u00ab\3\2\2\2 \u00ad\3\2\2\2\"\u00b0\3\2\2\2$\u00b5\3\2\2\2&\u00b7\3" +
- "\2\2\2(\u00bb\3\2\2\2*\u00bf\3\2\2\2,\u00c3\3\2\2\2.\u00cb\3\2\2\2\60" +
- "\u00d4\3\2\2\2\62\u00dd\3\2\2\2\64\u00ec\3\2\2\2\66\u00ee\3\2\2\28\u00fe" +
- "\3\2\2\2:\u0100\3\2\2\2<\u0106\3\2\2\2>\u0111\3\2\2\2@\u011b\3\2\2\2B" +
- "\u0122\3\2\2\2D\u012c\3\2\2\2F\u012e\3\2\2\2H\u0132\3\2\2\2J\u013c\3\2" +
- "\2\2L\u013e\3\2\2\2N\u0142\3\2\2\2P\u0144\3\2\2\2RT\5\4\3\2SR\3\2\2\2" +
- "ST\3\2\2\2TX\3\2\2\2UW\5\b\5\2VU\3\2\2\2WZ\3\2\2\2XV\3\2\2\2XY\3\2\2\2" +
- "Y\\\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\2c\3" +
- "\3\2\2\2df\7\3\2\2eg\5\6\4\2fe\3\2\2\2fg\3\2\2\2gh\3\2\2\2hi\7\4\2\2i" +
- "j\5\34\17\2jk\7\5\2\2k\5\3\2\2\2lm\7\6\2\2m\7\3\2\2\2no\5\30\r\2o\t\3" +
- "\2\2\2pq\7\7\2\2qr\5,\27\2r\13\3\2\2\2st\7\b\2\2tu\7\t\2\2uz\5\16\b\2" +
- "vw\7\n\2\2wy\5\16\b\2xv\3\2\2\2y|\3\2\2\2zx\3\2\2\2z{\3\2\2\2{\r\3\2\2" +
- "\2|z\3\2\2\2}\177\7=\2\2~\u0080\5\22\n\2\177~\3\2\2\2\177\u0080\3\2\2" +
- "\2\u0080\u0082\3\2\2\2\u0081\u0083\5\20\t\2\u0082\u0081\3\2\2\2\u0082" +
- "\u0083\3\2\2\2\u0083\17\3\2\2\2\u0084\u0085\7\13\2\2\u0085\u0089\7\f\2" +
- "\2\u0086\u0087\7\13\2\2\u0087\u0089\7\r\2\2\u0088\u0084\3\2\2\2\u0088" +
- "\u0086\3\2\2\2\u0089\21\3\2\2\2\u008a\u008b\t\2\2\2\u008b\23\3\2\2\2\u008c" +
- "\u008d\7\20\2\2\u008d\u008f\7?\2\2\u008e\u0090\5\26\f\2\u008f\u008e\3" +
- "\2\2\2\u008f\u0090\3\2\2\2\u0090\25\3\2\2\2\u0091\u0092\7\21\2\2\u0092" +
- "\u0093\7?\2\2\u0093\27\3\2\2\2\u0094\u0096\7\22\2\2\u0095\u0097\5$\23" +
- "\2\u0096\u0095\3\2\2\2\u0096\u0097\3\2\2\2\u0097\u0098\3\2\2\2\u0098\u009a" +
- "\7=\2\2\u0099\u009b\5\32\16\2\u009a\u0099\3\2\2\2\u009a\u009b\3\2\2\2" +
- "\u009b\31\3\2\2\2\u009c\u009d\7\4\2\2\u009d\u009e\5\34\17\2\u009e\u009f" +
- "\7\5\2\2\u009f\33\3\2\2\2\u00a0\u00a5\5\36\20\2\u00a1\u00a2\7\n\2\2\u00a2" +
- "\u00a4\5\36\20\2\u00a3\u00a1\3\2\2\2\u00a4\u00a7\3\2\2\2\u00a5\u00a3\3" +
- "\2\2\2\u00a5\u00a6\3\2\2\2\u00a6\35\3\2\2\2\u00a7\u00a5\3\2\2\2\u00a8" +
- "\u00ac\7=\2\2\u00a9\u00ac\5 \21\2\u00aa\u00ac\5\"\22\2\u00ab\u00a8\3\2" +
- "\2\2\u00ab\u00a9\3\2\2\2\u00ab\u00aa\3\2\2\2\u00ac\37\3\2\2\2\u00ad\u00ae" +
- "\7\23\2\2\u00ae\u00af\5&\24\2\u00af!\3\2\2\2\u00b0\u00b1\7\23\2\2\u00b1" +
- "\u00b2\5(\25\2\u00b2#\3\2\2\2\u00b3\u00b6\5&\24\2\u00b4\u00b6\5(\25\2" +
- "\u00b5\u00b3\3\2\2\2\u00b5\u00b4\3\2\2\2\u00b6%\3\2\2\2\u00b7\u00b9\7" +
- "\24\2\2\u00b8\u00ba\5*\26\2\u00b9\u00b8\3\2\2\2\u00b9\u00ba\3\2\2\2\u00ba" +
- "\'\3\2\2\2\u00bb\u00bd\7\25\2\2\u00bc\u00be\5*\26\2\u00bd\u00bc\3\2\2" +
- "\2\u00bd\u00be\3\2\2\2\u00be)\3\2\2\2\u00bf\u00c0\7\4\2\2\u00c0\u00c1" +
- "\7?\2\2\u00c1\u00c2\7\5\2\2\u00c2+\3\2\2\2\u00c3\u00c8\5.\30\2\u00c4\u00c5" +
- "\7\26\2\2\u00c5\u00c7\5.\30\2\u00c6\u00c4\3\2\2\2\u00c7\u00ca\3\2\2\2" +
- "\u00c8\u00c6\3\2\2\2\u00c8\u00c9\3\2\2\2\u00c9-\3\2\2\2\u00ca\u00c8\3" +
- "\2\2\2\u00cb\u00d0\5\60\31\2\u00cc\u00cd\7\27\2\2\u00cd\u00cf\5\60\31" +
- "\2\u00ce\u00cc\3\2\2\2\u00cf\u00d2\3\2\2\2\u00d0\u00ce\3\2\2\2\u00d0\u00d1" +
- "\3\2\2\2\u00d1/\3\2\2\2\u00d2\u00d0\3\2\2\2\u00d3\u00d5\7\30\2\2\u00d4" +
- "\u00d3\3\2\2\2\u00d4\u00d5\3\2\2\2\u00d5\u00d6\3\2\2\2\u00d6\u00d7\5\62" +
- "\32\2\u00d7\61\3\2\2\2\u00d8\u00de\5\64\33\2\u00d9\u00da\7\4\2\2\u00da" +
- "\u00db\5,\27\2\u00db\u00dc\7\5\2\2\u00dc\u00de\3\2\2\2\u00dd\u00d8\3\2" +
- "\2\2\u00dd\u00d9\3\2\2\2\u00de\63\3\2\2\2\u00df\u00ed\5J&\2\u00e0\u00ed" +
- "\5F$\2\u00e1\u00ed\5:\36\2\u00e2\u00ed\5<\37\2\u00e3\u00ed\5\66\34\2\u00e4" +
- "\u00ed\5> \2\u00e5\u00ed\5@!\2\u00e6\u00ed\5B\"\2\u00e7\u00ed\5D#\2\u00e8" +
- "\u00e9\7\4\2\2\u00e9\u00ea\5\64\33\2\u00ea\u00eb\7\5\2\2\u00eb\u00ed\3" +
- "\2\2\2\u00ec\u00df\3\2\2\2\u00ec\u00e0\3\2\2\2\u00ec\u00e1\3\2\2\2\u00ec" +
- "\u00e2\3\2\2\2\u00ec\u00e3\3\2\2\2\u00ec\u00e4\3\2\2\2\u00ec\u00e5\3\2" +
- "\2\2\u00ec\u00e6\3\2\2\2\u00ec\u00e7\3\2\2\2\u00ec\u00e8\3\2\2\2\u00ed" +
- "\65\3\2\2\2\u00ee\u00ef\7=\2\2\u00ef\u00f0\7\31\2\2\u00f0\u00f1\58\35" +
- "\2\u00f1\67\3\2\2\2\u00f2\u00ff\7<\2\2\u00f3\u00f4\7\4\2\2\u00f4\u00f9" +
- "\5N(\2\u00f5\u00f6\7\n\2\2\u00f6\u00f8\5N(\2\u00f7\u00f5\3\2\2\2\u00f8" +
- "\u00fb\3\2\2\2\u00f9\u00f7\3\2\2\2\u00f9\u00fa\3\2\2\2\u00fa\u00fc\3\2" +
- "\2\2\u00fb\u00f9\3\2\2\2\u00fc\u00fd\7\5\2\2\u00fd\u00ff\3\2\2\2\u00fe" +
- "\u00f2\3\2\2\2\u00fe\u00f3\3\2\2\2\u00ff9\3\2\2\2\u0100\u0101\7=\2\2\u0101" +
- "\u0102\7\32\2\2\u0102\u0103\5N(\2\u0103\u0104\7\27\2\2\u0104\u0105\5N" +
- "(\2\u0105;\3\2\2\2\u0106\u0107\5N(\2\u0107\u0108\7\32\2\2\u0108\u0109" +
- "\7=\2\2\u0109\u010a\7\27\2\2\u010a\u010b\7=\2\2\u010b=\3\2\2\2\u010c\u010d" +
- "\7=\2\2\u010d\u010e\7\33\2\2\u010e\u0112\7\34\2\2\u010f\u0110\7=\2\2\u0110" +
- "\u0112\7\35\2\2\u0111\u010c\3\2\2\2\u0111\u010f\3\2\2\2\u0112?\3\2\2\2" +
- "\u0113\u0114\7=\2\2\u0114\u0115\7\33\2\2\u0115\u0116\7\30\2\2\u0116\u011c" +
- "\7\34\2\2\u0117\u0118\7=\2\2\u0118\u011c\7\36\2\2\u0119\u011a\7=\2\2\u011a" +
- "\u011c\7\37\2\2\u011b\u0113\3\2\2\2\u011b\u0117\3\2\2\2\u011b\u0119\3" +
- "\2\2\2\u011cA\3\2\2\2\u011d\u011e\7=\2\2\u011e\u011f\7\33\2\2\u011f\u0123" +
- "\7 \2\2\u0120\u0121\7=\2\2\u0121\u0123\7!\2\2\u0122\u011d\3\2\2\2\u0122" +
- "\u0120\3\2\2\2\u0123C\3\2\2\2\u0124\u0125\7=\2\2\u0125\u0126\7\33\2\2" +
- "\u0126\u0127\7\30\2\2\u0127\u012d\7 \2\2\u0128\u0129\7=\2\2\u0129\u012d" +
- "\7\"\2\2\u012a\u012b\7=\2\2\u012b\u012d\7#\2\2\u012c\u0124\3\2\2\2\u012c" +
- "\u0128\3\2\2\2\u012c\u012a\3\2\2\2\u012dE\3\2\2\2\u012e\u012f\7=\2\2\u012f" +
- "\u0130\5H%\2\u0130\u0131\5N(\2\u0131G\3\2\2\2\u0132\u0133\t\3\2\2\u0133" +
- "I\3\2\2\2\u0134\u0135\7=\2\2\u0135\u0136\5L\'\2\u0136\u0137\5N(\2\u0137" +
- "\u013d\3\2\2\2\u0138\u0139\5N(\2\u0139\u013a\5L\'\2\u013a\u013b\7=\2\2" +
- "\u013b\u013d\3\2\2\2\u013c\u0134\3\2\2\2\u013c\u0138\3\2\2\2\u013dK\3" +
- "\2\2\2\u013e\u013f\t\4\2\2\u013fM\3\2\2\2\u0140\u0143\5P)\2\u0141\u0143" +
- "\7<\2\2\u0142\u0140\3\2\2\2\u0142\u0141\3\2\2\2\u0143O\3\2\2\2\u0144\u0145" +
- "\t\5\2\2\u0145Q\3\2\2\2!SX\\_bfz\177\u0082\u0088\u008f\u0096\u009a\u00a5" +
- "\u00ab\u00b5\u00b9\u00bd\u00c8\u00d0\u00d4\u00dd\u00ec\u00f9\u00fe\u0111" +
- "\u011b\u0122\u012c\u013c\u0142";
+ "\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());
diff --git a/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java b/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java
index d4c569262..0f09a79a1 100644
--- a/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java
+++ b/src/test/java/io/ebeaninternal/server/grammer/EqlParserTest.java
@@ -17,12 +17,12 @@ public class EqlParserTest extends BaseTestCase {
@Test(expected = IllegalArgumentException.class)
- public void illegal_syntax() throws Exception {
+ public void illegal_syntax() {
parse("find Article where name = :p0");
}
@Test
- public void where_eq() throws Exception {
+ public void where_eq() {
Query query = parse("where name eq 'Rob'");
query.findList();
@@ -31,7 +31,7 @@ public class EqlParserTest extends BaseTestCase {
}
@Test
- public void where_eq_reverse() throws Exception {
+ public void where_eq_reverse() {
Query query = parse("where 'Rob' eq name");
query.findList();
@@ -40,7 +40,7 @@ public class EqlParserTest extends BaseTestCase {
}
@Test
- public void where_gt_reverse() throws Exception {
+ public void where_gt_reverse() {
Query query = parse("where 'Rob' > name");
query.findList();
@@ -48,7 +48,7 @@ public class EqlParserTest extends BaseTestCase {
}
@Test
- public void where_gte_reverse() throws Exception {
+ public void where_gte_reverse() {
Query query = parse("where 'Rob' >= name");
query.findList();
@@ -56,7 +56,7 @@ public class EqlParserTest extends BaseTestCase {
}
@Test
- public void where_lt_reverse() throws Exception {
+ public void where_lt_reverse() {
Query query = parse("where 'Rob' < name");
query.findList();
@@ -64,7 +64,7 @@ public class EqlParserTest extends BaseTestCase {
}
@Test
- public void where_lte_reverse() throws Exception {
+ public void where_lte_reverse() {
Query query = parse("where 'Rob' <= name");
query.findList();
@@ -72,7 +72,7 @@ public class EqlParserTest extends BaseTestCase {
}
@Test
- public void where_ieq() throws Exception {
+ public void where_ieq() {
Query query = parse("where name ieq 'Rob'");
query.findList();
@@ -81,7 +81,7 @@ public class EqlParserTest extends BaseTestCase {
}
@Test
- public void where_ieq_reverse() throws Exception {
+ public void where_ieq_reverse() {
Query query = parse("where 'Rob' ieq name");
query.findList();
@@ -89,7 +89,7 @@ public class EqlParserTest extends BaseTestCase {
}
@Test
- public void where_eq2() throws Exception {
+ public void where_eq2() {
Query query = parse("where name = 'Rob'");
query.findList();
@@ -98,7 +98,7 @@ public class EqlParserTest extends BaseTestCase {
}
@Test
- public void where_namedParam() throws Exception {
+ public void where_namedParam() {
Query query = parse("where name eq :name");
query.setParameter("name", "Rob");
@@ -117,7 +117,7 @@ public class EqlParserTest extends BaseTestCase {
}
@Test
- public void where_namedParam_startsWith() throws Exception {
+ public void where_namedParam_startsWith() {
Query query = parse("where name startsWith :name");
query.setParameter("name", "Rob");
@@ -127,7 +127,7 @@ public class EqlParserTest extends BaseTestCase {
}
@Test
- public void where_or1() throws Exception {
+ public void where_or1() {
Query query = parse("where name = 'Rob' or (status = 'NEW' and smallnote is null)");
query.findList();
@@ -136,7 +136,7 @@ public class EqlParserTest extends BaseTestCase {
}
@Test
- public void where_or2() throws Exception {
+ public void where_or2() {
Query query = parse("where (name = 'Rob' or status = 'NEW') and smallnote is null");
query.findList();
@@ -145,7 +145,7 @@ public class EqlParserTest extends BaseTestCase {
}
@Test
- public void test_simplifyExpressions() throws Exception {
+ public void test_simplifyExpressions() {
Query query = parse("where not (name = 'Rob' and status = 'NEW')");
query.findList();
@@ -162,7 +162,7 @@ public class EqlParserTest extends BaseTestCase {
@Test
- public void where_in() throws Exception {
+ public void where_in() {
Query query = parse("where name in ('Rob','Jim')");
query.findList();
@@ -171,7 +171,7 @@ public class EqlParserTest extends BaseTestCase {
}
@Test
- public void where_in_when_namedParams() throws Exception {
+ public void where_in_when_namedParams() {
Query query = parse("where name in (:one, :two)");
query.setParameter("one", "Foo");
@@ -182,7 +182,7 @@ public class EqlParserTest extends BaseTestCase {
}
@Test
- public void where_in_when_namedParams_withWhitespace() throws Exception {
+ public void where_in_when_namedParams_withWhitespace() {
Query query = parse("where name in (:one, :two)");
query.setParameter("one", "Foo");
@@ -193,7 +193,7 @@ public class EqlParserTest extends BaseTestCase {
}
@Test
- public void where_in_when_namedParams_withNoWhitespace() throws Exception {
+ public void where_in_when_namedParams_withNoWhitespace() {
Query query = parse("where name in (:one,:two)");
query.setParameter("one", "Foo");
@@ -204,7 +204,7 @@ public class EqlParserTest extends BaseTestCase {
}
@Test
- public void where_in_when_namedParamAsList() throws Exception {
+ public void where_in_when_namedParamAsList() {
Query query = parse("where name in (:names)");
query.setParameter("names", Arrays.asList("Baz", "Maz", "Jim"));
@@ -214,7 +214,7 @@ public class EqlParserTest extends BaseTestCase {
}
@Test
- public void where_between() throws Exception {
+ public void where_between() {
Query query = parse("where name between 'As' and 'B'");
query.findList();
@@ -223,7 +223,7 @@ public class EqlParserTest extends BaseTestCase {
}
@Test
- public void where_between_withNamedParams() throws Exception {
+ public void where_between_withNamedParams() {
Query query = parse("where name between :one and :two");
query.setParameter("one", "a");
@@ -234,7 +234,7 @@ public class EqlParserTest extends BaseTestCase {
}
@Test
- public void where_betweenProperty() throws Exception {
+ public void where_betweenProperty() {
Query query = parse("where 'x' between name and smallnote");
query.findList();
@@ -243,7 +243,7 @@ public class EqlParserTest extends BaseTestCase {
}
@Test
- public void where_betweenProperty_withNamed() throws Exception {
+ public void where_betweenProperty_withNamed() {
Query query = parse("where :some between name and smallnote");
query.setParameter("some", "A");
@@ -253,7 +253,7 @@ public class EqlParserTest extends BaseTestCase {
}
@Test
- public void fetch_basic() throws Exception {
+ public void fetch_basic() {
Query query = parse("fetch billingAddress");
query.findList();
@@ -262,7 +262,7 @@ public class EqlParserTest extends BaseTestCase {
}
@Test
- public void fetch_withProperty() throws Exception {
+ public void fetch_withProperty() {
Query query = parse("fetch billingAddress (city)");
query.findList();
@@ -271,7 +271,7 @@ public class EqlParserTest extends BaseTestCase {
}
@Test
- public void fetch_withProperty_noWhitespace() throws Exception {
+ public void fetch_withProperty_noWhitespace() {
Query query = parse("fetch billingAddress(city)");
query.findList();
@@ -280,7 +280,7 @@ public class EqlParserTest extends BaseTestCase {
}
@Test
- public void fetch_basic_multiple() throws Exception {
+ public void fetch_basic_multiple() {
Query query = parse("fetch billingAddress fetch shippingAddress");
query.findList();
@@ -290,7 +290,7 @@ public class EqlParserTest extends BaseTestCase {
}
@Test
- public void fetch_basic_multiple_withProperties() throws Exception {
+ public void fetch_basic_multiple_withProperties() {
Query query = parse("fetch billingAddress (city) fetch shippingAddress (city)");
query.findList();
@@ -299,7 +299,7 @@ public class EqlParserTest extends BaseTestCase {
}
@Test
- public void fetch_lazy() throws Exception {
+ public void fetch_lazy() {
Query query = parse("fetch lazy billingAddress");
query.findList();
@@ -308,7 +308,7 @@ public class EqlParserTest extends BaseTestCase {
}
@Test
- public void fetch_lazy50() throws Exception {
+ public void fetch_lazy50() {
Query query = parse("fetch lazy(50) billingAddress");
query.findList();
@@ -317,7 +317,7 @@ public class EqlParserTest extends BaseTestCase {
}
@Test
- public void fetch_query50() throws Exception {
+ public void fetch_query50() {
ResetBasicData.reset();
Query query = parse("fetch query(50) billingAddress");
@@ -327,7 +327,7 @@ public class EqlParserTest extends BaseTestCase {
}
@Test
- public void fetch_query50_asHint() throws Exception {
+ public void fetch_query50_asHint() {
ResetBasicData.reset();
Query query = parse("fetch billingAddress (+query(50),city)");
@@ -337,7 +337,7 @@ public class EqlParserTest extends BaseTestCase {
}
@Test
- public void fetch_lazy50_asHint() throws Exception {
+ public void fetch_lazy50_asHint() {
ResetBasicData.reset();
Query query = parse("fetch billingAddress (+lazy(50),city) order by id");
@@ -350,7 +350,7 @@ public class EqlParserTest extends BaseTestCase {
}
@Test
- public void select() throws Exception {
+ public void select() {
ResetBasicData.reset();
@@ -360,7 +360,7 @@ public class EqlParserTest extends BaseTestCase {
}
@Test
- public void selectDistinct() throws Exception {
+ public void selectDistinct() {
ResetBasicData.reset();
@@ -371,7 +371,7 @@ public class EqlParserTest extends BaseTestCase {
@Test
- public void limit() throws Exception {
+ public void limit() {
ResetBasicData.reset();
@@ -383,7 +383,7 @@ public class EqlParserTest extends BaseTestCase {
}
@Test
- public void limitOffset() throws Exception {
+ public void limitOffset() {
ResetBasicData.reset();
@@ -395,7 +395,7 @@ public class EqlParserTest extends BaseTestCase {
}
@Test
- public void orderBy() throws Exception {
+ public void orderBy() {
ResetBasicData.reset();
@@ -407,7 +407,7 @@ public class EqlParserTest extends BaseTestCase {
}
@Test
- public void orderBy_desc() throws Exception {
+ public void orderBy_desc() {
ResetBasicData.reset();
@@ -419,7 +419,7 @@ public class EqlParserTest extends BaseTestCase {
}
@Test
- public void orderBy_nullsLast() throws Exception {
+ public void orderBy_nullsLast() {
if (!isPlatformOrderNullsSupport()) {
return;
@@ -435,7 +435,7 @@ public class EqlParserTest extends BaseTestCase {
}
@Test
- public void orderBy_nullsFirst() throws Exception {
+ public void orderBy_nullsFirst() {
if (!isPlatformOrderNullsSupport()) {
return;
@@ -450,7 +450,7 @@ public class EqlParserTest extends BaseTestCase {
}
@Test
- public void orderBy_multiple() throws Exception {
+ public void orderBy_multiple() {
if (!isPlatformOrderNullsSupport()) {
return;
diff --git a/src/test/resources/EQL.g4 b/src/test/resources/EQL.g4
index da25a2851..4e021172b 100644
--- a/src/test/resources/EQL.g4
+++ b/src/test/resources/EQL.g4
@@ -1,21 +1,7 @@
grammar EQL;
-@parser::members {
- @Override
- public void reportError(RecognitionException e) {
- throw new RuntimeException("Error in grammer - " + e.getMessage());
- }
-}
-
-@lexer::members {
- @Override
- public void reportError(RecognitionException e) {
- throw new RuntimeException("Error in grammer - " + e.getMessage());
- }
-}
-
select_statement
- : select_clause? fetch_clause* where_clause? orderby_clause? limit_clause?
+ : select_clause? fetch_clause* where_clause? orderby_clause? limit_clause? EOF
;
select_clause