Added a nestedIdent in the parser

Signed-off-by: Guian Gumpac <[email protected]>
Bit-Quill · Feb 9, 2023 · 6ef8169 · 6ef8169
1 parent f287cb2
commit 6ef8169
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/integ-test/src/test/java/org/opensearch/sql/sql/NestedIT.java b/integ-test/src/test/java/org/opensearch/sql/sql/NestedIT.java
@@ -53,7 +53,7 @@ public void nested_function_in_select_test() {
     verifySchema(result,
         schema("nested(message.info)", null, "keyword"),
         schema("nested(comment.data)", null, "keyword"),
-        schema("nested(comment.data)", null, "long"));
+        schema("nested(message.dayOfWeek)", null, "long"));
     verifyDataRows(result,
         rows("a", "ab", 1),
         rows("b", "aa", 2),

diff --git a/sql/src/main/antlr/OpenSearchSQLParser.g4 b/sql/src/main/antlr/OpenSearchSQLParser.g4
@@ -317,7 +317,7 @@ nestedFunction
     ;
 
 nestedField
-    : ident DOT ident (DOT ident)*
+    : nestedIdent DOT nestedIdent (DOT nestedIdent)*
     ;
 
 highlightFunction
@@ -624,6 +624,14 @@ ident
     | scalarFunctionName
     ;
 
+
+nestedIdent
+    : ID
+    | BACKTICK_QUOTE_ID
+    | keywordsCanBeId
+    | scalarFunctionName
+    ;
+
 keywordsCanBeId
     : FULL
     | FIELD | D | T | TS // OD SQL and ODBC special