Skip to content

Commit cf17759

Browse files
committed
Support for quoted strings and ?params
1 parent 8272dcd commit cf17759

File tree

19 files changed

+2308
-1420
lines changed

19 files changed

+2308
-1420
lines changed

x-pack/plugin/esql/src/main/antlr/PromqlBaseLexer.tokens

Lines changed: 83 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

x-pack/plugin/esql/src/main/antlr/PromqlBaseParser.tokens

Lines changed: 83 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

x-pack/plugin/esql/src/main/antlr/lexer/Promql.g4

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ PROMQL_UNQUOTED_IDENTIFIER
2323
PROMQL_QUOTED_IDENTIFIER: QUOTED_IDENTIFIER -> type(QUOTED_IDENTIFIER);
2424
PROMQL_NAMED_PARAMS: NAMED_OR_POSITIONAL_PARAM -> type(NAMED_OR_POSITIONAL_PARAM);
2525

26+
PROMQL_QUOTED_STRING: QUOTED_STRING -> type(QUOTED_STRING);
2627

2728
// Exit back to default mode on pipe
2829
PROMQL_PARAMS_PIPE : PIPE -> type(PIPE), popMode;

x-pack/plugin/esql/src/main/antlr/parser/Promql.g4

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ promqlParam
1717
promqlParamContent
1818
: PROMQL_UNQUOTED_IDENTIFIER
1919
| QUOTED_IDENTIFIER
20+
| QUOTED_STRING
21+
| NAMED_OR_POSITIONAL_PARAM
2022
;
2123

2224
promqlQueryPart
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
token literal names:
2+
null
3+
null
4+
null
5+
null
6+
null
7+
null
8+
null
9+
null
10+
null
11+
12+
token symbolic names:
13+
null
14+
DEV_PROMQL
15+
LP
16+
RP
17+
PROMQL_UNQUOTED_IDENTIFIER
18+
QUOTED_IDENTIFIER
19+
QUOTED_STRING
20+
NAMED_OR_POSITIONAL_PARAM
21+
PROMQL_QUERY_TEXT
22+
23+
rule names:
24+
promqlCommand
25+
promqlParam
26+
promqlParamContent
27+
promqlQueryPart
28+
29+
30+
atn:
31+
[4, 1, 8, 40, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 1, 0, 1, 0, 4, 0, 11, 8, 0, 11, 0, 12, 0, 12, 1, 0, 1, 0, 5, 0, 17, 8, 0, 10, 0, 12, 0, 20, 9, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 2, 1, 2, 1, 3, 1, 3, 1, 3, 5, 3, 32, 8, 3, 10, 3, 12, 3, 35, 9, 3, 1, 3, 3, 3, 38, 8, 3, 1, 3, 0, 0, 4, 0, 2, 4, 6, 0, 1, 1, 0, 4, 7, 39, 0, 8, 1, 0, 0, 0, 2, 23, 1, 0, 0, 0, 4, 26, 1, 0, 0, 0, 6, 37, 1, 0, 0, 0, 8, 10, 5, 1, 0, 0, 9, 11, 3, 2, 1, 0, 10, 9, 1, 0, 0, 0, 11, 12, 1, 0, 0, 0, 12, 10, 1, 0, 0, 0, 12, 13, 1, 0, 0, 0, 13, 14, 1, 0, 0, 0, 14, 18, 5, 2, 0, 0, 15, 17, 3, 6, 3, 0, 16, 15, 1, 0, 0, 0, 17, 20, 1, 0, 0, 0, 18, 16, 1, 0, 0, 0, 18, 19, 1, 0, 0, 0, 19, 21, 1, 0, 0, 0, 20, 18, 1, 0, 0, 0, 21, 22, 5, 3, 0, 0, 22, 1, 1, 0, 0, 0, 23, 24, 3, 4, 2, 0, 24, 25, 3, 4, 2, 0, 25, 3, 1, 0, 0, 0, 26, 27, 7, 0, 0, 0, 27, 5, 1, 0, 0, 0, 28, 38, 5, 8, 0, 0, 29, 33, 5, 2, 0, 0, 30, 32, 3, 6, 3, 0, 31, 30, 1, 0, 0, 0, 32, 35, 1, 0, 0, 0, 33, 31, 1, 0, 0, 0, 33, 34, 1, 0, 0, 0, 34, 36, 1, 0, 0, 0, 35, 33, 1, 0, 0, 0, 36, 38, 5, 3, 0, 0, 37, 28, 1, 0, 0, 0, 37, 29, 1, 0, 0, 0, 38, 7, 1, 0, 0, 0, 4, 12, 18, 33, 37]

0 commit comments

Comments
 (0)