Change to field name pattern, trying to get UnresolvedAttribute from it

carlosdelest · Aug 7, 2024 · 15d96c1 · 15d96c1
1 parent b57b046
commit 15d96c1
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 14 deletions.
diff --git a/x-pack/plugin/esql/src/main/antlr/EsqlBaseParser.g4 b/x-pack/plugin/esql/src/main/antlr/EsqlBaseParser.g4
@@ -315,7 +315,7 @@ parsedMatchQuery
     ;
 
 queryStringFields
-    : fieldName=UNQUOTED_IDENTIFIER COLON queryStringNoFields
+    : fieldName=qualifiedNamePattern COLON queryStringNoFields
     ;
 
 queryStringNoFields
@@ -329,5 +329,5 @@ fieldQueryStringExpression
 
 // TODO Define a lexer rule for query terms and fields - probably we can't tell each other apart
 queryStringTerm
-    : UNQUOTED_IDENTIFIER
+    : qualifiedNamePattern
     ;
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseParser.interp b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseParser.interp
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseParser.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseParser.java
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/LogicalPlanBuilder.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/LogicalPlanBuilder.java
@@ -11,6 +11,7 @@
 import org.antlr.v4.runtime.Token;
 import org.antlr.v4.runtime.tree.ParseTree;
 import org.elasticsearch.Build;
+import org.elasticsearch.common.Strings;
 import org.elasticsearch.core.Tuple;
 import org.elasticsearch.dissect.DissectException;
 import org.elasticsearch.dissect.DissectParser;
@@ -378,7 +379,8 @@ public StringQueryPredicate visitUnparsedMatchQuery(EsqlBaseParser.UnparsedMatch
 
     @Override public StringQueryPredicate visitQueryStringFields(EsqlBaseParser.QueryStringFieldsContext ctx) {
         Source source = source(ctx);
-        String fieldName = ctx.fieldName.getText();
+        // TODO HERE get qualified name and do something similar in Validator like MatchOperator
+        NamedExpression fieldName = visitQualifiedNamePattern(ctx.fieldName);
         return new StringQueryPredicate(source, ctx.queryStringNoFields().getText(), "fields=" + fieldName);
     }