Skip to content

Commit 541425f

Browse files
committed
Use bracket syntax [qualifier].[name]
1 parent 7a2378c commit 541425f

File tree

23 files changed

+2666
-2597
lines changed

23 files changed

+2666
-2597
lines changed

x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/expression/Attribute.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public String qualifier() {
8585
}
8686

8787
public String qualifiedName() {
88-
return qualifier != null ? qualifier + " " + name() : name();
88+
return qualifier != null ? "[" + qualifier + "].[" + name() + "]" : name();
8989
}
9090

9191
@Override

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

Lines changed: 138 additions & 142 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/EsqlBaseParser.g4

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -151,20 +151,20 @@ aggField
151151
;
152152

153153
qualifiedName
154-
: {this.isDevVersion()}? qualifier=UNQUOTED_IDENTIFIER name=unqualifiedName
155-
| name=unqualifiedName
154+
: {this.isDevVersion()}? OPENING_BRACKET qualifier=UNQUOTED_IDENTIFIER CLOSING_BRACKET DOT OPENING_BRACKET name=fieldName CLOSING_BRACKET
155+
| name=fieldName
156156
;
157157

158-
unqualifiedName
158+
fieldName
159159
: identifierOrParameter (DOT identifierOrParameter)*
160160
;
161161

162162
qualifiedNamePattern
163-
: {this.isDevVersion()}? qualifier=ID_PATTERN name=unqualifiedNamePattern
164-
| name=unqualifiedNamePattern
163+
: {this.isDevVersion()}? OPENING_BRACKET qualifier=ID_PATTERN CLOSING_BRACKET DOT OPENING_BRACKET name=fieldNamePattern CLOSING_BRACKET
164+
| name=fieldNamePattern
165165
;
166166

167-
unqualifiedNamePattern
167+
fieldNamePattern
168168
: (identifierPattern (DOT identifierPattern)*)
169169
;
170170

0 commit comments

Comments
 (0)