From 8257d8d76ae8233c523ef36b654162cadd6e06f8 Mon Sep 17 00:00:00 2001 From: Costin Leau Date: Tue, 9 Jan 2018 19:30:50 +0200 Subject: [PATCH] SQL: Extend grammar to allow wildcard in the grammar without quotes (elastic/x-pack-elasticsearch#3501) Tweak the grammar to differentiate between table and normal identifier. The table one allows wildcard while the normal one (for fields) does not. Original commit: elastic/x-pack-elasticsearch@a714e950db81ef02d4bb1b563c5753576a8e6c7b --- qa/sql/src/main/resources/alias.csv-spec | 20 +- qa/sql/src/main/resources/debug.csv-spec | 5 +- sql/server/src/main/antlr/SqlBase.g4 | 15 +- sql/server/src/main/antlr/SqlBase.tokens | 15 +- sql/server/src/main/antlr/SqlBaseLexer.tokens | 13 +- .../xpack/sql/execution/PlanExecutor.java | 2 - .../expression/function/FunctionRegistry.java | 4 +- .../sql/expression/regex/LikePattern.java | 1 + .../xpack/sql/parser/SqlBaseBaseListener.java | 24 +- .../xpack/sql/parser/SqlBaseBaseVisitor.java | 4 +- .../xpack/sql/parser/SqlBaseLexer.java | 514 +++++++++--------- .../xpack/sql/parser/SqlBaseListener.java | 20 +- .../xpack/sql/parser/SqlBaseParser.java | 438 ++++++++------- .../xpack/sql/parser/SqlBaseVisitor.java | 12 +- .../plan/logical/command/ShowFunctions.java | 2 +- .../xpack/sql/session/SqlSession.java | 3 +- .../xpack/sql/util/StringUtils.java | 5 - 17 files changed, 571 insertions(+), 526 deletions(-) diff --git a/qa/sql/src/main/resources/alias.csv-spec b/qa/sql/src/main/resources/alias.csv-spec index f547fd926b8..230199dc574 100644 --- a/qa/sql/src/main/resources/alias.csv-spec +++ b/qa/sql/src/main/resources/alias.csv-spec @@ -24,7 +24,7 @@ emp_no:i | first_name:s ; describeAlias -DESCRIBE "test_alias"; +DESCRIBE test_alias; column:s | type:s @@ -39,7 +39,7 @@ salary | INTEGER ; describePattern -DESCRIBE "test_alias"; +DESCRIBE test_*; column:s | type:s @@ -53,18 +53,16 @@ last_name | VARCHAR salary | INTEGER ; -//showAlias -//SHOW TABLES 'test_alias'; +showAlias +SHOW TABLES LIKE 'test\_alias' ESCAPE '\'; -//name:s | type:s -// -//test_alias | ALIAS -//test_emp | INDEX -//test_employees | INDEX -//; +name:s | type:s + +test_alias | ALIAS +; showPattern -SHOW TABLES 'test_%'; +SHOW TABLES LIKE 'test_%'; name:s | type:s diff --git a/qa/sql/src/main/resources/debug.csv-spec b/qa/sql/src/main/resources/debug.csv-spec index 9e91c09477c..820ebad19db 100644 --- a/qa/sql/src/main/resources/debug.csv-spec +++ b/qa/sql/src/main/resources/debug.csv-spec @@ -3,8 +3,9 @@ // debug -SHOW TABLES test_emp; -//DESCRIBE test_alias; +//SHOW TABLES 'test_emp'; +//SELECT * FROM t*; +SHOW TABLES LIKE 'test\_alias' ESCAPE '\'; table:s test_emp diff --git a/sql/server/src/main/antlr/SqlBase.g4 b/sql/server/src/main/antlr/SqlBase.g4 index 9d45cf5c19a..16feeaa8052 100644 --- a/sql/server/src/main/antlr/SqlBase.g4 +++ b/sql/server/src/main/antlr/SqlBase.g4 @@ -225,15 +225,16 @@ qualifiedName : (identifier DOT)* identifier ; -tableIdentifier - : identifier - ; - identifier : quoteIdentifier | unquoteIdentifier ; +tableIdentifier + : TABLE_IDENTIFIER + | identifier + ; + quoteIdentifier : QUOTED_IDENTIFIER #quotedIdentifier | BACKQUOTED_IDENTIFIER #backQuotedIdentifier @@ -361,13 +362,17 @@ DECIMAL_VALUE ; IDENTIFIER - : (LETTER | '_') (LETTER | DIGIT | '_' | '@' | ':')* + : (LETTER | '_') (LETTER | DIGIT | '_' | '@' )* ; DIGIT_IDENTIFIER : DIGIT (LETTER | DIGIT | '_' | '@' | ':')+ ; +TABLE_IDENTIFIER + : (LETTER | DIGIT | '_' | '@' | ASTERISK)+ + ; + QUOTED_IDENTIFIER : '"' ( ~'"' | '""' )* '"' ; diff --git a/sql/server/src/main/antlr/SqlBase.tokens b/sql/server/src/main/antlr/SqlBase.tokens index afa922e2ecf..9bbf45eebd5 100644 --- a/sql/server/src/main/antlr/SqlBase.tokens +++ b/sql/server/src/main/antlr/SqlBase.tokens @@ -80,13 +80,14 @@ INTEGER_VALUE=79 DECIMAL_VALUE=80 IDENTIFIER=81 DIGIT_IDENTIFIER=82 -QUOTED_IDENTIFIER=83 -BACKQUOTED_IDENTIFIER=84 -SIMPLE_COMMENT=85 -BRACKETED_COMMENT=86 -WS=87 -UNRECOGNIZED=88 -DELIMITER=89 +TABLE_IDENTIFIER=83 +QUOTED_IDENTIFIER=84 +BACKQUOTED_IDENTIFIER=85 +SIMPLE_COMMENT=86 +BRACKETED_COMMENT=87 +WS=88 +UNRECOGNIZED=89 +DELIMITER=90 '('=1 ')'=2 ','=3 diff --git a/sql/server/src/main/antlr/SqlBaseLexer.tokens b/sql/server/src/main/antlr/SqlBaseLexer.tokens index 75091083a3f..4ad99b622bb 100644 --- a/sql/server/src/main/antlr/SqlBaseLexer.tokens +++ b/sql/server/src/main/antlr/SqlBaseLexer.tokens @@ -80,12 +80,13 @@ INTEGER_VALUE=79 DECIMAL_VALUE=80 IDENTIFIER=81 DIGIT_IDENTIFIER=82 -QUOTED_IDENTIFIER=83 -BACKQUOTED_IDENTIFIER=84 -SIMPLE_COMMENT=85 -BRACKETED_COMMENT=86 -WS=87 -UNRECOGNIZED=88 +TABLE_IDENTIFIER=83 +QUOTED_IDENTIFIER=84 +BACKQUOTED_IDENTIFIER=85 +SIMPLE_COMMENT=86 +BRACKETED_COMMENT=87 +WS=88 +UNRECOGNIZED=89 '('=1 ')'=2 ','=3 diff --git a/sql/server/src/main/java/org/elasticsearch/xpack/sql/execution/PlanExecutor.java b/sql/server/src/main/java/org/elasticsearch/xpack/sql/execution/PlanExecutor.java index 447365dc261..0f86cd9902d 100644 --- a/sql/server/src/main/java/org/elasticsearch/xpack/sql/execution/PlanExecutor.java +++ b/sql/server/src/main/java/org/elasticsearch/xpack/sql/execution/PlanExecutor.java @@ -8,13 +8,11 @@ package org.elasticsearch.xpack.sql.execution; import org.elasticsearch.action.ActionListener; import org.elasticsearch.client.Client; import org.elasticsearch.search.builder.SearchSourceBuilder; -import org.elasticsearch.xpack.sql.analysis.analyzer.Analyzer; import org.elasticsearch.xpack.sql.analysis.analyzer.PreAnalyzer; import org.elasticsearch.xpack.sql.analysis.index.IndexResolver; import org.elasticsearch.xpack.sql.execution.search.SourceGenerator; import org.elasticsearch.xpack.sql.expression.function.FunctionRegistry; import org.elasticsearch.xpack.sql.optimizer.Optimizer; -import org.elasticsearch.xpack.sql.parser.SqlParser; import org.elasticsearch.xpack.sql.plan.physical.EsQueryExec; import org.elasticsearch.xpack.sql.planner.Planner; import org.elasticsearch.xpack.sql.planner.PlanningException; diff --git a/sql/server/src/main/java/org/elasticsearch/xpack/sql/expression/function/FunctionRegistry.java b/sql/server/src/main/java/org/elasticsearch/xpack/sql/expression/function/FunctionRegistry.java index 99fbd9fa45c..3cbf99efe34 100644 --- a/sql/server/src/main/java/org/elasticsearch/xpack/sql/expression/function/FunctionRegistry.java +++ b/sql/server/src/main/java/org/elasticsearch/xpack/sql/expression/function/FunctionRegistry.java @@ -6,10 +6,8 @@ package org.elasticsearch.xpack.sql.expression.function; import org.elasticsearch.common.Strings; - import org.elasticsearch.xpack.sql.SqlIllegalArgumentException; import org.elasticsearch.xpack.sql.expression.Expression; -import org.elasticsearch.xpack.sql.expression.function.Score; import org.elasticsearch.xpack.sql.expression.function.aggregate.Avg; import org.elasticsearch.xpack.sql.expression.function.aggregate.Correlation; import org.elasticsearch.xpack.sql.expression.function.aggregate.Count; @@ -188,7 +186,7 @@ public class FunctionRegistry { } public Collection listFunctions(String pattern) { - Pattern p = Strings.hasText(pattern) ? StringUtils.likeRegex(normalize(pattern)) : null; + Pattern p = Strings.hasText(pattern) ? Pattern.compile(normalize(pattern)) : null; return defs.entrySet().stream() .filter(e -> p == null || p.matcher(e.getKey()).matches()) .map(e -> new FunctionDefinition(e.getKey(), emptyList(), e.getValue().clazz(), e.getValue().builder())) diff --git a/sql/server/src/main/java/org/elasticsearch/xpack/sql/expression/regex/LikePattern.java b/sql/server/src/main/java/org/elasticsearch/xpack/sql/expression/regex/LikePattern.java index e356529050b..b4e98c2a433 100644 --- a/sql/server/src/main/java/org/elasticsearch/xpack/sql/expression/regex/LikePattern.java +++ b/sql/server/src/main/java/org/elasticsearch/xpack/sql/expression/regex/LikePattern.java @@ -68,6 +68,7 @@ public class LikePattern extends LeafExpression { public String asIndexNameWildcard() { return indexNameWildcard; } + @Override public boolean nullable() { return false; diff --git a/sql/server/src/main/java/org/elasticsearch/xpack/sql/parser/SqlBaseBaseListener.java b/sql/server/src/main/java/org/elasticsearch/xpack/sql/parser/SqlBaseBaseListener.java index ff88bb1bfff..7044ebf9c61 100644 --- a/sql/server/src/main/java/org/elasticsearch/xpack/sql/parser/SqlBaseBaseListener.java +++ b/sql/server/src/main/java/org/elasticsearch/xpack/sql/parser/SqlBaseBaseListener.java @@ -748,18 +748,6 @@ class SqlBaseBaseListener implements SqlBaseListener { *

The default implementation does nothing.

*/ @Override public void exitQualifiedName(SqlBaseParser.QualifiedNameContext ctx) { } - /** - * {@inheritDoc} - * - *

The default implementation does nothing.

- */ - @Override public void enterTableIdentifier(SqlBaseParser.TableIdentifierContext ctx) { } - /** - * {@inheritDoc} - * - *

The default implementation does nothing.

- */ - @Override public void exitTableIdentifier(SqlBaseParser.TableIdentifierContext ctx) { } /** * {@inheritDoc} * @@ -772,6 +760,18 @@ class SqlBaseBaseListener implements SqlBaseListener { *

The default implementation does nothing.

*/ @Override public void exitIdentifier(SqlBaseParser.IdentifierContext ctx) { } + /** + * {@inheritDoc} + * + *

The default implementation does nothing.

+ */ + @Override public void enterTableIdentifier(SqlBaseParser.TableIdentifierContext ctx) { } + /** + * {@inheritDoc} + * + *

The default implementation does nothing.

+ */ + @Override public void exitTableIdentifier(SqlBaseParser.TableIdentifierContext ctx) { } /** * {@inheritDoc} * diff --git a/sql/server/src/main/java/org/elasticsearch/xpack/sql/parser/SqlBaseBaseVisitor.java b/sql/server/src/main/java/org/elasticsearch/xpack/sql/parser/SqlBaseBaseVisitor.java index dd670966c16..ce31693cdde 100644 --- a/sql/server/src/main/java/org/elasticsearch/xpack/sql/parser/SqlBaseBaseVisitor.java +++ b/sql/server/src/main/java/org/elasticsearch/xpack/sql/parser/SqlBaseBaseVisitor.java @@ -449,14 +449,14 @@ class SqlBaseBaseVisitor extends AbstractParseTreeVisitor implements SqlBa *

The default implementation returns the result of calling * {@link #visitChildren} on {@code ctx}.

*/ - @Override public T visitTableIdentifier(SqlBaseParser.TableIdentifierContext ctx) { return visitChildren(ctx); } + @Override public T visitIdentifier(SqlBaseParser.IdentifierContext ctx) { return visitChildren(ctx); } /** * {@inheritDoc} * *

The default implementation returns the result of calling * {@link #visitChildren} on {@code ctx}.

*/ - @Override public T visitIdentifier(SqlBaseParser.IdentifierContext ctx) { return visitChildren(ctx); } + @Override public T visitTableIdentifier(SqlBaseParser.TableIdentifierContext ctx) { return visitChildren(ctx); } /** * {@inheritDoc} * diff --git a/sql/server/src/main/java/org/elasticsearch/xpack/sql/parser/SqlBaseLexer.java b/sql/server/src/main/java/org/elasticsearch/xpack/sql/parser/SqlBaseLexer.java index 330ca96cc3c..f9cd93d589a 100644 --- a/sql/server/src/main/java/org/elasticsearch/xpack/sql/parser/SqlBaseLexer.java +++ b/sql/server/src/main/java/org/elasticsearch/xpack/sql/parser/SqlBaseLexer.java @@ -33,8 +33,8 @@ class SqlBaseLexer extends Lexer { TRUE=60, USING=61, VERIFY=62, WHERE=63, WITH=64, EQ=65, NEQ=66, LT=67, LTE=68, GT=69, GTE=70, PLUS=71, MINUS=72, ASTERISK=73, SLASH=74, PERCENT=75, CONCAT=76, DOT=77, STRING=78, INTEGER_VALUE=79, DECIMAL_VALUE=80, IDENTIFIER=81, - DIGIT_IDENTIFIER=82, QUOTED_IDENTIFIER=83, BACKQUOTED_IDENTIFIER=84, SIMPLE_COMMENT=85, - BRACKETED_COMMENT=86, WS=87, UNRECOGNIZED=88; + DIGIT_IDENTIFIER=82, TABLE_IDENTIFIER=83, QUOTED_IDENTIFIER=84, BACKQUOTED_IDENTIFIER=85, + SIMPLE_COMMENT=86, BRACKETED_COMMENT=87, WS=88, UNRECOGNIZED=89; public static String[] modeNames = { "DEFAULT_MODE" }; @@ -50,8 +50,9 @@ class SqlBaseLexer extends Lexer { "TABLES", "TEXT", "TRUE", "USING", "VERIFY", "WHERE", "WITH", "EQ", "NEQ", "LT", "LTE", "GT", "GTE", "PLUS", "MINUS", "ASTERISK", "SLASH", "PERCENT", "CONCAT", "DOT", "STRING", "INTEGER_VALUE", "DECIMAL_VALUE", "IDENTIFIER", - "DIGIT_IDENTIFIER", "QUOTED_IDENTIFIER", "BACKQUOTED_IDENTIFIER", "EXPONENT", - "DIGIT", "LETTER", "SIMPLE_COMMENT", "BRACKETED_COMMENT", "WS", "UNRECOGNIZED" + "DIGIT_IDENTIFIER", "TABLE_IDENTIFIER", "QUOTED_IDENTIFIER", "BACKQUOTED_IDENTIFIER", + "EXPONENT", "DIGIT", "LETTER", "SIMPLE_COMMENT", "BRACKETED_COMMENT", + "WS", "UNRECOGNIZED" }; private static final String[] _LITERAL_NAMES = { @@ -78,8 +79,8 @@ class SqlBaseLexer extends Lexer { "TABLES", "TEXT", "TRUE", "USING", "VERIFY", "WHERE", "WITH", "EQ", "NEQ", "LT", "LTE", "GT", "GTE", "PLUS", "MINUS", "ASTERISK", "SLASH", "PERCENT", "CONCAT", "DOT", "STRING", "INTEGER_VALUE", "DECIMAL_VALUE", "IDENTIFIER", - "DIGIT_IDENTIFIER", "QUOTED_IDENTIFIER", "BACKQUOTED_IDENTIFIER", "SIMPLE_COMMENT", - "BRACKETED_COMMENT", "WS", "UNRECOGNIZED" + "DIGIT_IDENTIFIER", "TABLE_IDENTIFIER", "QUOTED_IDENTIFIER", "BACKQUOTED_IDENTIFIER", + "SIMPLE_COMMENT", "BRACKETED_COMMENT", "WS", "UNRECOGNIZED" }; public static final Vocabulary VOCABULARY = new VocabularyImpl(_LITERAL_NAMES, _SYMBOLIC_NAMES); @@ -136,7 +137,7 @@ class SqlBaseLexer extends Lexer { public ATN getATN() { return _ATN; } public static final String _serializedATN = - "\3\u0430\ud6d1\u8206\uad2d\u4417\uaef1\u8d80\uaadd\2Z\u02f7\b\1\4\2\t"+ + "\3\u0430\ud6d1\u8206\uad2d\u4417\uaef1\u8d80\uaadd\2[\u0301\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"+ @@ -146,253 +147,258 @@ class SqlBaseLexer extends Lexer { "\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\4E\tE\4F\tF\4G\tG\4H\tH\4I"+ "\tI\4J\tJ\4K\tK\4L\tL\4M\tM\4N\tN\4O\tO\4P\tP\4Q\tQ\4R\tR\4S\tS\4T\tT"+ - "\4U\tU\4V\tV\4W\tW\4X\tX\4Y\tY\4Z\tZ\4[\t[\4\\\t\\\3\2\3\2\3\3\3\3\3\4"+ - "\3\4\3\5\3\5\3\5\3\5\3\6\3\6\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\7\3\7\3\7\3\b\3\b\3\b\3\b\3\t\3\t\3\t\3\t\3\n\3\n\3\n\3\13\3"+ - "\13\3\13\3\13\3\f\3\f\3\f\3\f\3\f\3\f\3\f\3\f\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\17\3\17\3\20\3\20\3\20\3"+ - "\20\3\20\3\20\3\21\3\21\3\21\3\21\3\21\3\22\3\22\3\22\3\22\3\22\3\22\3"+ - "\22\3\22\3\22\3\23\3\23\3\23\3\23\3\23\3\23\3\23\3\23\3\23\3\24\3\24\3"+ - "\24\3\24\3\24\3\24\3\24\3\25\3\25\3\25\3\25\3\25\3\25\3\25\3\25\3\25\3"+ - "\25\3\25\3\26\3\26\3\26\3\26\3\26\3\26\3\26\3\27\3\27\3\27\3\27\3\27\3"+ - "\27\3\27\3\27\3\30\3\30\3\30\3\30\3\30\3\30\3\30\3\30\3\31\3\31\3\31\3"+ - "\31\3\31\3\31\3\32\3\32\3\32\3\32\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\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\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\60\3\60\3\60\3\60\3\60\3\60\3\61\3\61\3\61\3\61\3\61\3\61\3\62"+ - "\3\62\3\62\3\62\3\62\3\62\3\62\3\63\3\63\3\63\3\63\3\63\3\63\3\63\3\63"+ - "\3\63\3\64\3\64\3\64\3\64\3\64\3\65\3\65\3\65\3\65\3\65\3\65\3\66\3\66"+ - "\3\66\3\66\3\66\3\66\3\67\3\67\3\67\3\67\3\67\3\67\38\38\38\38\38\38\3"+ - "8\38\39\39\39\39\39\39\39\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@\3A\3A\3A\3A\3A\3B\3B\3C\3C\3C\3C\3C\3C\3C\5C\u0241\nC\3D\3"+ - "D\3E\3E\3E\3F\3F\3G\3G\3G\3H\3H\3I\3I\3J\3J\3K\3K\3L\3L\3M\3M\3M\3N\3"+ - "N\3O\3O\3O\3O\7O\u0260\nO\fO\16O\u0263\13O\3O\3O\3P\6P\u0268\nP\rP\16"+ - "P\u0269\3Q\6Q\u026d\nQ\rQ\16Q\u026e\3Q\3Q\7Q\u0273\nQ\fQ\16Q\u0276\13"+ - "Q\3Q\3Q\6Q\u027a\nQ\rQ\16Q\u027b\3Q\6Q\u027f\nQ\rQ\16Q\u0280\3Q\3Q\7Q"+ - "\u0285\nQ\fQ\16Q\u0288\13Q\5Q\u028a\nQ\3Q\3Q\3Q\3Q\6Q\u0290\nQ\rQ\16Q"+ - "\u0291\3Q\3Q\5Q\u0296\nQ\3R\3R\5R\u029a\nR\3R\3R\3R\7R\u029f\nR\fR\16"+ - "R\u02a2\13R\3S\3S\3S\3S\6S\u02a8\nS\rS\16S\u02a9\3T\3T\3T\3T\7T\u02b0"+ - "\nT\fT\16T\u02b3\13T\3T\3T\3U\3U\3U\3U\7U\u02bb\nU\fU\16U\u02be\13U\3"+ - "U\3U\3V\3V\5V\u02c4\nV\3V\6V\u02c7\nV\rV\16V\u02c8\3W\3W\3X\3X\3Y\3Y\3"+ - "Y\3Y\7Y\u02d3\nY\fY\16Y\u02d6\13Y\3Y\5Y\u02d9\nY\3Y\5Y\u02dc\nY\3Y\3Y"+ - "\3Z\3Z\3Z\3Z\3Z\7Z\u02e5\nZ\fZ\16Z\u02e8\13Z\3Z\3Z\3Z\3Z\3Z\3[\6[\u02f0"+ - "\n[\r[\16[\u02f1\3[\3[\3\\\3\\\3\u02e6\2]\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\67m8o9q:s;u{?}@\177A\u0081"+ - "B\u0083C\u0085D\u0087E\u0089F\u008bG\u008dH\u008fI\u0091J\u0093K\u0095"+ - "L\u0097M\u0099N\u009bO\u009dP\u009fQ\u00a1R\u00a3S\u00a5T\u00a7U\u00a9"+ - "V\u00ab\2\u00ad\2\u00af\2\u00b1W\u00b3X\u00b5Y\u00b7Z\3\2\13\3\2))\5\2"+ - "<\3\2\2\2\u0171\u0172\7J\2\2\u0172\u0173\7C\2\2\u0173\u0174\7X\2\2\u0174"+ - "\u0175\7K\2\2\u0175\u0176\7P\2\2\u0176\u0177\7I\2\2\u0177@\3\2\2\2\u0178"+ - "\u0179\7K\2\2\u0179\u017a\7P\2\2\u017aB\3\2\2\2\u017b\u017c\7K\2\2\u017c"+ - "\u017d\7P\2\2\u017d\u017e\7P\2\2\u017e\u017f\7G\2\2\u017f\u0180\7T\2\2"+ - "\u0180D\3\2\2\2\u0181\u0182\7K\2\2\u0182\u0183\7U\2\2\u0183F\3\2\2\2\u0184"+ - "\u0185\7L\2\2\u0185\u0186\7Q\2\2\u0186\u0187\7K\2\2\u0187\u0188\7P\2\2"+ - "\u0188H\3\2\2\2\u0189\u018a\7N\2\2\u018a\u018b\7G\2\2\u018b\u018c\7H\2"+ - "\2\u018c\u018d\7V\2\2\u018dJ\3\2\2\2\u018e\u018f\7N\2\2\u018f\u0190\7"+ - "K\2\2\u0190\u0191\7M\2\2\u0191\u0192\7G\2\2\u0192L\3\2\2\2\u0193\u0194"+ - "\7N\2\2\u0194\u0195\7K\2\2\u0195\u0196\7O\2\2\u0196\u0197\7K\2\2\u0197"+ - "\u0198\7V\2\2\u0198N\3\2\2\2\u0199\u019a\7O\2\2\u019a\u019b\7C\2\2\u019b"+ - "\u019c\7R\2\2\u019c\u019d\7R\2\2\u019d\u019e\7G\2\2\u019e\u019f\7F\2\2"+ - "\u019fP\3\2\2\2\u01a0\u01a1\7O\2\2\u01a1\u01a2\7C\2\2\u01a2\u01a3\7V\2"+ - "\2\u01a3\u01a4\7E\2\2\u01a4\u01a5\7J\2\2\u01a5R\3\2\2\2\u01a6\u01a7\7"+ - "P\2\2\u01a7\u01a8\7C\2\2\u01a8\u01a9\7V\2\2\u01a9\u01aa\7W\2\2\u01aa\u01ab"+ - "\7T\2\2\u01ab\u01ac\7C\2\2\u01ac\u01ad\7N\2\2\u01adT\3\2\2\2\u01ae\u01af"+ - "\7P\2\2\u01af\u01b0\7Q\2\2\u01b0\u01b1\7V\2\2\u01b1V\3\2\2\2\u01b2\u01b3"+ - "\7P\2\2\u01b3\u01b4\7W\2\2\u01b4\u01b5\7N\2\2\u01b5\u01b6\7N\2\2\u01b6"+ - "X\3\2\2\2\u01b7\u01b8\7Q\2\2\u01b8\u01b9\7P\2\2\u01b9Z\3\2\2\2\u01ba\u01bb"+ - "\7Q\2\2\u01bb\u01bc\7R\2\2\u01bc\u01bd\7V\2\2\u01bd\u01be\7K\2\2\u01be"+ - "\u01bf\7O\2\2\u01bf\u01c0\7K\2\2\u01c0\u01c1\7\\\2\2\u01c1\u01c2\7G\2"+ - "\2\u01c2\u01c3\7F\2\2\u01c3\\\3\2\2\2\u01c4\u01c5\7Q\2\2\u01c5\u01c6\7"+ - "T\2\2\u01c6^\3\2\2\2\u01c7\u01c8\7Q\2\2\u01c8\u01c9\7T\2\2\u01c9\u01ca"+ - "\7F\2\2\u01ca\u01cb\7G\2\2\u01cb\u01cc\7T\2\2\u01cc`\3\2\2\2\u01cd\u01ce"+ - "\7Q\2\2\u01ce\u01cf\7W\2\2\u01cf\u01d0\7V\2\2\u01d0\u01d1\7G\2\2\u01d1"+ - "\u01d2\7T\2\2\u01d2b\3\2\2\2\u01d3\u01d4\7R\2\2\u01d4\u01d5\7C\2\2\u01d5"+ - "\u01d6\7T\2\2\u01d6\u01d7\7U\2\2\u01d7\u01d8\7G\2\2\u01d8\u01d9\7F\2\2"+ - "\u01d9d\3\2\2\2\u01da\u01db\7R\2\2\u01db\u01dc\7J\2\2\u01dc\u01dd\7[\2"+ - "\2\u01dd\u01de\7U\2\2\u01de\u01df\7K\2\2\u01df\u01e0\7E\2\2\u01e0\u01e1"+ - "\7C\2\2\u01e1\u01e2\7N\2\2\u01e2f\3\2\2\2\u01e3\u01e4\7R\2\2\u01e4\u01e5"+ - "\7N\2\2\u01e5\u01e6\7C\2\2\u01e6\u01e7\7P\2\2\u01e7h\3\2\2\2\u01e8\u01e9"+ - "\7S\2\2\u01e9\u01ea\7W\2\2\u01ea\u01eb\7G\2\2\u01eb\u01ec\7T\2\2\u01ec"+ - "\u01ed\7[\2\2\u01edj\3\2\2\2\u01ee\u01ef\7T\2\2\u01ef\u01f0\7K\2\2\u01f0"+ - "\u01f1\7I\2\2\u01f1\u01f2\7J\2\2\u01f2\u01f3\7V\2\2\u01f3l\3\2\2\2\u01f4"+ - "\u01f5\7T\2\2\u01f5\u01f6\7N\2\2\u01f6\u01f7\7K\2\2\u01f7\u01f8\7M\2\2"+ - "\u01f8\u01f9\7G\2\2\u01f9n\3\2\2\2\u01fa\u01fb\7U\2\2\u01fb\u01fc\7E\2"+ - "\2\u01fc\u01fd\7J\2\2\u01fd\u01fe\7G\2\2\u01fe\u01ff\7O\2\2\u01ff\u0200"+ - "\7C\2\2\u0200\u0201\7U\2\2\u0201p\3\2\2\2\u0202\u0203\7U\2\2\u0203\u0204"+ - "\7G\2\2\u0204\u0205\7N\2\2\u0205\u0206\7G\2\2\u0206\u0207\7E\2\2\u0207"+ - "\u0208\7V\2\2\u0208r\3\2\2\2\u0209\u020a\7U\2\2\u020a\u020b\7J\2\2\u020b"+ - "\u020c\7Q\2\2\u020c\u020d\7Y\2\2\u020dt\3\2\2\2\u020e\u020f\7V\2\2\u020f"+ - "\u0210\7C\2\2\u0210\u0211\7D\2\2\u0211\u0212\7N\2\2\u0212\u0213\7G\2\2"+ - "\u0213\u0214\7U\2\2\u0214v\3\2\2\2\u0215\u0216\7V\2\2\u0216\u0217\7G\2"+ - "\2\u0217\u0218\7Z\2\2\u0218\u0219\7V\2\2\u0219x\3\2\2\2\u021a\u021b\7"+ - "V\2\2\u021b\u021c\7T\2\2\u021c\u021d\7W\2\2\u021d\u021e\7G\2\2\u021ez"+ - "\3\2\2\2\u021f\u0220\7W\2\2\u0220\u0221\7U\2\2\u0221\u0222\7K\2\2\u0222"+ - "\u0223\7P\2\2\u0223\u0224\7I\2\2\u0224|\3\2\2\2\u0225\u0226\7X\2\2\u0226"+ - "\u0227\7G\2\2\u0227\u0228\7T\2\2\u0228\u0229\7K\2\2\u0229\u022a\7H\2\2"+ - "\u022a\u022b\7[\2\2\u022b~\3\2\2\2\u022c\u022d\7Y\2\2\u022d\u022e\7J\2"+ - "\2\u022e\u022f\7G\2\2\u022f\u0230\7T\2\2\u0230\u0231\7G\2\2\u0231\u0080"+ - "\3\2\2\2\u0232\u0233\7Y\2\2\u0233\u0234\7K\2\2\u0234\u0235\7V\2\2\u0235"+ - "\u0236\7J\2\2\u0236\u0082\3\2\2\2\u0237\u0238\7?\2\2\u0238\u0084\3\2\2"+ - "\2\u0239\u023a\7>\2\2\u023a\u0241\7@\2\2\u023b\u023c\7#\2\2\u023c\u0241"+ - "\7?\2\2\u023d\u023e\7>\2\2\u023e\u023f\7?\2\2\u023f\u0241\7@\2\2\u0240"+ - "\u0239\3\2\2\2\u0240\u023b\3\2\2\2\u0240\u023d\3\2\2\2\u0241\u0086\3\2"+ - "\2\2\u0242\u0243\7>\2\2\u0243\u0088\3\2\2\2\u0244\u0245\7>\2\2\u0245\u0246"+ - "\7?\2\2\u0246\u008a\3\2\2\2\u0247\u0248\7@\2\2\u0248\u008c\3\2\2\2\u0249"+ - "\u024a\7@\2\2\u024a\u024b\7?\2\2\u024b\u008e\3\2\2\2\u024c\u024d\7-\2"+ - "\2\u024d\u0090\3\2\2\2\u024e\u024f\7/\2\2\u024f\u0092\3\2\2\2\u0250\u0251"+ - "\7,\2\2\u0251\u0094\3\2\2\2\u0252\u0253\7\61\2\2\u0253\u0096\3\2\2\2\u0254"+ - "\u0255\7\'\2\2\u0255\u0098\3\2\2\2\u0256\u0257\7~\2\2\u0257\u0258\7~\2"+ - "\2\u0258\u009a\3\2\2\2\u0259\u025a\7\60\2\2\u025a\u009c\3\2\2\2\u025b"+ - "\u0261\7)\2\2\u025c\u0260\n\2\2\2\u025d\u025e\7)\2\2\u025e\u0260\7)\2"+ - "\2\u025f\u025c\3\2\2\2\u025f\u025d\3\2\2\2\u0260\u0263\3\2\2\2\u0261\u025f"+ - "\3\2\2\2\u0261\u0262\3\2\2\2\u0262\u0264\3\2\2\2\u0263\u0261\3\2\2\2\u0264"+ - "\u0265\7)\2\2\u0265\u009e\3\2\2\2\u0266\u0268\5\u00adW\2\u0267\u0266\3"+ - "\2\2\2\u0268\u0269\3\2\2\2\u0269\u0267\3\2\2\2\u0269\u026a\3\2\2\2\u026a"+ - "\u00a0\3\2\2\2\u026b\u026d\5\u00adW\2\u026c\u026b\3\2\2\2\u026d\u026e"+ - "\3\2\2\2\u026e\u026c\3\2\2\2\u026e\u026f\3\2\2\2\u026f\u0270\3\2\2\2\u0270"+ - "\u0274\5\u009bN\2\u0271\u0273\5\u00adW\2\u0272\u0271\3\2\2\2\u0273\u0276"+ - "\3\2\2\2\u0274\u0272\3\2\2\2\u0274\u0275\3\2\2\2\u0275\u0296\3\2\2\2\u0276"+ - "\u0274\3\2\2\2\u0277\u0279\5\u009bN\2\u0278\u027a\5\u00adW\2\u0279\u0278"+ - "\3\2\2\2\u027a\u027b\3\2\2\2\u027b\u0279\3\2\2\2\u027b\u027c\3\2\2\2\u027c"+ - "\u0296\3\2\2\2\u027d\u027f\5\u00adW\2\u027e\u027d\3\2\2\2\u027f\u0280"+ - "\3\2\2\2\u0280\u027e\3\2\2\2\u0280\u0281\3\2\2\2\u0281\u0289\3\2\2\2\u0282"+ - "\u0286\5\u009bN\2\u0283\u0285\5\u00adW\2\u0284\u0283\3\2\2\2\u0285\u0288"+ - "\3\2\2\2\u0286\u0284\3\2\2\2\u0286\u0287\3\2\2\2\u0287\u028a\3\2\2\2\u0288"+ - "\u0286\3\2\2\2\u0289\u0282\3\2\2\2\u0289\u028a\3\2\2\2\u028a\u028b\3\2"+ - "\2\2\u028b\u028c\5\u00abV\2\u028c\u0296\3\2\2\2\u028d\u028f\5\u009bN\2"+ - "\u028e\u0290\5\u00adW\2\u028f\u028e\3\2\2\2\u0290\u0291\3\2\2\2\u0291"+ - "\u028f\3\2\2\2\u0291\u0292\3\2\2\2\u0292\u0293\3\2\2\2\u0293\u0294\5\u00ab"+ - "V\2\u0294\u0296\3\2\2\2\u0295\u026c\3\2\2\2\u0295\u0277\3\2\2\2\u0295"+ - "\u027e\3\2\2\2\u0295\u028d\3\2\2\2\u0296\u00a2\3\2\2\2\u0297\u029a\5\u00af"+ - "X\2\u0298\u029a\7a\2\2\u0299\u0297\3\2\2\2\u0299\u0298\3\2\2\2\u029a\u02a0"+ - "\3\2\2\2\u029b\u029f\5\u00afX\2\u029c\u029f\5\u00adW\2\u029d\u029f\t\3"+ - "\2\2\u029e\u029b\3\2\2\2\u029e\u029c\3\2\2\2\u029e\u029d\3\2\2\2\u029f"+ - "\u02a2\3\2\2\2\u02a0\u029e\3\2\2\2\u02a0\u02a1\3\2\2\2\u02a1\u00a4\3\2"+ - "\2\2\u02a2\u02a0\3\2\2\2\u02a3\u02a7\5\u00adW\2\u02a4\u02a8\5\u00afX\2"+ - "\u02a5\u02a8\5\u00adW\2\u02a6\u02a8\t\3\2\2\u02a7\u02a4\3\2\2\2\u02a7"+ - "\u02a5\3\2\2\2\u02a7\u02a6\3\2\2\2\u02a8\u02a9\3\2\2\2\u02a9\u02a7\3\2"+ - "\2\2\u02a9\u02aa\3\2\2\2\u02aa\u00a6\3\2\2\2\u02ab\u02b1\7$\2\2\u02ac"+ - "\u02b0\n\4\2\2\u02ad\u02ae\7$\2\2\u02ae\u02b0\7$\2\2\u02af\u02ac\3\2\2"+ - "\2\u02af\u02ad\3\2\2\2\u02b0\u02b3\3\2\2\2\u02b1\u02af\3\2\2\2\u02b1\u02b2"+ - "\3\2\2\2\u02b2\u02b4\3\2\2\2\u02b3\u02b1\3\2\2\2\u02b4\u02b5\7$\2\2\u02b5"+ - "\u00a8\3\2\2\2\u02b6\u02bc\7b\2\2\u02b7\u02bb\n\5\2\2\u02b8\u02b9\7b\2"+ - "\2\u02b9\u02bb\7b\2\2\u02ba\u02b7\3\2\2\2\u02ba\u02b8\3\2\2\2\u02bb\u02be"+ - "\3\2\2\2\u02bc\u02ba\3\2\2\2\u02bc\u02bd\3\2\2\2\u02bd\u02bf\3\2\2\2\u02be"+ - "\u02bc\3\2\2\2\u02bf\u02c0\7b\2\2\u02c0\u00aa\3\2\2\2\u02c1\u02c3\7G\2"+ - "\2\u02c2\u02c4\t\6\2\2\u02c3\u02c2\3\2\2\2\u02c3\u02c4\3\2\2\2\u02c4\u02c6"+ - "\3\2\2\2\u02c5\u02c7\5\u00adW\2\u02c6\u02c5\3\2\2\2\u02c7\u02c8\3\2\2"+ - "\2\u02c8\u02c6\3\2\2\2\u02c8\u02c9\3\2\2\2\u02c9\u00ac\3\2\2\2\u02ca\u02cb"+ - "\t\7\2\2\u02cb\u00ae\3\2\2\2\u02cc\u02cd\t\b\2\2\u02cd\u00b0\3\2\2\2\u02ce"+ - "\u02cf\7/\2\2\u02cf\u02d0\7/\2\2\u02d0\u02d4\3\2\2\2\u02d1\u02d3\n\t\2"+ - "\2\u02d2\u02d1\3\2\2\2\u02d3\u02d6\3\2\2\2\u02d4\u02d2\3\2\2\2\u02d4\u02d5"+ - "\3\2\2\2\u02d5\u02d8\3\2\2\2\u02d6\u02d4\3\2\2\2\u02d7\u02d9\7\17\2\2"+ - "\u02d8\u02d7\3\2\2\2\u02d8\u02d9\3\2\2\2\u02d9\u02db\3\2\2\2\u02da\u02dc"+ - "\7\f\2\2\u02db\u02da\3\2\2\2\u02db\u02dc\3\2\2\2\u02dc\u02dd\3\2\2\2\u02dd"+ - "\u02de\bY\2\2\u02de\u00b2\3\2\2\2\u02df\u02e0\7\61\2\2\u02e0\u02e1\7,"+ - "\2\2\u02e1\u02e6\3\2\2\2\u02e2\u02e5\5\u00b3Z\2\u02e3\u02e5\13\2\2\2\u02e4"+ - "\u02e2\3\2\2\2\u02e4\u02e3\3\2\2\2\u02e5\u02e8\3\2\2\2\u02e6\u02e7\3\2"+ - "\2\2\u02e6\u02e4\3\2\2\2\u02e7\u02e9\3\2\2\2\u02e8\u02e6\3\2\2\2\u02e9"+ - "\u02ea\7,\2\2\u02ea\u02eb\7\61\2\2\u02eb\u02ec\3\2\2\2\u02ec\u02ed\bZ"+ - "\2\2\u02ed\u00b4\3\2\2\2\u02ee\u02f0\t\n\2\2\u02ef\u02ee\3\2\2\2\u02f0"+ - "\u02f1\3\2\2\2\u02f1\u02ef\3\2\2\2\u02f1\u02f2\3\2\2\2\u02f2\u02f3\3\2"+ - "\2\2\u02f3\u02f4\b[\2\2\u02f4\u00b6\3\2\2\2\u02f5\u02f6\13\2\2\2\u02f6"+ - "\u00b8\3\2\2\2 \2\u0240\u025f\u0261\u0269\u026e\u0274\u027b\u0280\u0286"+ - "\u0289\u0291\u0295\u0299\u029e\u02a0\u02a7\u02a9\u02af\u02b1\u02ba\u02bc"+ - "\u02c3\u02c8\u02d4\u02d8\u02db\u02e4\u02e6\u02f1\3\2\3\2"; + "\4U\tU\4V\tV\4W\tW\4X\tX\4Y\tY\4Z\tZ\4[\t[\4\\\t\\\4]\t]\3\2\3\2\3\3\3"+ + "\3\3\4\3\4\3\5\3\5\3\5\3\5\3\6\3\6\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\7\3\7\3\7\3\b\3\b\3\b\3\b\3\t\3\t\3\t\3\t\3\n\3\n\3\n\3"+ + "\13\3\13\3\13\3\13\3\f\3\f\3\f\3\f\3\f\3\f\3\f\3\f\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\17\3\17\3\20\3\20\3"+ + "\20\3\20\3\20\3\20\3\21\3\21\3\21\3\21\3\21\3\22\3\22\3\22\3\22\3\22\3"+ + "\22\3\22\3\22\3\22\3\23\3\23\3\23\3\23\3\23\3\23\3\23\3\23\3\23\3\24\3"+ + "\24\3\24\3\24\3\24\3\24\3\24\3\25\3\25\3\25\3\25\3\25\3\25\3\25\3\25\3"+ + "\25\3\25\3\25\3\26\3\26\3\26\3\26\3\26\3\26\3\26\3\27\3\27\3\27\3\27\3"+ + "\27\3\27\3\27\3\27\3\30\3\30\3\30\3\30\3\30\3\30\3\30\3\30\3\31\3\31\3"+ + "\31\3\31\3\31\3\31\3\32\3\32\3\32\3\32\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\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\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\60\3\60\3\60\3\60\3\60\3\60\3\61\3\61\3\61\3\61\3\61\3\61"+ + "\3\62\3\62\3\62\3\62\3\62\3\62\3\62\3\63\3\63\3\63\3\63\3\63\3\63\3\63"+ + "\3\63\3\63\3\64\3\64\3\64\3\64\3\64\3\65\3\65\3\65\3\65\3\65\3\65\3\66"+ + "\3\66\3\66\3\66\3\66\3\66\3\67\3\67\3\67\3\67\3\67\3\67\38\38\38\38\3"+ + "8\38\38\38\39\39\39\39\39\39\39\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@\3A\3A\3A\3A\3A\3B\3B\3C\3C\3C\3C\3C\3C\3C\5C\u0243\n"+ + "C\3D\3D\3E\3E\3E\3F\3F\3G\3G\3G\3H\3H\3I\3I\3J\3J\3K\3K\3L\3L\3M\3M\3"+ + "M\3N\3N\3O\3O\3O\3O\7O\u0262\nO\fO\16O\u0265\13O\3O\3O\3P\6P\u026a\nP"+ + "\rP\16P\u026b\3Q\6Q\u026f\nQ\rQ\16Q\u0270\3Q\3Q\7Q\u0275\nQ\fQ\16Q\u0278"+ + "\13Q\3Q\3Q\6Q\u027c\nQ\rQ\16Q\u027d\3Q\6Q\u0281\nQ\rQ\16Q\u0282\3Q\3Q"+ + "\7Q\u0287\nQ\fQ\16Q\u028a\13Q\5Q\u028c\nQ\3Q\3Q\3Q\3Q\6Q\u0292\nQ\rQ\16"+ + "Q\u0293\3Q\3Q\5Q\u0298\nQ\3R\3R\5R\u029c\nR\3R\3R\3R\7R\u02a1\nR\fR\16"+ + "R\u02a4\13R\3S\3S\3S\3S\6S\u02aa\nS\rS\16S\u02ab\3T\3T\3T\3T\6T\u02b2"+ + "\nT\rT\16T\u02b3\3U\3U\3U\3U\7U\u02ba\nU\fU\16U\u02bd\13U\3U\3U\3V\3V"+ + "\3V\3V\7V\u02c5\nV\fV\16V\u02c8\13V\3V\3V\3W\3W\5W\u02ce\nW\3W\6W\u02d1"+ + "\nW\rW\16W\u02d2\3X\3X\3Y\3Y\3Z\3Z\3Z\3Z\7Z\u02dd\nZ\fZ\16Z\u02e0\13Z"+ + "\3Z\5Z\u02e3\nZ\3Z\5Z\u02e6\nZ\3Z\3Z\3[\3[\3[\3[\3[\7[\u02ef\n[\f[\16"+ + "[\u02f2\13[\3[\3[\3[\3[\3[\3\\\6\\\u02fa\n\\\r\\\16\\\u02fb\3\\\3\\\3"+ + "]\3]\3\u02f0\2^\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\64"+ + "g\65i\66k\67m8o9q:s;u{?}@\177A\u0081B\u0083C\u0085D\u0087E\u0089"+ + "F\u008bG\u008dH\u008fI\u0091J\u0093K\u0095L\u0097M\u0099N\u009bO\u009d"+ + "P\u009fQ\u00a1R\u00a3S\u00a5T\u00a7U\u00a9V\u00abW\u00ad\2\u00af\2\u00b1"+ + "\2\u00b3X\u00b5Y\u00b7Z\u00b9[\3\2\f\3\2))\4\2BBaa\5\2<\3\2\2\2\u0173\u0174\7J\2\2\u0174\u0175\7C\2\2\u0175"+ + "\u0176\7X\2\2\u0176\u0177\7K\2\2\u0177\u0178\7P\2\2\u0178\u0179\7I\2\2"+ + "\u0179@\3\2\2\2\u017a\u017b\7K\2\2\u017b\u017c\7P\2\2\u017cB\3\2\2\2\u017d"+ + "\u017e\7K\2\2\u017e\u017f\7P\2\2\u017f\u0180\7P\2\2\u0180\u0181\7G\2\2"+ + "\u0181\u0182\7T\2\2\u0182D\3\2\2\2\u0183\u0184\7K\2\2\u0184\u0185\7U\2"+ + "\2\u0185F\3\2\2\2\u0186\u0187\7L\2\2\u0187\u0188\7Q\2\2\u0188\u0189\7"+ + "K\2\2\u0189\u018a\7P\2\2\u018aH\3\2\2\2\u018b\u018c\7N\2\2\u018c\u018d"+ + "\7G\2\2\u018d\u018e\7H\2\2\u018e\u018f\7V\2\2\u018fJ\3\2\2\2\u0190\u0191"+ + "\7N\2\2\u0191\u0192\7K\2\2\u0192\u0193\7M\2\2\u0193\u0194\7G\2\2\u0194"+ + "L\3\2\2\2\u0195\u0196\7N\2\2\u0196\u0197\7K\2\2\u0197\u0198\7O\2\2\u0198"+ + "\u0199\7K\2\2\u0199\u019a\7V\2\2\u019aN\3\2\2\2\u019b\u019c\7O\2\2\u019c"+ + "\u019d\7C\2\2\u019d\u019e\7R\2\2\u019e\u019f\7R\2\2\u019f\u01a0\7G\2\2"+ + "\u01a0\u01a1\7F\2\2\u01a1P\3\2\2\2\u01a2\u01a3\7O\2\2\u01a3\u01a4\7C\2"+ + "\2\u01a4\u01a5\7V\2\2\u01a5\u01a6\7E\2\2\u01a6\u01a7\7J\2\2\u01a7R\3\2"+ + "\2\2\u01a8\u01a9\7P\2\2\u01a9\u01aa\7C\2\2\u01aa\u01ab\7V\2\2\u01ab\u01ac"+ + "\7W\2\2\u01ac\u01ad\7T\2\2\u01ad\u01ae\7C\2\2\u01ae\u01af\7N\2\2\u01af"+ + "T\3\2\2\2\u01b0\u01b1\7P\2\2\u01b1\u01b2\7Q\2\2\u01b2\u01b3\7V\2\2\u01b3"+ + "V\3\2\2\2\u01b4\u01b5\7P\2\2\u01b5\u01b6\7W\2\2\u01b6\u01b7\7N\2\2\u01b7"+ + "\u01b8\7N\2\2\u01b8X\3\2\2\2\u01b9\u01ba\7Q\2\2\u01ba\u01bb\7P\2\2\u01bb"+ + "Z\3\2\2\2\u01bc\u01bd\7Q\2\2\u01bd\u01be\7R\2\2\u01be\u01bf\7V\2\2\u01bf"+ + "\u01c0\7K\2\2\u01c0\u01c1\7O\2\2\u01c1\u01c2\7K\2\2\u01c2\u01c3\7\\\2"+ + "\2\u01c3\u01c4\7G\2\2\u01c4\u01c5\7F\2\2\u01c5\\\3\2\2\2\u01c6\u01c7\7"+ + "Q\2\2\u01c7\u01c8\7T\2\2\u01c8^\3\2\2\2\u01c9\u01ca\7Q\2\2\u01ca\u01cb"+ + "\7T\2\2\u01cb\u01cc\7F\2\2\u01cc\u01cd\7G\2\2\u01cd\u01ce\7T\2\2\u01ce"+ + "`\3\2\2\2\u01cf\u01d0\7Q\2\2\u01d0\u01d1\7W\2\2\u01d1\u01d2\7V\2\2\u01d2"+ + "\u01d3\7G\2\2\u01d3\u01d4\7T\2\2\u01d4b\3\2\2\2\u01d5\u01d6\7R\2\2\u01d6"+ + "\u01d7\7C\2\2\u01d7\u01d8\7T\2\2\u01d8\u01d9\7U\2\2\u01d9\u01da\7G\2\2"+ + "\u01da\u01db\7F\2\2\u01dbd\3\2\2\2\u01dc\u01dd\7R\2\2\u01dd\u01de\7J\2"+ + "\2\u01de\u01df\7[\2\2\u01df\u01e0\7U\2\2\u01e0\u01e1\7K\2\2\u01e1\u01e2"+ + "\7E\2\2\u01e2\u01e3\7C\2\2\u01e3\u01e4\7N\2\2\u01e4f\3\2\2\2\u01e5\u01e6"+ + "\7R\2\2\u01e6\u01e7\7N\2\2\u01e7\u01e8\7C\2\2\u01e8\u01e9\7P\2\2\u01e9"+ + "h\3\2\2\2\u01ea\u01eb\7S\2\2\u01eb\u01ec\7W\2\2\u01ec\u01ed\7G\2\2\u01ed"+ + "\u01ee\7T\2\2\u01ee\u01ef\7[\2\2\u01efj\3\2\2\2\u01f0\u01f1\7T\2\2\u01f1"+ + "\u01f2\7K\2\2\u01f2\u01f3\7I\2\2\u01f3\u01f4\7J\2\2\u01f4\u01f5\7V\2\2"+ + "\u01f5l\3\2\2\2\u01f6\u01f7\7T\2\2\u01f7\u01f8\7N\2\2\u01f8\u01f9\7K\2"+ + "\2\u01f9\u01fa\7M\2\2\u01fa\u01fb\7G\2\2\u01fbn\3\2\2\2\u01fc\u01fd\7"+ + "U\2\2\u01fd\u01fe\7E\2\2\u01fe\u01ff\7J\2\2\u01ff\u0200\7G\2\2\u0200\u0201"+ + "\7O\2\2\u0201\u0202\7C\2\2\u0202\u0203\7U\2\2\u0203p\3\2\2\2\u0204\u0205"+ + "\7U\2\2\u0205\u0206\7G\2\2\u0206\u0207\7N\2\2\u0207\u0208\7G\2\2\u0208"+ + "\u0209\7E\2\2\u0209\u020a\7V\2\2\u020ar\3\2\2\2\u020b\u020c\7U\2\2\u020c"+ + "\u020d\7J\2\2\u020d\u020e\7Q\2\2\u020e\u020f\7Y\2\2\u020ft\3\2\2\2\u0210"+ + "\u0211\7V\2\2\u0211\u0212\7C\2\2\u0212\u0213\7D\2\2\u0213\u0214\7N\2\2"+ + "\u0214\u0215\7G\2\2\u0215\u0216\7U\2\2\u0216v\3\2\2\2\u0217\u0218\7V\2"+ + "\2\u0218\u0219\7G\2\2\u0219\u021a\7Z\2\2\u021a\u021b\7V\2\2\u021bx\3\2"+ + "\2\2\u021c\u021d\7V\2\2\u021d\u021e\7T\2\2\u021e\u021f\7W\2\2\u021f\u0220"+ + "\7G\2\2\u0220z\3\2\2\2\u0221\u0222\7W\2\2\u0222\u0223\7U\2\2\u0223\u0224"+ + "\7K\2\2\u0224\u0225\7P\2\2\u0225\u0226\7I\2\2\u0226|\3\2\2\2\u0227\u0228"+ + "\7X\2\2\u0228\u0229\7G\2\2\u0229\u022a\7T\2\2\u022a\u022b\7K\2\2\u022b"+ + "\u022c\7H\2\2\u022c\u022d\7[\2\2\u022d~\3\2\2\2\u022e\u022f\7Y\2\2\u022f"+ + "\u0230\7J\2\2\u0230\u0231\7G\2\2\u0231\u0232\7T\2\2\u0232\u0233\7G\2\2"+ + "\u0233\u0080\3\2\2\2\u0234\u0235\7Y\2\2\u0235\u0236\7K\2\2\u0236\u0237"+ + "\7V\2\2\u0237\u0238\7J\2\2\u0238\u0082\3\2\2\2\u0239\u023a\7?\2\2\u023a"+ + "\u0084\3\2\2\2\u023b\u023c\7>\2\2\u023c\u0243\7@\2\2\u023d\u023e\7#\2"+ + "\2\u023e\u0243\7?\2\2\u023f\u0240\7>\2\2\u0240\u0241\7?\2\2\u0241\u0243"+ + "\7@\2\2\u0242\u023b\3\2\2\2\u0242\u023d\3\2\2\2\u0242\u023f\3\2\2\2\u0243"+ + "\u0086\3\2\2\2\u0244\u0245\7>\2\2\u0245\u0088\3\2\2\2\u0246\u0247\7>\2"+ + "\2\u0247\u0248\7?\2\2\u0248\u008a\3\2\2\2\u0249\u024a\7@\2\2\u024a\u008c"+ + "\3\2\2\2\u024b\u024c\7@\2\2\u024c\u024d\7?\2\2\u024d\u008e\3\2\2\2\u024e"+ + "\u024f\7-\2\2\u024f\u0090\3\2\2\2\u0250\u0251\7/\2\2\u0251\u0092\3\2\2"+ + "\2\u0252\u0253\7,\2\2\u0253\u0094\3\2\2\2\u0254\u0255\7\61\2\2\u0255\u0096"+ + "\3\2\2\2\u0256\u0257\7\'\2\2\u0257\u0098\3\2\2\2\u0258\u0259\7~\2\2\u0259"+ + "\u025a\7~\2\2\u025a\u009a\3\2\2\2\u025b\u025c\7\60\2\2\u025c\u009c\3\2"+ + "\2\2\u025d\u0263\7)\2\2\u025e\u0262\n\2\2\2\u025f\u0260\7)\2\2\u0260\u0262"+ + "\7)\2\2\u0261\u025e\3\2\2\2\u0261\u025f\3\2\2\2\u0262\u0265\3\2\2\2\u0263"+ + "\u0261\3\2\2\2\u0263\u0264\3\2\2\2\u0264\u0266\3\2\2\2\u0265\u0263\3\2"+ + "\2\2\u0266\u0267\7)\2\2\u0267\u009e\3\2\2\2\u0268\u026a\5\u00afX\2\u0269"+ + "\u0268\3\2\2\2\u026a\u026b\3\2\2\2\u026b\u0269\3\2\2\2\u026b\u026c\3\2"+ + "\2\2\u026c\u00a0\3\2\2\2\u026d\u026f\5\u00afX\2\u026e\u026d\3\2\2\2\u026f"+ + "\u0270\3\2\2\2\u0270\u026e\3\2\2\2\u0270\u0271\3\2\2\2\u0271\u0272\3\2"+ + "\2\2\u0272\u0276\5\u009bN\2\u0273\u0275\5\u00afX\2\u0274\u0273\3\2\2\2"+ + "\u0275\u0278\3\2\2\2\u0276\u0274\3\2\2\2\u0276\u0277\3\2\2\2\u0277\u0298"+ + "\3\2\2\2\u0278\u0276\3\2\2\2\u0279\u027b\5\u009bN\2\u027a\u027c\5\u00af"+ + "X\2\u027b\u027a\3\2\2\2\u027c\u027d\3\2\2\2\u027d\u027b\3\2\2\2\u027d"+ + "\u027e\3\2\2\2\u027e\u0298\3\2\2\2\u027f\u0281\5\u00afX\2\u0280\u027f"+ + "\3\2\2\2\u0281\u0282\3\2\2\2\u0282\u0280\3\2\2\2\u0282\u0283\3\2\2\2\u0283"+ + "\u028b\3\2\2\2\u0284\u0288\5\u009bN\2\u0285\u0287\5\u00afX\2\u0286\u0285"+ + "\3\2\2\2\u0287\u028a\3\2\2\2\u0288\u0286\3\2\2\2\u0288\u0289\3\2\2\2\u0289"+ + "\u028c\3\2\2\2\u028a\u0288\3\2\2\2\u028b\u0284\3\2\2\2\u028b\u028c\3\2"+ + "\2\2\u028c\u028d\3\2\2\2\u028d\u028e\5\u00adW\2\u028e\u0298\3\2\2\2\u028f"+ + "\u0291\5\u009bN\2\u0290\u0292\5\u00afX\2\u0291\u0290\3\2\2\2\u0292\u0293"+ + "\3\2\2\2\u0293\u0291\3\2\2\2\u0293\u0294\3\2\2\2\u0294\u0295\3\2\2\2\u0295"+ + "\u0296\5\u00adW\2\u0296\u0298\3\2\2\2\u0297\u026e\3\2\2\2\u0297\u0279"+ + "\3\2\2\2\u0297\u0280\3\2\2\2\u0297\u028f\3\2\2\2\u0298\u00a2\3\2\2\2\u0299"+ + "\u029c\5\u00b1Y\2\u029a\u029c\7a\2\2\u029b\u0299\3\2\2\2\u029b\u029a\3"+ + "\2\2\2\u029c\u02a2\3\2\2\2\u029d\u02a1\5\u00b1Y\2\u029e\u02a1\5\u00af"+ + "X\2\u029f\u02a1\t\3\2\2\u02a0\u029d\3\2\2\2\u02a0\u029e\3\2\2\2\u02a0"+ + "\u029f\3\2\2\2\u02a1\u02a4\3\2\2\2\u02a2\u02a0\3\2\2\2\u02a2\u02a3\3\2"+ + "\2\2\u02a3\u00a4\3\2\2\2\u02a4\u02a2\3\2\2\2\u02a5\u02a9\5\u00afX\2\u02a6"+ + "\u02aa\5\u00b1Y\2\u02a7\u02aa\5\u00afX\2\u02a8\u02aa\t\4\2\2\u02a9\u02a6"+ + "\3\2\2\2\u02a9\u02a7\3\2\2\2\u02a9\u02a8\3\2\2\2\u02aa\u02ab\3\2\2\2\u02ab"+ + "\u02a9\3\2\2\2\u02ab\u02ac\3\2\2\2\u02ac\u00a6\3\2\2\2\u02ad\u02b2\5\u00b1"+ + "Y\2\u02ae\u02b2\5\u00afX\2\u02af\u02b2\t\3\2\2\u02b0\u02b2\5\u0093J\2"+ + "\u02b1\u02ad\3\2\2\2\u02b1\u02ae\3\2\2\2\u02b1\u02af\3\2\2\2\u02b1\u02b0"+ + "\3\2\2\2\u02b2\u02b3\3\2\2\2\u02b3\u02b1\3\2\2\2\u02b3\u02b4\3\2\2\2\u02b4"+ + "\u00a8\3\2\2\2\u02b5\u02bb\7$\2\2\u02b6\u02ba\n\5\2\2\u02b7\u02b8\7$\2"+ + "\2\u02b8\u02ba\7$\2\2\u02b9\u02b6\3\2\2\2\u02b9\u02b7\3\2\2\2\u02ba\u02bd"+ + "\3\2\2\2\u02bb\u02b9\3\2\2\2\u02bb\u02bc\3\2\2\2\u02bc\u02be\3\2\2\2\u02bd"+ + "\u02bb\3\2\2\2\u02be\u02bf\7$\2\2\u02bf\u00aa\3\2\2\2\u02c0\u02c6\7b\2"+ + "\2\u02c1\u02c5\n\6\2\2\u02c2\u02c3\7b\2\2\u02c3\u02c5\7b\2\2\u02c4\u02c1"+ + "\3\2\2\2\u02c4\u02c2\3\2\2\2\u02c5\u02c8\3\2\2\2\u02c6\u02c4\3\2\2\2\u02c6"+ + "\u02c7\3\2\2\2\u02c7\u02c9\3\2\2\2\u02c8\u02c6\3\2\2\2\u02c9\u02ca\7b"+ + "\2\2\u02ca\u00ac\3\2\2\2\u02cb\u02cd\7G\2\2\u02cc\u02ce\t\7\2\2\u02cd"+ + "\u02cc\3\2\2\2\u02cd\u02ce\3\2\2\2\u02ce\u02d0\3\2\2\2\u02cf\u02d1\5\u00af"+ + "X\2\u02d0\u02cf\3\2\2\2\u02d1\u02d2\3\2\2\2\u02d2\u02d0\3\2\2\2\u02d2"+ + "\u02d3\3\2\2\2\u02d3\u00ae\3\2\2\2\u02d4\u02d5\t\b\2\2\u02d5\u00b0\3\2"+ + "\2\2\u02d6\u02d7\t\t\2\2\u02d7\u00b2\3\2\2\2\u02d8\u02d9\7/\2\2\u02d9"+ + "\u02da\7/\2\2\u02da\u02de\3\2\2\2\u02db\u02dd\n\n\2\2\u02dc\u02db\3\2"+ + "\2\2\u02dd\u02e0\3\2\2\2\u02de\u02dc\3\2\2\2\u02de\u02df\3\2\2\2\u02df"+ + "\u02e2\3\2\2\2\u02e0\u02de\3\2\2\2\u02e1\u02e3\7\17\2\2\u02e2\u02e1\3"+ + "\2\2\2\u02e2\u02e3\3\2\2\2\u02e3\u02e5\3\2\2\2\u02e4\u02e6\7\f\2\2\u02e5"+ + "\u02e4\3\2\2\2\u02e5\u02e6\3\2\2\2\u02e6\u02e7\3\2\2\2\u02e7\u02e8\bZ"+ + "\2\2\u02e8\u00b4\3\2\2\2\u02e9\u02ea\7\61\2\2\u02ea\u02eb\7,\2\2\u02eb"+ + "\u02f0\3\2\2\2\u02ec\u02ef\5\u00b5[\2\u02ed\u02ef\13\2\2\2\u02ee\u02ec"+ + "\3\2\2\2\u02ee\u02ed\3\2\2\2\u02ef\u02f2\3\2\2\2\u02f0\u02f1\3\2\2\2\u02f0"+ + "\u02ee\3\2\2\2\u02f1\u02f3\3\2\2\2\u02f2\u02f0\3\2\2\2\u02f3\u02f4\7,"+ + "\2\2\u02f4\u02f5\7\61\2\2\u02f5\u02f6\3\2\2\2\u02f6\u02f7\b[\2\2\u02f7"+ + "\u00b6\3\2\2\2\u02f8\u02fa\t\13\2\2\u02f9\u02f8\3\2\2\2\u02fa\u02fb\3"+ + "\2\2\2\u02fb\u02f9\3\2\2\2\u02fb\u02fc\3\2\2\2\u02fc\u02fd\3\2\2\2\u02fd"+ + "\u02fe\b\\\2\2\u02fe\u00b8\3\2\2\2\u02ff\u0300\13\2\2\2\u0300\u00ba\3"+ + "\2\2\2\"\2\u0242\u0261\u0263\u026b\u0270\u0276\u027d\u0282\u0288\u028b"+ + "\u0293\u0297\u029b\u02a0\u02a2\u02a9\u02ab\u02b1\u02b3\u02b9\u02bb\u02c4"+ + "\u02c6\u02cd\u02d2\u02de\u02e2\u02e5\u02ee\u02f0\u02fb\3\2\3\2"; public static final ATN _ATN = new ATNDeserializer().deserialize(_serializedATN.toCharArray()); static { diff --git a/sql/server/src/main/java/org/elasticsearch/xpack/sql/parser/SqlBaseListener.java b/sql/server/src/main/java/org/elasticsearch/xpack/sql/parser/SqlBaseListener.java index 4334435e0b1..1f9bdb63a0c 100644 --- a/sql/server/src/main/java/org/elasticsearch/xpack/sql/parser/SqlBaseListener.java +++ b/sql/server/src/main/java/org/elasticsearch/xpack/sql/parser/SqlBaseListener.java @@ -700,16 +700,6 @@ interface SqlBaseListener extends ParseTreeListener { * @param ctx the parse tree */ void exitQualifiedName(SqlBaseParser.QualifiedNameContext ctx); - /** - * Enter a parse tree produced by {@link SqlBaseParser#tableIdentifier}. - * @param ctx the parse tree - */ - void enterTableIdentifier(SqlBaseParser.TableIdentifierContext ctx); - /** - * Exit a parse tree produced by {@link SqlBaseParser#tableIdentifier}. - * @param ctx the parse tree - */ - void exitTableIdentifier(SqlBaseParser.TableIdentifierContext ctx); /** * Enter a parse tree produced by {@link SqlBaseParser#identifier}. * @param ctx the parse tree @@ -720,6 +710,16 @@ interface SqlBaseListener extends ParseTreeListener { * @param ctx the parse tree */ void exitIdentifier(SqlBaseParser.IdentifierContext ctx); + /** + * Enter a parse tree produced by {@link SqlBaseParser#tableIdentifier}. + * @param ctx the parse tree + */ + void enterTableIdentifier(SqlBaseParser.TableIdentifierContext ctx); + /** + * Exit a parse tree produced by {@link SqlBaseParser#tableIdentifier}. + * @param ctx the parse tree + */ + void exitTableIdentifier(SqlBaseParser.TableIdentifierContext ctx); /** * Enter a parse tree produced by the {@code quotedIdentifier} * labeled alternative in {@link SqlBaseParser#quoteIdentifier}. diff --git a/sql/server/src/main/java/org/elasticsearch/xpack/sql/parser/SqlBaseParser.java b/sql/server/src/main/java/org/elasticsearch/xpack/sql/parser/SqlBaseParser.java index 52e68e11951..a2bad1d3bed 100644 --- a/sql/server/src/main/java/org/elasticsearch/xpack/sql/parser/SqlBaseParser.java +++ b/sql/server/src/main/java/org/elasticsearch/xpack/sql/parser/SqlBaseParser.java @@ -33,8 +33,8 @@ class SqlBaseParser extends Parser { TRUE=60, USING=61, VERIFY=62, WHERE=63, WITH=64, EQ=65, NEQ=66, LT=67, LTE=68, GT=69, GTE=70, PLUS=71, MINUS=72, ASTERISK=73, SLASH=74, PERCENT=75, CONCAT=76, DOT=77, STRING=78, INTEGER_VALUE=79, DECIMAL_VALUE=80, IDENTIFIER=81, - DIGIT_IDENTIFIER=82, QUOTED_IDENTIFIER=83, BACKQUOTED_IDENTIFIER=84, SIMPLE_COMMENT=85, - BRACKETED_COMMENT=86, WS=87, UNRECOGNIZED=88, DELIMITER=89; + DIGIT_IDENTIFIER=82, TABLE_IDENTIFIER=83, QUOTED_IDENTIFIER=84, BACKQUOTED_IDENTIFIER=85, + SIMPLE_COMMENT=86, BRACKETED_COMMENT=87, WS=88, UNRECOGNIZED=89, DELIMITER=90; public static final int RULE_singleStatement = 0, RULE_singleExpression = 1, RULE_statement = 2, RULE_query = 3, RULE_queryNoWith = 4, RULE_queryTerm = 5, RULE_orderBy = 6, @@ -45,9 +45,9 @@ class SqlBaseParser extends Parser { RULE_booleanExpression = 21, RULE_predicated = 22, RULE_predicate = 23, RULE_pattern = 24, RULE_valueExpression = 25, RULE_primaryExpression = 26, RULE_constant = 27, RULE_comparisonOperator = 28, RULE_booleanValue = 29, - RULE_dataType = 30, RULE_qualifiedName = 31, RULE_tableIdentifier = 32, - RULE_identifier = 33, RULE_quoteIdentifier = 34, RULE_unquoteIdentifier = 35, - RULE_number = 36, RULE_nonReserved = 37; + RULE_dataType = 30, RULE_qualifiedName = 31, RULE_identifier = 32, RULE_tableIdentifier = 33, + RULE_quoteIdentifier = 34, RULE_unquoteIdentifier = 35, RULE_number = 36, + RULE_nonReserved = 37; public static final String[] ruleNames = { "singleStatement", "singleExpression", "statement", "query", "queryNoWith", "queryTerm", "orderBy", "querySpecification", "fromClause", "groupBy", @@ -55,7 +55,7 @@ class SqlBaseParser extends Parser { "selectItem", "relation", "joinRelation", "joinType", "joinCriteria", "relationPrimary", "expression", "booleanExpression", "predicated", "predicate", "pattern", "valueExpression", "primaryExpression", "constant", "comparisonOperator", - "booleanValue", "dataType", "qualifiedName", "tableIdentifier", "identifier", + "booleanValue", "dataType", "qualifiedName", "identifier", "tableIdentifier", "quoteIdentifier", "unquoteIdentifier", "number", "nonReserved" }; @@ -83,8 +83,8 @@ class SqlBaseParser extends Parser { "TABLES", "TEXT", "TRUE", "USING", "VERIFY", "WHERE", "WITH", "EQ", "NEQ", "LT", "LTE", "GT", "GTE", "PLUS", "MINUS", "ASTERISK", "SLASH", "PERCENT", "CONCAT", "DOT", "STRING", "INTEGER_VALUE", "DECIMAL_VALUE", "IDENTIFIER", - "DIGIT_IDENTIFIER", "QUOTED_IDENTIFIER", "BACKQUOTED_IDENTIFIER", "SIMPLE_COMMENT", - "BRACKETED_COMMENT", "WS", "UNRECOGNIZED", "DELIMITER" + "DIGIT_IDENTIFIER", "TABLE_IDENTIFIER", "QUOTED_IDENTIFIER", "BACKQUOTED_IDENTIFIER", + "SIMPLE_COMMENT", "BRACKETED_COMMENT", "WS", "UNRECOGNIZED", "DELIMITER" }; public static final Vocabulary VOCABULARY = new VocabularyImpl(_LITERAL_NAMES, _SYMBOLIC_NAMES); @@ -4024,50 +4024,6 @@ class SqlBaseParser extends Parser { return _localctx; } - public static class TableIdentifierContext extends ParserRuleContext { - public IdentifierContext identifier() { - return getRuleContext(IdentifierContext.class,0); - } - public TableIdentifierContext(ParserRuleContext parent, int invokingState) { - super(parent, invokingState); - } - @Override public int getRuleIndex() { return RULE_tableIdentifier; } - @Override - public void enterRule(ParseTreeListener listener) { - if ( listener instanceof SqlBaseListener ) ((SqlBaseListener)listener).enterTableIdentifier(this); - } - @Override - public void exitRule(ParseTreeListener listener) { - if ( listener instanceof SqlBaseListener ) ((SqlBaseListener)listener).exitTableIdentifier(this); - } - @Override - public T accept(ParseTreeVisitor visitor) { - if ( visitor instanceof SqlBaseVisitor ) return ((SqlBaseVisitor)visitor).visitTableIdentifier(this); - else return visitor.visitChildren(this); - } - } - - public final TableIdentifierContext tableIdentifier() throws RecognitionException { - TableIdentifierContext _localctx = new TableIdentifierContext(_ctx, getState()); - enterRule(_localctx, 64, RULE_tableIdentifier); - try { - enterOuterAlt(_localctx, 1); - { - setState(559); - identifier(); - } - } - catch (RecognitionException re) { - _localctx.exception = re; - _errHandler.reportError(this, re); - _errHandler.recover(this, re); - } - finally { - exitRule(); - } - return _localctx; - } - public static class IdentifierContext extends ParserRuleContext { public QuoteIdentifierContext quoteIdentifier() { return getRuleContext(QuoteIdentifierContext.class,0); @@ -4096,15 +4052,15 @@ class SqlBaseParser extends Parser { public final IdentifierContext identifier() throws RecognitionException { IdentifierContext _localctx = new IdentifierContext(_ctx, getState()); - enterRule(_localctx, 66, RULE_identifier); + enterRule(_localctx, 64, RULE_identifier); try { - setState(563); + setState(561); switch (_input.LA(1)) { case QUOTED_IDENTIFIER: case BACKQUOTED_IDENTIFIER: enterOuterAlt(_localctx, 1); { - setState(561); + setState(559); quoteIdentifier(); } break; @@ -4133,7 +4089,7 @@ class SqlBaseParser extends Parser { case DIGIT_IDENTIFIER: enterOuterAlt(_localctx, 2); { - setState(562); + setState(560); unquoteIdentifier(); } break; @@ -4152,6 +4108,89 @@ class SqlBaseParser extends Parser { return _localctx; } + public static class TableIdentifierContext extends ParserRuleContext { + public TerminalNode TABLE_IDENTIFIER() { return getToken(SqlBaseParser.TABLE_IDENTIFIER, 0); } + public IdentifierContext identifier() { + return getRuleContext(IdentifierContext.class,0); + } + public TableIdentifierContext(ParserRuleContext parent, int invokingState) { + super(parent, invokingState); + } + @Override public int getRuleIndex() { return RULE_tableIdentifier; } + @Override + public void enterRule(ParseTreeListener listener) { + if ( listener instanceof SqlBaseListener ) ((SqlBaseListener)listener).enterTableIdentifier(this); + } + @Override + public void exitRule(ParseTreeListener listener) { + if ( listener instanceof SqlBaseListener ) ((SqlBaseListener)listener).exitTableIdentifier(this); + } + @Override + public T accept(ParseTreeVisitor visitor) { + if ( visitor instanceof SqlBaseVisitor ) return ((SqlBaseVisitor)visitor).visitTableIdentifier(this); + else return visitor.visitChildren(this); + } + } + + public final TableIdentifierContext tableIdentifier() throws RecognitionException { + TableIdentifierContext _localctx = new TableIdentifierContext(_ctx, getState()); + enterRule(_localctx, 66, RULE_tableIdentifier); + try { + setState(565); + switch (_input.LA(1)) { + case TABLE_IDENTIFIER: + enterOuterAlt(_localctx, 1); + { + setState(563); + match(TABLE_IDENTIFIER); + } + break; + case ANALYZE: + case ANALYZED: + case COLUMNS: + case DEBUG: + case EXECUTABLE: + case EXPLAIN: + case FORMAT: + case FUNCTIONS: + case GRAPHVIZ: + case MAPPED: + case OPTIMIZED: + case PARSED: + case PHYSICAL: + case PLAN: + case QUERY: + case RLIKE: + case SCHEMAS: + case SHOW: + case TABLES: + case TEXT: + case VERIFY: + case IDENTIFIER: + case DIGIT_IDENTIFIER: + case QUOTED_IDENTIFIER: + case BACKQUOTED_IDENTIFIER: + enterOuterAlt(_localctx, 2); + { + setState(564); + identifier(); + } + break; + default: + throw new NoViableAltException(this); + } + } + catch (RecognitionException re) { + _localctx.exception = re; + _errHandler.reportError(this, re); + _errHandler.recover(this, re); + } + finally { + exitRule(); + } + return _localctx; + } + public static class QuoteIdentifierContext extends ParserRuleContext { public QuoteIdentifierContext(ParserRuleContext parent, int invokingState) { super(parent, invokingState); @@ -4202,13 +4241,13 @@ class SqlBaseParser extends Parser { QuoteIdentifierContext _localctx = new QuoteIdentifierContext(_ctx, getState()); enterRule(_localctx, 68, RULE_quoteIdentifier); try { - setState(567); + setState(569); switch (_input.LA(1)) { case QUOTED_IDENTIFIER: _localctx = new QuotedIdentifierContext(_localctx); enterOuterAlt(_localctx, 1); { - setState(565); + setState(567); match(QUOTED_IDENTIFIER); } break; @@ -4216,7 +4255,7 @@ class SqlBaseParser extends Parser { _localctx = new BackQuotedIdentifierContext(_localctx); enterOuterAlt(_localctx, 2); { - setState(566); + setState(568); match(BACKQUOTED_IDENTIFIER); } break; @@ -4288,13 +4327,13 @@ class SqlBaseParser extends Parser { UnquoteIdentifierContext _localctx = new UnquoteIdentifierContext(_ctx, getState()); enterRule(_localctx, 70, RULE_unquoteIdentifier); try { - setState(572); + setState(574); switch (_input.LA(1)) { case IDENTIFIER: _localctx = new UnquotedIdentifierContext(_localctx); enterOuterAlt(_localctx, 1); { - setState(569); + setState(571); match(IDENTIFIER); } break; @@ -4322,7 +4361,7 @@ class SqlBaseParser extends Parser { _localctx = new UnquotedIdentifierContext(_localctx); enterOuterAlt(_localctx, 2); { - setState(570); + setState(572); nonReserved(); } break; @@ -4330,7 +4369,7 @@ class SqlBaseParser extends Parser { _localctx = new DigitIdentifierContext(_localctx); enterOuterAlt(_localctx, 3); { - setState(571); + setState(573); match(DIGIT_IDENTIFIER); } break; @@ -4399,13 +4438,13 @@ class SqlBaseParser extends Parser { NumberContext _localctx = new NumberContext(_ctx, getState()); enterRule(_localctx, 72, RULE_number); try { - setState(576); + setState(578); switch (_input.LA(1)) { case DECIMAL_VALUE: _localctx = new DecimalLiteralContext(_localctx); enterOuterAlt(_localctx, 1); { - setState(574); + setState(576); match(DECIMAL_VALUE); } break; @@ -4413,7 +4452,7 @@ class SqlBaseParser extends Parser { _localctx = new IntegerLiteralContext(_localctx); enterOuterAlt(_localctx, 2); { - setState(575); + setState(577); match(INTEGER_VALUE); } break; @@ -4480,7 +4519,7 @@ class SqlBaseParser extends Parser { try { enterOuterAlt(_localctx, 1); { - setState(578); + setState(580); _la = _input.LA(1); if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << ANALYZE) | (1L << ANALYZED) | (1L << COLUMNS) | (1L << DEBUG) | (1L << EXECUTABLE) | (1L << EXPLAIN) | (1L << FORMAT) | (1L << FUNCTIONS) | (1L << GRAPHVIZ) | (1L << MAPPED) | (1L << OPTIMIZED) | (1L << PARSED) | (1L << PHYSICAL) | (1L << PLAN) | (1L << QUERY) | (1L << RLIKE) | (1L << SCHEMAS) | (1L << SHOW) | (1L << TABLES) | (1L << TEXT) | (1L << VERIFY))) != 0)) ) { _errHandler.recoverInline(this); @@ -4531,7 +4570,7 @@ class SqlBaseParser extends Parser { } public static final String _serializedATN = - "\3\u0430\ud6d1\u8206\uad2d\u4417\uaef1\u8d80\uaadd\3[\u0247\4\2\t\2\4"+ + "\3\u0430\ud6d1\u8206\uad2d\u4417\uaef1\u8d80\uaadd\3\\\u0249\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"+ @@ -4576,56 +4615,56 @@ class SqlBaseParser extends Parser { "\u0208\n\34\3\34\3\34\3\34\3\34\3\34\3\34\3\34\3\34\3\34\3\34\3\34\3\34"+ "\5\34\u0216\n\34\3\35\3\35\3\35\3\35\6\35\u021c\n\35\r\35\16\35\u021d"+ "\5\35\u0220\n\35\3\36\3\36\3\37\3\37\3 \3 \3!\3!\3!\7!\u022b\n!\f!\16"+ - "!\u022e\13!\3!\3!\3\"\3\"\3#\3#\5#\u0236\n#\3$\3$\5$\u023a\n$\3%\3%\3"+ - "%\5%\u023f\n%\3&\3&\5&\u0243\n&\3\'\3\'\3\'\2\4,\64(\2\4\6\b\n\f\16\20"+ - "\22\24\26\30\32\34\36 \"$&(*,.\60\62\64\668:<>@BDFHJL\2\17\b\2\6\6\b\b"+ - "\26\26))//\63\63\4\2\37\37==\4\2\b\b//\4\2\34\34\"\"\3\2\22\23\4\2\6\6"+ - "QQ\4\2\f\f\22\22\4\2\6\6\24\24\3\2IJ\3\2KM\3\2CH\4\2\32\32>>\16\2\7\b"+ - "\20\21\26\26\30\30\33\33\36\37))//\63\6689;=@@\u028e\2N\3\2\2\2\4Q\3\2"+ - "\2\2\6\u008d\3\2\2\2\b\u0098\3\2\2\2\n\u009c\3\2\2\2\f\u00b2\3\2\2\2\16"+ - "\u00b4\3\2\2\2\20\u00b8\3\2\2\2\22\u00d4\3\2\2\2\24\u00de\3\2\2\2\26\u00e8"+ - "\3\2\2\2\30\u00f7\3\2\2\2\32\u00f9\3\2\2\2\34\u00ff\3\2\2\2\36\u0101\3"+ - "\2\2\2 \u0108\3\2\2\2\"\u011a\3\2\2\2$\u012b\3\2\2\2&\u013b\3\2\2\2(\u0156"+ - "\3\2\2\2*\u0158\3\2\2\2,\u0189\3\2\2\2.\u0196\3\2\2\2\60\u01c8\3\2\2\2"+ - "\62\u01ca\3\2\2\2\64\u01d3\3\2\2\2\66\u0215\3\2\2\28\u021f\3\2\2\2:\u0221"+ - "\3\2\2\2<\u0223\3\2\2\2>\u0225\3\2\2\2@\u022c\3\2\2\2B\u0231\3\2\2\2D"+ - "\u0235\3\2\2\2F\u0239\3\2\2\2H\u023e\3\2\2\2J\u0242\3\2\2\2L\u0244\3\2"+ - "\2\2NO\5\6\4\2OP\7\2\2\3P\3\3\2\2\2QR\5*\26\2RS\7\2\2\3S\5\3\2\2\2T\u008e"+ - "\5\b\5\2Uc\7\30\2\2V_\7\3\2\2WX\7\65\2\2X^\t\2\2\2YZ\7\33\2\2Z^\t\3\2"+ - "\2[\\\7@\2\2\\^\5<\37\2]W\3\2\2\2]Y\3\2\2\2][\3\2\2\2^a\3\2\2\2_]\3\2"+ - "\2\2_`\3\2\2\2`b\3\2\2\2a_\3\2\2\2bd\7\4\2\2cV\3\2\2\2cd\3\2\2\2de\3\2"+ - "\2\2e\u008e\5\6\4\2fr\7\21\2\2gn\7\3\2\2hi\7\65\2\2im\t\4\2\2jk\7\33\2"+ - "\2km\t\3\2\2lh\3\2\2\2lj\3\2\2\2mp\3\2\2\2nl\3\2\2\2no\3\2\2\2oq\3\2\2"+ - "\2pn\3\2\2\2qs\7\4\2\2rg\3\2\2\2rs\3\2\2\2st\3\2\2\2t\u008e\5\6\4\2uv"+ - "\7;\2\2v{\7<\2\2wy\7\'\2\2xw\3\2\2\2xy\3\2\2\2yz\3\2\2\2z|\5\62\32\2{"+ - "x\3\2\2\2{|\3\2\2\2|\u008e\3\2\2\2}~\7;\2\2~\177\7\20\2\2\177\u0080\t"+ - "\5\2\2\u0080\u008e\5B\"\2\u0081\u0082\t\6\2\2\u0082\u008e\5B\"\2\u0083"+ - "\u0084\7;\2\2\u0084\u0089\7\36\2\2\u0085\u0087\7\'\2\2\u0086\u0085\3\2"+ - "\2\2\u0086\u0087\3\2\2\2\u0087\u0088\3\2\2\2\u0088\u008a\5\62\32\2\u0089"+ - "\u0086\3\2\2\2\u0089\u008a\3\2\2\2\u008a\u008e\3\2\2\2\u008b\u008c\7;"+ - "\2\2\u008c\u008e\79\2\2\u008dT\3\2\2\2\u008dU\3\2\2\2\u008df\3\2\2\2\u008d"+ - "u\3\2\2\2\u008d}\3\2\2\2\u008d\u0081\3\2\2\2\u008d\u0083\3\2\2\2\u008d"+ - "\u008b\3\2\2\2\u008e\7\3\2\2\2\u008f\u0090\7B\2\2\u0090\u0095\5\32\16"+ - "\2\u0091\u0092\7\5\2\2\u0092\u0094\5\32\16\2\u0093\u0091\3\2\2\2\u0094"+ - "\u0097\3\2\2\2\u0095\u0093\3\2\2\2\u0095\u0096\3\2\2\2\u0096\u0099\3\2"+ - "\2\2\u0097\u0095\3\2\2\2\u0098\u008f\3\2\2\2\u0098\u0099\3\2\2\2\u0099"+ - "\u009a\3\2\2\2\u009a\u009b\5\n\6\2\u009b\t\3\2\2\2\u009c\u00a7\5\f\7\2"+ - "\u009d\u009e\7\61\2\2\u009e\u009f\7\16\2\2\u009f\u00a4\5\16\b\2\u00a0"+ - "\u00a1\7\5\2\2\u00a1\u00a3\5\16\b\2\u00a2\u00a0\3\2\2\2\u00a3\u00a6\3"+ - "\2\2\2\u00a4\u00a2\3\2\2\2\u00a4\u00a5\3\2\2\2\u00a5\u00a8\3\2\2\2\u00a6"+ - "\u00a4\3\2\2\2\u00a7\u009d\3\2\2\2\u00a7\u00a8\3\2\2\2\u00a8\u00ab\3\2"+ - "\2\2\u00a9\u00aa\7(\2\2\u00aa\u00ac\t\7\2\2\u00ab\u00a9\3\2\2\2\u00ab"+ - "\u00ac\3\2\2\2\u00ac\13\3\2\2\2\u00ad\u00b3\5\20\t\2\u00ae\u00af\7\3\2"+ - "\2\u00af\u00b0\5\n\6\2\u00b0\u00b1\7\4\2\2\u00b1\u00b3\3\2\2\2\u00b2\u00ad"+ - "\3\2\2\2\u00b2\u00ae\3\2\2\2\u00b3\r\3\2\2\2\u00b4\u00b6\5*\26\2\u00b5"+ - "\u00b7\t\b\2\2\u00b6\u00b5\3\2\2\2\u00b6\u00b7\3\2\2\2\u00b7\17\3\2\2"+ - "\2\u00b8\u00ba\7:\2\2\u00b9\u00bb\5\34\17\2\u00ba\u00b9\3\2\2\2\u00ba"+ - "\u00bb\3\2\2\2\u00bb\u00bc\3\2\2\2\u00bc\u00c1\5\36\20\2\u00bd\u00be\7"+ - "\5\2\2\u00be\u00c0\5\36\20\2\u00bf\u00bd\3\2\2\2\u00c0\u00c3\3\2\2\2\u00c1"+ - "\u00bf\3\2\2\2\u00c1\u00c2\3\2\2\2\u00c2\u00c5\3\2\2\2\u00c3\u00c1\3\2"+ - "\2\2\u00c4\u00c6\5\22\n\2\u00c5\u00c4\3\2\2\2\u00c5\u00c6\3\2\2\2\u00c6"+ - "\u00c9\3\2\2\2\u00c7\u00c8\7A\2\2\u00c8\u00ca\5,\27\2\u00c9\u00c7\3\2"+ - "\2\2\u00c9\u00ca\3\2\2\2\u00ca\u00ce\3\2\2\2\u00cb\u00cc\7 \2\2\u00cc"+ + "!\u022e\13!\3!\3!\3\"\3\"\5\"\u0234\n\"\3#\3#\5#\u0238\n#\3$\3$\5$\u023c"+ + "\n$\3%\3%\3%\5%\u0241\n%\3&\3&\5&\u0245\n&\3\'\3\'\3\'\2\4,\64(\2\4\6"+ + "\b\n\f\16\20\22\24\26\30\32\34\36 \"$&(*,.\60\62\64\668:<>@BDFHJL\2\17"+ + "\b\2\6\6\b\b\26\26))//\63\63\4\2\37\37==\4\2\b\b//\4\2\34\34\"\"\3\2\22"+ + "\23\4\2\6\6QQ\4\2\f\f\22\22\4\2\6\6\24\24\3\2IJ\3\2KM\3\2CH\4\2\32\32"+ + ">>\16\2\7\b\20\21\26\26\30\30\33\33\36\37))//\63\6689;=@@\u0291\2N\3\2"+ + "\2\2\4Q\3\2\2\2\6\u008d\3\2\2\2\b\u0098\3\2\2\2\n\u009c\3\2\2\2\f\u00b2"+ + "\3\2\2\2\16\u00b4\3\2\2\2\20\u00b8\3\2\2\2\22\u00d4\3\2\2\2\24\u00de\3"+ + "\2\2\2\26\u00e8\3\2\2\2\30\u00f7\3\2\2\2\32\u00f9\3\2\2\2\34\u00ff\3\2"+ + "\2\2\36\u0101\3\2\2\2 \u0108\3\2\2\2\"\u011a\3\2\2\2$\u012b\3\2\2\2&\u013b"+ + "\3\2\2\2(\u0156\3\2\2\2*\u0158\3\2\2\2,\u0189\3\2\2\2.\u0196\3\2\2\2\60"+ + "\u01c8\3\2\2\2\62\u01ca\3\2\2\2\64\u01d3\3\2\2\2\66\u0215\3\2\2\28\u021f"+ + "\3\2\2\2:\u0221\3\2\2\2<\u0223\3\2\2\2>\u0225\3\2\2\2@\u022c\3\2\2\2B"+ + "\u0233\3\2\2\2D\u0237\3\2\2\2F\u023b\3\2\2\2H\u0240\3\2\2\2J\u0244\3\2"+ + "\2\2L\u0246\3\2\2\2NO\5\6\4\2OP\7\2\2\3P\3\3\2\2\2QR\5*\26\2RS\7\2\2\3"+ + "S\5\3\2\2\2T\u008e\5\b\5\2Uc\7\30\2\2V_\7\3\2\2WX\7\65\2\2X^\t\2\2\2Y"+ + "Z\7\33\2\2Z^\t\3\2\2[\\\7@\2\2\\^\5<\37\2]W\3\2\2\2]Y\3\2\2\2][\3\2\2"+ + "\2^a\3\2\2\2_]\3\2\2\2_`\3\2\2\2`b\3\2\2\2a_\3\2\2\2bd\7\4\2\2cV\3\2\2"+ + "\2cd\3\2\2\2de\3\2\2\2e\u008e\5\6\4\2fr\7\21\2\2gn\7\3\2\2hi\7\65\2\2"+ + "im\t\4\2\2jk\7\33\2\2km\t\3\2\2lh\3\2\2\2lj\3\2\2\2mp\3\2\2\2nl\3\2\2"+ + "\2no\3\2\2\2oq\3\2\2\2pn\3\2\2\2qs\7\4\2\2rg\3\2\2\2rs\3\2\2\2st\3\2\2"+ + "\2t\u008e\5\6\4\2uv\7;\2\2v{\7<\2\2wy\7\'\2\2xw\3\2\2\2xy\3\2\2\2yz\3"+ + "\2\2\2z|\5\62\32\2{x\3\2\2\2{|\3\2\2\2|\u008e\3\2\2\2}~\7;\2\2~\177\7"+ + "\20\2\2\177\u0080\t\5\2\2\u0080\u008e\5D#\2\u0081\u0082\t\6\2\2\u0082"+ + "\u008e\5D#\2\u0083\u0084\7;\2\2\u0084\u0089\7\36\2\2\u0085\u0087\7\'\2"+ + "\2\u0086\u0085\3\2\2\2\u0086\u0087\3\2\2\2\u0087\u0088\3\2\2\2\u0088\u008a"+ + "\5\62\32\2\u0089\u0086\3\2\2\2\u0089\u008a\3\2\2\2\u008a\u008e\3\2\2\2"+ + "\u008b\u008c\7;\2\2\u008c\u008e\79\2\2\u008dT\3\2\2\2\u008dU\3\2\2\2\u008d"+ + "f\3\2\2\2\u008du\3\2\2\2\u008d}\3\2\2\2\u008d\u0081\3\2\2\2\u008d\u0083"+ + "\3\2\2\2\u008d\u008b\3\2\2\2\u008e\7\3\2\2\2\u008f\u0090\7B\2\2\u0090"+ + "\u0095\5\32\16\2\u0091\u0092\7\5\2\2\u0092\u0094\5\32\16\2\u0093\u0091"+ + "\3\2\2\2\u0094\u0097\3\2\2\2\u0095\u0093\3\2\2\2\u0095\u0096\3\2\2\2\u0096"+ + "\u0099\3\2\2\2\u0097\u0095\3\2\2\2\u0098\u008f\3\2\2\2\u0098\u0099\3\2"+ + "\2\2\u0099\u009a\3\2\2\2\u009a\u009b\5\n\6\2\u009b\t\3\2\2\2\u009c\u00a7"+ + "\5\f\7\2\u009d\u009e\7\61\2\2\u009e\u009f\7\16\2\2\u009f\u00a4\5\16\b"+ + "\2\u00a0\u00a1\7\5\2\2\u00a1\u00a3\5\16\b\2\u00a2\u00a0\3\2\2\2\u00a3"+ + "\u00a6\3\2\2\2\u00a4\u00a2\3\2\2\2\u00a4\u00a5\3\2\2\2\u00a5\u00a8\3\2"+ + "\2\2\u00a6\u00a4\3\2\2\2\u00a7\u009d\3\2\2\2\u00a7\u00a8\3\2\2\2\u00a8"+ + "\u00ab\3\2\2\2\u00a9\u00aa\7(\2\2\u00aa\u00ac\t\7\2\2\u00ab\u00a9\3\2"+ + "\2\2\u00ab\u00ac\3\2\2\2\u00ac\13\3\2\2\2\u00ad\u00b3\5\20\t\2\u00ae\u00af"+ + "\7\3\2\2\u00af\u00b0\5\n\6\2\u00b0\u00b1\7\4\2\2\u00b1\u00b3\3\2\2\2\u00b2"+ + "\u00ad\3\2\2\2\u00b2\u00ae\3\2\2\2\u00b3\r\3\2\2\2\u00b4\u00b6\5*\26\2"+ + "\u00b5\u00b7\t\b\2\2\u00b6\u00b5\3\2\2\2\u00b6\u00b7\3\2\2\2\u00b7\17"+ + "\3\2\2\2\u00b8\u00ba\7:\2\2\u00b9\u00bb\5\34\17\2\u00ba\u00b9\3\2\2\2"+ + "\u00ba\u00bb\3\2\2\2\u00bb\u00bc\3\2\2\2\u00bc\u00c1\5\36\20\2\u00bd\u00be"+ + "\7\5\2\2\u00be\u00c0\5\36\20\2\u00bf\u00bd\3\2\2\2\u00c0\u00c3\3\2\2\2"+ + "\u00c1\u00bf\3\2\2\2\u00c1\u00c2\3\2\2\2\u00c2\u00c5\3\2\2\2\u00c3\u00c1"+ + "\3\2\2\2\u00c4\u00c6\5\22\n\2\u00c5\u00c4\3\2\2\2\u00c5\u00c6\3\2\2\2"+ + "\u00c6\u00c9\3\2\2\2\u00c7\u00c8\7A\2\2\u00c8\u00ca\5,\27\2\u00c9\u00c7"+ + "\3\2\2\2\u00c9\u00ca\3\2\2\2\u00ca\u00ce\3\2\2\2\u00cb\u00cc\7 \2\2\u00cc"+ "\u00cd\7\16\2\2\u00cd\u00cf\5\24\13\2\u00ce\u00cb\3\2\2\2\u00ce\u00cf"+ "\3\2\2\2\u00cf\u00d2\3\2\2\2\u00d0\u00d1\7!\2\2\u00d1\u00d3\5,\27\2\u00d2"+ "\u00d0\3\2\2\2\u00d2\u00d3\3\2\2\2\u00d3\21\3\2\2\2\u00d4\u00d5\7\34\2"+ @@ -4640,11 +4679,11 @@ class SqlBaseParser extends Parser { "\3\2\2\2\u00ef\u00f2\3\2\2\2\u00f0\u00ee\3\2\2\2\u00f0\u00f1\3\2\2\2\u00f1"+ "\u00f4\3\2\2\2\u00f2\u00f0\3\2\2\2\u00f3\u00eb\3\2\2\2\u00f3\u00f4\3\2"+ "\2\2\u00f4\u00f5\3\2\2\2\u00f5\u00f8\7\4\2\2\u00f6\u00f8\5*\26\2\u00f7"+ - "\u00ea\3\2\2\2\u00f7\u00f6\3\2\2\2\u00f8\31\3\2\2\2\u00f9\u00fa\5D#\2"+ + "\u00ea\3\2\2\2\u00f7\u00f6\3\2\2\2\u00f8\31\3\2\2\2\u00f9\u00fa\5B\"\2"+ "\u00fa\u00fb\7\13\2\2\u00fb\u00fc\7\3\2\2\u00fc\u00fd\5\n\6\2\u00fd\u00fe"+ "\7\4\2\2\u00fe\33\3\2\2\2\u00ff\u0100\t\t\2\2\u0100\35\3\2\2\2\u0101\u0106"+ "\5*\26\2\u0102\u0104\7\13\2\2\u0103\u0102\3\2\2\2\u0103\u0104\3\2\2\2"+ - "\u0104\u0105\3\2\2\2\u0105\u0107\5D#\2\u0106\u0103\3\2\2\2\u0106\u0107"+ + "\u0104\u0105\3\2\2\2\u0105\u0107\5B\"\2\u0106\u0103\3\2\2\2\u0106\u0107"+ "\3\2\2\2\u0107\37\3\2\2\2\u0108\u010c\5(\25\2\u0109\u010b\5\"\22\2\u010a"+ "\u0109\3\2\2\2\u010b\u010e\3\2\2\2\u010c\u010a\3\2\2\2\u010c\u010d\3\2"+ "\2\2\u010d!\3\2\2\2\u010e\u010c\3\2\2\2\u010f\u0110\5$\23\2\u0110\u0111"+ @@ -4659,62 +4698,62 @@ class SqlBaseParser extends Parser { "\62\2\2\u0129\u0128\3\2\2\2\u0129\u012a\3\2\2\2\u012a\u012c\3\2\2\2\u012b"+ "\u011d\3\2\2\2\u012b\u011f\3\2\2\2\u012b\u0123\3\2\2\2\u012b\u0127\3\2"+ "\2\2\u012c%\3\2\2\2\u012d\u012e\7.\2\2\u012e\u013c\5,\27\2\u012f\u0130"+ - "\7?\2\2\u0130\u0131\7\3\2\2\u0131\u0136\5D#\2\u0132\u0133\7\5\2\2\u0133"+ - "\u0135\5D#\2\u0134\u0132\3\2\2\2\u0135\u0138\3\2\2\2\u0136\u0134\3\2\2"+ - "\2\u0136\u0137\3\2\2\2\u0137\u0139\3\2\2\2\u0138\u0136\3\2\2\2\u0139\u013a"+ - "\7\4\2\2\u013a\u013c\3\2\2\2\u013b\u012d\3\2\2\2\u013b\u012f\3\2\2\2\u013c"+ - "\'\3\2\2\2\u013d\u0142\5B\"\2\u013e\u0140\7\13\2\2\u013f\u013e\3\2\2\2"+ - "\u013f\u0140\3\2\2\2\u0140\u0141\3\2\2\2\u0141\u0143\5@!\2\u0142\u013f"+ - "\3\2\2\2\u0142\u0143\3\2\2\2\u0143\u0157\3\2\2\2\u0144\u0145\7\3\2\2\u0145"+ - "\u0146\5\n\6\2\u0146\u014b\7\4\2\2\u0147\u0149\7\13\2\2\u0148\u0147\3"+ - "\2\2\2\u0148\u0149\3\2\2\2\u0149\u014a\3\2\2\2\u014a\u014c\5@!\2\u014b"+ - "\u0148\3\2\2\2\u014b\u014c\3\2\2\2\u014c\u0157\3\2\2\2\u014d\u014e\7\3"+ - "\2\2\u014e\u014f\5 \21\2\u014f\u0154\7\4\2\2\u0150\u0152\7\13\2\2\u0151"+ - "\u0150\3\2\2\2\u0151\u0152\3\2\2\2\u0152\u0153\3\2\2\2\u0153\u0155\5@"+ - "!\2\u0154\u0151\3\2\2\2\u0154\u0155\3\2\2\2\u0155\u0157\3\2\2\2\u0156"+ - "\u013d\3\2\2\2\u0156\u0144\3\2\2\2\u0156\u014d\3\2\2\2\u0157)\3\2\2\2"+ - "\u0158\u0159\5,\27\2\u0159+\3\2\2\2\u015a\u015b\b\27\1\2\u015b\u015c\7"+ - ",\2\2\u015c\u018a\5,\27\n\u015d\u015e\7\27\2\2\u015e\u015f\7\3\2\2\u015f"+ - "\u0160\5\b\5\2\u0160\u0161\7\4\2\2\u0161\u018a\3\2\2\2\u0162\u0163\7\66"+ - "\2\2\u0163\u0164\7\3\2\2\u0164\u0169\7P\2\2\u0165\u0166\7\5\2\2\u0166"+ - "\u0168\7P\2\2\u0167\u0165\3\2\2\2\u0168\u016b\3\2\2\2\u0169\u0167\3\2"+ - "\2\2\u0169\u016a\3\2\2\2\u016a\u016c\3\2\2\2\u016b\u0169\3\2\2\2\u016c"+ - "\u018a\7\4\2\2\u016d\u016e\7*\2\2\u016e\u016f\7\3\2\2\u016f\u0170\5@!"+ - "\2\u0170\u0171\7\5\2\2\u0171\u0176\7P\2\2\u0172\u0173\7\5\2\2\u0173\u0175"+ - "\7P\2\2\u0174\u0172\3\2\2\2\u0175\u0178\3\2\2\2\u0176\u0174\3\2\2\2\u0176"+ - "\u0177\3\2\2\2\u0177\u0179\3\2\2\2\u0178\u0176\3\2\2\2\u0179\u017a\7\4"+ - "\2\2\u017a\u018a\3\2\2\2\u017b\u017c\7*\2\2\u017c\u017d\7\3\2\2\u017d"+ - "\u017e\7P\2\2\u017e\u017f\7\5\2\2\u017f\u0184\7P\2\2\u0180\u0181\7\5\2"+ - "\2\u0181\u0183\7P\2\2\u0182\u0180\3\2\2\2\u0183\u0186\3\2\2\2\u0184\u0182"+ - "\3\2\2\2\u0184\u0185\3\2\2\2\u0185\u0187\3\2\2\2\u0186\u0184\3\2\2\2\u0187"+ - "\u018a\7\4\2\2\u0188\u018a\5.\30\2\u0189\u015a\3\2\2\2\u0189\u015d\3\2"+ - "\2\2\u0189\u0162\3\2\2\2\u0189\u016d\3\2\2\2\u0189\u017b\3\2\2\2\u0189"+ - "\u0188\3\2\2\2\u018a\u0193\3\2\2\2\u018b\u018c\f\4\2\2\u018c\u018d\7\t"+ - "\2\2\u018d\u0192\5,\27\5\u018e\u018f\f\3\2\2\u018f\u0190\7\60\2\2\u0190"+ - "\u0192\5,\27\4\u0191\u018b\3\2\2\2\u0191\u018e\3\2\2\2\u0192\u0195\3\2"+ - "\2\2\u0193\u0191\3\2\2\2\u0193\u0194\3\2\2\2\u0194-\3\2\2\2\u0195\u0193"+ - "\3\2\2\2\u0196\u0198\5\64\33\2\u0197\u0199\5\60\31\2\u0198\u0197\3\2\2"+ - "\2\u0198\u0199\3\2\2\2\u0199/\3\2\2\2\u019a\u019c\7,\2\2\u019b\u019a\3"+ - "\2\2\2\u019b\u019c\3\2\2\2\u019c\u019d\3\2\2\2\u019d\u019e\7\r\2\2\u019e"+ - "\u019f\5\64\33\2\u019f\u01a0\7\t\2\2\u01a0\u01a1\5\64\33\2\u01a1\u01c9"+ - "\3\2\2\2\u01a2\u01a4\7,\2\2\u01a3\u01a2\3\2\2\2\u01a3\u01a4\3\2\2\2\u01a4"+ - "\u01a5\3\2\2\2\u01a5\u01a6\7\"\2\2\u01a6\u01a7\7\3\2\2\u01a7\u01ac\5*"+ - "\26\2\u01a8\u01a9\7\5\2\2\u01a9\u01ab\5*\26\2\u01aa\u01a8\3\2\2\2\u01ab"+ - "\u01ae\3\2\2\2\u01ac\u01aa\3\2\2\2\u01ac\u01ad\3\2\2\2\u01ad\u01af\3\2"+ - "\2\2\u01ae\u01ac\3\2\2\2\u01af\u01b0\7\4\2\2\u01b0\u01c9\3\2\2\2\u01b1"+ - "\u01b3\7,\2\2\u01b2\u01b1\3\2\2\2\u01b2\u01b3\3\2\2\2\u01b3\u01b4\3\2"+ - "\2\2\u01b4\u01b5\7\"\2\2\u01b5\u01b6\7\3\2\2\u01b6\u01b7\5\b\5\2\u01b7"+ - "\u01b8\7\4\2\2\u01b8\u01c9\3\2\2\2\u01b9\u01bb\7,\2\2\u01ba\u01b9\3\2"+ - "\2\2\u01ba\u01bb\3\2\2\2\u01bb\u01bc\3\2\2\2\u01bc\u01bd\7\'\2\2\u01bd"+ - "\u01c9\5\62\32\2\u01be\u01c0\7,\2\2\u01bf\u01be\3\2\2\2\u01bf\u01c0\3"+ - "\2\2\2\u01c0\u01c1\3\2\2\2\u01c1\u01c2\78\2\2\u01c2\u01c9\7P\2\2\u01c3"+ - "\u01c5\7$\2\2\u01c4\u01c6\7,\2\2\u01c5\u01c4\3\2\2\2\u01c5\u01c6\3\2\2"+ - "\2\u01c6\u01c7\3\2\2\2\u01c7\u01c9\7-\2\2\u01c8\u019b\3\2\2\2\u01c8\u01a3"+ - "\3\2\2\2\u01c8\u01b2\3\2\2\2\u01c8\u01ba\3\2\2\2\u01c8\u01bf\3\2\2\2\u01c8"+ - "\u01c3\3\2\2\2\u01c9\61\3\2\2\2\u01ca\u01cd\7P\2\2\u01cb\u01cc\7\25\2"+ - "\2\u01cc\u01ce\7P\2\2\u01cd\u01cb\3\2\2\2\u01cd\u01ce\3\2\2\2\u01ce\63"+ - "\3\2\2\2\u01cf\u01d0\b\33\1\2\u01d0\u01d4\5\66\34\2\u01d1\u01d2\t\n\2"+ - "\2\u01d2\u01d4\5\64\33\6\u01d3\u01cf\3\2\2\2\u01d3\u01d1\3\2\2\2\u01d4"+ + "\7?\2\2\u0130\u0131\7\3\2\2\u0131\u0136\5B\"\2\u0132\u0133\7\5\2\2\u0133"+ + "\u0135\5B\"\2\u0134\u0132\3\2\2\2\u0135\u0138\3\2\2\2\u0136\u0134\3\2"+ + "\2\2\u0136\u0137\3\2\2\2\u0137\u0139\3\2\2\2\u0138\u0136\3\2\2\2\u0139"+ + "\u013a\7\4\2\2\u013a\u013c\3\2\2\2\u013b\u012d\3\2\2\2\u013b\u012f\3\2"+ + "\2\2\u013c\'\3\2\2\2\u013d\u0142\5D#\2\u013e\u0140\7\13\2\2\u013f\u013e"+ + "\3\2\2\2\u013f\u0140\3\2\2\2\u0140\u0141\3\2\2\2\u0141\u0143\5@!\2\u0142"+ + "\u013f\3\2\2\2\u0142\u0143\3\2\2\2\u0143\u0157\3\2\2\2\u0144\u0145\7\3"+ + "\2\2\u0145\u0146\5\n\6\2\u0146\u014b\7\4\2\2\u0147\u0149\7\13\2\2\u0148"+ + "\u0147\3\2\2\2\u0148\u0149\3\2\2\2\u0149\u014a\3\2\2\2\u014a\u014c\5@"+ + "!\2\u014b\u0148\3\2\2\2\u014b\u014c\3\2\2\2\u014c\u0157\3\2\2\2\u014d"+ + "\u014e\7\3\2\2\u014e\u014f\5 \21\2\u014f\u0154\7\4\2\2\u0150\u0152\7\13"+ + "\2\2\u0151\u0150\3\2\2\2\u0151\u0152\3\2\2\2\u0152\u0153\3\2\2\2\u0153"+ + "\u0155\5@!\2\u0154\u0151\3\2\2\2\u0154\u0155\3\2\2\2\u0155\u0157\3\2\2"+ + "\2\u0156\u013d\3\2\2\2\u0156\u0144\3\2\2\2\u0156\u014d\3\2\2\2\u0157)"+ + "\3\2\2\2\u0158\u0159\5,\27\2\u0159+\3\2\2\2\u015a\u015b\b\27\1\2\u015b"+ + "\u015c\7,\2\2\u015c\u018a\5,\27\n\u015d\u015e\7\27\2\2\u015e\u015f\7\3"+ + "\2\2\u015f\u0160\5\b\5\2\u0160\u0161\7\4\2\2\u0161\u018a\3\2\2\2\u0162"+ + "\u0163\7\66\2\2\u0163\u0164\7\3\2\2\u0164\u0169\7P\2\2\u0165\u0166\7\5"+ + "\2\2\u0166\u0168\7P\2\2\u0167\u0165\3\2\2\2\u0168\u016b\3\2\2\2\u0169"+ + "\u0167\3\2\2\2\u0169\u016a\3\2\2\2\u016a\u016c\3\2\2\2\u016b\u0169\3\2"+ + "\2\2\u016c\u018a\7\4\2\2\u016d\u016e\7*\2\2\u016e\u016f\7\3\2\2\u016f"+ + "\u0170\5@!\2\u0170\u0171\7\5\2\2\u0171\u0176\7P\2\2\u0172\u0173\7\5\2"+ + "\2\u0173\u0175\7P\2\2\u0174\u0172\3\2\2\2\u0175\u0178\3\2\2\2\u0176\u0174"+ + "\3\2\2\2\u0176\u0177\3\2\2\2\u0177\u0179\3\2\2\2\u0178\u0176\3\2\2\2\u0179"+ + "\u017a\7\4\2\2\u017a\u018a\3\2\2\2\u017b\u017c\7*\2\2\u017c\u017d\7\3"+ + "\2\2\u017d\u017e\7P\2\2\u017e\u017f\7\5\2\2\u017f\u0184\7P\2\2\u0180\u0181"+ + "\7\5\2\2\u0181\u0183\7P\2\2\u0182\u0180\3\2\2\2\u0183\u0186\3\2\2\2\u0184"+ + "\u0182\3\2\2\2\u0184\u0185\3\2\2\2\u0185\u0187\3\2\2\2\u0186\u0184\3\2"+ + "\2\2\u0187\u018a\7\4\2\2\u0188\u018a\5.\30\2\u0189\u015a\3\2\2\2\u0189"+ + "\u015d\3\2\2\2\u0189\u0162\3\2\2\2\u0189\u016d\3\2\2\2\u0189\u017b\3\2"+ + "\2\2\u0189\u0188\3\2\2\2\u018a\u0193\3\2\2\2\u018b\u018c\f\4\2\2\u018c"+ + "\u018d\7\t\2\2\u018d\u0192\5,\27\5\u018e\u018f\f\3\2\2\u018f\u0190\7\60"+ + "\2\2\u0190\u0192\5,\27\4\u0191\u018b\3\2\2\2\u0191\u018e\3\2\2\2\u0192"+ + "\u0195\3\2\2\2\u0193\u0191\3\2\2\2\u0193\u0194\3\2\2\2\u0194-\3\2\2\2"+ + "\u0195\u0193\3\2\2\2\u0196\u0198\5\64\33\2\u0197\u0199\5\60\31\2\u0198"+ + "\u0197\3\2\2\2\u0198\u0199\3\2\2\2\u0199/\3\2\2\2\u019a\u019c\7,\2\2\u019b"+ + "\u019a\3\2\2\2\u019b\u019c\3\2\2\2\u019c\u019d\3\2\2\2\u019d\u019e\7\r"+ + "\2\2\u019e\u019f\5\64\33\2\u019f\u01a0\7\t\2\2\u01a0\u01a1\5\64\33\2\u01a1"+ + "\u01c9\3\2\2\2\u01a2\u01a4\7,\2\2\u01a3\u01a2\3\2\2\2\u01a3\u01a4\3\2"+ + "\2\2\u01a4\u01a5\3\2\2\2\u01a5\u01a6\7\"\2\2\u01a6\u01a7\7\3\2\2\u01a7"+ + "\u01ac\5*\26\2\u01a8\u01a9\7\5\2\2\u01a9\u01ab\5*\26\2\u01aa\u01a8\3\2"+ + "\2\2\u01ab\u01ae\3\2\2\2\u01ac\u01aa\3\2\2\2\u01ac\u01ad\3\2\2\2\u01ad"+ + "\u01af\3\2\2\2\u01ae\u01ac\3\2\2\2\u01af\u01b0\7\4\2\2\u01b0\u01c9\3\2"+ + "\2\2\u01b1\u01b3\7,\2\2\u01b2\u01b1\3\2\2\2\u01b2\u01b3\3\2\2\2\u01b3"+ + "\u01b4\3\2\2\2\u01b4\u01b5\7\"\2\2\u01b5\u01b6\7\3\2\2\u01b6\u01b7\5\b"+ + "\5\2\u01b7\u01b8\7\4\2\2\u01b8\u01c9\3\2\2\2\u01b9\u01bb\7,\2\2\u01ba"+ + "\u01b9\3\2\2\2\u01ba\u01bb\3\2\2\2\u01bb\u01bc\3\2\2\2\u01bc\u01bd\7\'"+ + "\2\2\u01bd\u01c9\5\62\32\2\u01be\u01c0\7,\2\2\u01bf\u01be\3\2\2\2\u01bf"+ + "\u01c0\3\2\2\2\u01c0\u01c1\3\2\2\2\u01c1\u01c2\78\2\2\u01c2\u01c9\7P\2"+ + "\2\u01c3\u01c5\7$\2\2\u01c4\u01c6\7,\2\2\u01c5\u01c4\3\2\2\2\u01c5\u01c6"+ + "\3\2\2\2\u01c6\u01c7\3\2\2\2\u01c7\u01c9\7-\2\2\u01c8\u019b\3\2\2\2\u01c8"+ + "\u01a3\3\2\2\2\u01c8\u01b2\3\2\2\2\u01c8\u01ba\3\2\2\2\u01c8\u01bf\3\2"+ + "\2\2\u01c8\u01c3\3\2\2\2\u01c9\61\3\2\2\2\u01ca\u01cd\7P\2\2\u01cb\u01cc"+ + "\7\25\2\2\u01cc\u01ce\7P\2\2\u01cd\u01cb\3\2\2\2\u01cd\u01ce\3\2\2\2\u01ce"+ + "\63\3\2\2\2\u01cf\u01d0\b\33\1\2\u01d0\u01d4\5\66\34\2\u01d1\u01d2\t\n"+ + "\2\2\u01d2\u01d4\5\64\33\6\u01d3\u01cf\3\2\2\2\u01d3\u01d1\3\2\2\2\u01d4"+ "\u01e1\3\2\2\2\u01d5\u01d6\f\5\2\2\u01d6\u01d7\t\13\2\2\u01d7\u01e0\5"+ "\64\33\6\u01d8\u01d9\f\4\2\2\u01d9\u01da\t\n\2\2\u01da\u01e0\5\64\33\5"+ "\u01db\u01dc\f\3\2\2\u01dc\u01dd\5:\36\2\u01dd\u01de\5\64\33\4\u01de\u01e0"+ @@ -4723,43 +4762,44 @@ class SqlBaseParser extends Parser { "\2\u01e3\u01e1\3\2\2\2\u01e4\u01e5\7\17\2\2\u01e5\u01e6\7\3\2\2\u01e6"+ "\u01e7\5*\26\2\u01e7\u01e8\7\13\2\2\u01e8\u01e9\5> \2\u01e9\u01ea\7\4"+ "\2\2\u01ea\u0216\3\2\2\2\u01eb\u01ec\7\31\2\2\u01ec\u01ed\7\3\2\2\u01ed"+ - "\u01ee\5D#\2\u01ee\u01ef\7\34\2\2\u01ef\u01f0\5\64\33\2\u01f0\u01f1\7"+ + "\u01ee\5B\"\2\u01ee\u01ef\7\34\2\2\u01ef\u01f0\5\64\33\2\u01f0\u01f1\7"+ "\4\2\2\u01f1\u0216\3\2\2\2\u01f2\u0216\58\35\2\u01f3\u0216\7K\2\2\u01f4"+ "\u01f5\5@!\2\u01f5\u01f6\7O\2\2\u01f6\u01f8\3\2\2\2\u01f7\u01f4\3\2\2"+ "\2\u01f7\u01f8\3\2\2\2\u01f8\u01f9\3\2\2\2\u01f9\u0216\7K\2\2\u01fa\u01fb"+ - "\5D#\2\u01fb\u0207\7\3\2\2\u01fc\u01fe\5\34\17\2\u01fd\u01fc\3\2\2\2\u01fd"+ - "\u01fe\3\2\2\2\u01fe\u01ff\3\2\2\2\u01ff\u0204\5*\26\2\u0200\u0201\7\5"+ - "\2\2\u0201\u0203\5*\26\2\u0202\u0200\3\2\2\2\u0203\u0206\3\2\2\2\u0204"+ + "\5B\"\2\u01fb\u0207\7\3\2\2\u01fc\u01fe\5\34\17\2\u01fd\u01fc\3\2\2\2"+ + "\u01fd\u01fe\3\2\2\2\u01fe\u01ff\3\2\2\2\u01ff\u0204\5*\26\2\u0200\u0201"+ + "\7\5\2\2\u0201\u0203\5*\26\2\u0202\u0200\3\2\2\2\u0203\u0206\3\2\2\2\u0204"+ "\u0202\3\2\2\2\u0204\u0205\3\2\2\2\u0205\u0208\3\2\2\2\u0206\u0204\3\2"+ "\2\2\u0207\u01fd\3\2\2\2\u0207\u0208\3\2\2\2\u0208\u0209\3\2\2\2\u0209"+ "\u020a\7\4\2\2\u020a\u0216\3\2\2\2\u020b\u020c\7\3\2\2\u020c\u020d\5\b"+ - "\5\2\u020d\u020e\7\4\2\2\u020e\u0216\3\2\2\2\u020f\u0216\5D#\2\u0210\u0216"+ - "\5@!\2\u0211\u0212\7\3\2\2\u0212\u0213\5*\26\2\u0213\u0214\7\4\2\2\u0214"+ - "\u0216\3\2\2\2\u0215\u01e4\3\2\2\2\u0215\u01eb\3\2\2\2\u0215\u01f2\3\2"+ - "\2\2\u0215\u01f3\3\2\2\2\u0215\u01f7\3\2\2\2\u0215\u01fa\3\2\2\2\u0215"+ + "\5\2\u020d\u020e\7\4\2\2\u020e\u0216\3\2\2\2\u020f\u0216\5B\"\2\u0210"+ + "\u0216\5@!\2\u0211\u0212\7\3\2\2\u0212\u0213\5*\26\2\u0213\u0214\7\4\2"+ + "\2\u0214\u0216\3\2\2\2\u0215\u01e4\3\2\2\2\u0215\u01eb\3\2\2\2\u0215\u01f2"+ + "\3\2\2\2\u0215\u01f3\3\2\2\2\u0215\u01f7\3\2\2\2\u0215\u01fa\3\2\2\2\u0215"+ "\u020b\3\2\2\2\u0215\u020f\3\2\2\2\u0215\u0210\3\2\2\2\u0215\u0211\3\2"+ "\2\2\u0216\67\3\2\2\2\u0217\u0220\7-\2\2\u0218\u0220\5J&\2\u0219\u0220"+ "\5<\37\2\u021a\u021c\7P\2\2\u021b\u021a\3\2\2\2\u021c\u021d\3\2\2\2\u021d"+ "\u021b\3\2\2\2\u021d\u021e\3\2\2\2\u021e\u0220\3\2\2\2\u021f\u0217\3\2"+ "\2\2\u021f\u0218\3\2\2\2\u021f\u0219\3\2\2\2\u021f\u021b\3\2\2\2\u0220"+ "9\3\2\2\2\u0221\u0222\t\f\2\2\u0222;\3\2\2\2\u0223\u0224\t\r\2\2\u0224"+ - "=\3\2\2\2\u0225\u0226\5D#\2\u0226?\3\2\2\2\u0227\u0228\5D#\2\u0228\u0229"+ + "=\3\2\2\2\u0225\u0226\5B\"\2\u0226?\3\2\2\2\u0227\u0228\5B\"\2\u0228\u0229"+ "\7O\2\2\u0229\u022b\3\2\2\2\u022a\u0227\3\2\2\2\u022b\u022e\3\2\2\2\u022c"+ "\u022a\3\2\2\2\u022c\u022d\3\2\2\2\u022d\u022f\3\2\2\2\u022e\u022c\3\2"+ - "\2\2\u022f\u0230\5D#\2\u0230A\3\2\2\2\u0231\u0232\5D#\2\u0232C\3\2\2\2"+ - "\u0233\u0236\5F$\2\u0234\u0236\5H%\2\u0235\u0233\3\2\2\2\u0235\u0234\3"+ - "\2\2\2\u0236E\3\2\2\2\u0237\u023a\7U\2\2\u0238\u023a\7V\2\2\u0239\u0237"+ - "\3\2\2\2\u0239\u0238\3\2\2\2\u023aG\3\2\2\2\u023b\u023f\7S\2\2\u023c\u023f"+ - "\5L\'\2\u023d\u023f\7T\2\2\u023e\u023b\3\2\2\2\u023e\u023c\3\2\2\2\u023e"+ - "\u023d\3\2\2\2\u023fI\3\2\2\2\u0240\u0243\7R\2\2\u0241\u0243\7Q\2\2\u0242"+ - "\u0240\3\2\2\2\u0242\u0241\3\2\2\2\u0243K\3\2\2\2\u0244\u0245\t\16\2\2"+ - "\u0245M\3\2\2\2R]_clnrx{\u0086\u0089\u008d\u0095\u0098\u00a4\u00a7\u00ab"+ - "\u00b2\u00b6\u00ba\u00c1\u00c5\u00c9\u00ce\u00d2\u00da\u00de\u00e5\u00f0"+ - "\u00f3\u00f7\u0103\u0106\u010c\u0113\u011a\u011d\u0121\u0125\u0129\u012b"+ - "\u0136\u013b\u013f\u0142\u0148\u014b\u0151\u0154\u0156\u0169\u0176\u0184"+ - "\u0189\u0191\u0193\u0198\u019b\u01a3\u01ac\u01b2\u01ba\u01bf\u01c5\u01c8"+ - "\u01cd\u01d3\u01df\u01e1\u01f7\u01fd\u0204\u0207\u0215\u021d\u021f\u022c"+ - "\u0235\u0239\u023e\u0242"; + "\2\2\u022f\u0230\5B\"\2\u0230A\3\2\2\2\u0231\u0234\5F$\2\u0232\u0234\5"+ + "H%\2\u0233\u0231\3\2\2\2\u0233\u0232\3\2\2\2\u0234C\3\2\2\2\u0235\u0238"+ + "\7U\2\2\u0236\u0238\5B\"\2\u0237\u0235\3\2\2\2\u0237\u0236\3\2\2\2\u0238"+ + "E\3\2\2\2\u0239\u023c\7V\2\2\u023a\u023c\7W\2\2\u023b\u0239\3\2\2\2\u023b"+ + "\u023a\3\2\2\2\u023cG\3\2\2\2\u023d\u0241\7S\2\2\u023e\u0241\5L\'\2\u023f"+ + "\u0241\7T\2\2\u0240\u023d\3\2\2\2\u0240\u023e\3\2\2\2\u0240\u023f\3\2"+ + "\2\2\u0241I\3\2\2\2\u0242\u0245\7R\2\2\u0243\u0245\7Q\2\2\u0244\u0242"+ + "\3\2\2\2\u0244\u0243\3\2\2\2\u0245K\3\2\2\2\u0246\u0247\t\16\2\2\u0247"+ + "M\3\2\2\2S]_clnrx{\u0086\u0089\u008d\u0095\u0098\u00a4\u00a7\u00ab\u00b2"+ + "\u00b6\u00ba\u00c1\u00c5\u00c9\u00ce\u00d2\u00da\u00de\u00e5\u00f0\u00f3"+ + "\u00f7\u0103\u0106\u010c\u0113\u011a\u011d\u0121\u0125\u0129\u012b\u0136"+ + "\u013b\u013f\u0142\u0148\u014b\u0151\u0154\u0156\u0169\u0176\u0184\u0189"+ + "\u0191\u0193\u0198\u019b\u01a3\u01ac\u01b2\u01ba\u01bf\u01c5\u01c8\u01cd"+ + "\u01d3\u01df\u01e1\u01f7\u01fd\u0204\u0207\u0215\u021d\u021f\u022c\u0233"+ + "\u0237\u023b\u0240\u0244"; public static final ATN _ATN = new ATNDeserializer().deserialize(_serializedATN.toCharArray()); static { diff --git a/sql/server/src/main/java/org/elasticsearch/xpack/sql/parser/SqlBaseVisitor.java b/sql/server/src/main/java/org/elasticsearch/xpack/sql/parser/SqlBaseVisitor.java index dcafffa83f2..3279366bafd 100644 --- a/sql/server/src/main/java/org/elasticsearch/xpack/sql/parser/SqlBaseVisitor.java +++ b/sql/server/src/main/java/org/elasticsearch/xpack/sql/parser/SqlBaseVisitor.java @@ -420,18 +420,18 @@ interface SqlBaseVisitor extends ParseTreeVisitor { * @return the visitor result */ T visitQualifiedName(SqlBaseParser.QualifiedNameContext ctx); - /** - * Visit a parse tree produced by {@link SqlBaseParser#tableIdentifier}. - * @param ctx the parse tree - * @return the visitor result - */ - T visitTableIdentifier(SqlBaseParser.TableIdentifierContext ctx); /** * Visit a parse tree produced by {@link SqlBaseParser#identifier}. * @param ctx the parse tree * @return the visitor result */ T visitIdentifier(SqlBaseParser.IdentifierContext ctx); + /** + * Visit a parse tree produced by {@link SqlBaseParser#tableIdentifier}. + * @param ctx the parse tree + * @return the visitor result + */ + T visitTableIdentifier(SqlBaseParser.TableIdentifierContext ctx); /** * Visit a parse tree produced by the {@code quotedIdentifier} * labeled alternative in {@link SqlBaseParser#quoteIdentifier}. diff --git a/sql/server/src/main/java/org/elasticsearch/xpack/sql/plan/logical/command/ShowFunctions.java b/sql/server/src/main/java/org/elasticsearch/xpack/sql/plan/logical/command/ShowFunctions.java index d9cab899be4..4fd4dbc863f 100644 --- a/sql/server/src/main/java/org/elasticsearch/xpack/sql/plan/logical/command/ShowFunctions.java +++ b/sql/server/src/main/java/org/elasticsearch/xpack/sql/plan/logical/command/ShowFunctions.java @@ -46,7 +46,7 @@ public class ShowFunctions extends Command { @Override public void execute(SqlSession session, ActionListener listener) { FunctionRegistry registry = session.functionRegistry(); - Collection functions = registry.listFunctions(pattern != null ? pattern.pattern() : null); + Collection functions = registry.listFunctions(pattern != null ? pattern.asJavaRegex() : null); listener.onResponse(Rows.of(output(), functions.stream() .map(f -> asList(f.name(), f.type().name())) diff --git a/sql/server/src/main/java/org/elasticsearch/xpack/sql/session/SqlSession.java b/sql/server/src/main/java/org/elasticsearch/xpack/sql/session/SqlSession.java index 6248ce63a8c..3e8e8dca99e 100644 --- a/sql/server/src/main/java/org/elasticsearch/xpack/sql/session/SqlSession.java +++ b/sql/server/src/main/java/org/elasticsearch/xpack/sql/session/SqlSession.java @@ -115,7 +115,8 @@ public class SqlSession { // Note: JOINs are not supported but we detect them when listener.onFailure(new MappingException("Queries with multiple indices are not supported")); } else if (preAnalysis.indices.size() == 1) { - indexResolver.resolveWithSameMapping(preAnalysis.indices.get(0), null, + String indexName = preAnalysis.indices.get(0); + indexResolver.resolveWithSameMapping(indexName, null, wrap(indexResult -> listener.onResponse(action.apply(indexResult)), listener::onFailure)); } else { try { diff --git a/sql/server/src/main/java/org/elasticsearch/xpack/sql/util/StringUtils.java b/sql/server/src/main/java/org/elasticsearch/xpack/sql/util/StringUtils.java index c4b9c741549..ef4b76ca40f 100644 --- a/sql/server/src/main/java/org/elasticsearch/xpack/sql/util/StringUtils.java +++ b/sql/server/src/main/java/org/elasticsearch/xpack/sql/util/StringUtils.java @@ -21,7 +21,6 @@ import java.util.Collection; import java.util.Iterator; import java.util.List; import java.util.Locale; -import java.util.regex.Pattern; import static java.util.stream.Collectors.toList; @@ -247,10 +246,6 @@ public abstract class StringUtils { return wildcard.toString(); } - public static Pattern likeRegex(String likePattern) { - return Pattern.compile(likeToJavaPattern(likePattern, '\\')); - } - public static String toString(SearchSourceBuilder source) { try (XContentBuilder builder = XContentFactory.jsonBuilder().prettyPrint().humanReadable(true)) { source.toXContent(builder, ToXContent.EMPTY_PARAMS);