Fixed Parser Where Queries Improperly Parsed As Alias

Signed-off-by: GabeFernandez310 <gabrielf@bitquilltech.com>
Bit-Quill · Oct 6, 2022 · 8c5b0e6 · 8c5b0e6
1 parent b244f2e
commit 8c5b0e6
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/integ-test/src/test/resources/correctness/expressions/arithmetics.txt b/integ-test/src/test/resources/correctness/expressions/arithmetics.txt
@@ -1,3 +1,7 @@
+6 * 2
+6 *2
+6* 2
+6*2
 1 + 2
 -1.0 + 1.234
 10 - 5

diff --git a/sql/src/main/antlr/OpenSearchSQLLexer.g4 b/sql/src/main/antlr/OpenSearchSQLLexer.g4
@@ -438,7 +438,7 @@ BACKTICK_QUOTE_ID:                  BQUOTA_STRING;
 
 // Fragments for Literal primitives
 fragment EXPONENT_NUM_PART:         'E' [-+]? DEC_DIGIT+;
-fragment ID_LITERAL:                [@*A-Z]+?[*A-Z_\-0-9]*;
+fragment ID_LITERAL:                [A-Z]+?[A-Z_\-0-9]*;
 fragment DQUOTA_STRING:             '"' ( '\\'. | '""' | ~('"'| '\\') )* '"';
 fragment SQUOTA_STRING:             '\'' ('\\'. | '\'\'' | ~('\'' | '\\'))* '\'';
 fragment BQUOTA_STRING:             '`' ( '\\'. | '``' | ~('`'|'\\'))* '`';

diff --git a/sql/src/test/java/org/opensearch/sql/sql/antlr/SQLSyntaxParserTest.java b/sql/src/test/java/org/opensearch/sql/sql/antlr/SQLSyntaxParserTest.java
@@ -298,9 +298,9 @@ public void can_parse_query_string_relevance_function() {
     assertNotNull(parser.parse(
         "SELECT id FROM test WHERE query_string([address], 'query')"));
     assertNotNull(parser.parse(
-        "SELECT id FROM test WHERE query_string([addr*], 'query')"));
+        "SELECT id FROM test WHERE query_string(['addr*'], 'query')"));
     assertNotNull(parser.parse(
-        "SELECT id FROM test WHERE query_string([*ss], 'query')"));
+        "SELECT id FROM test WHERE query_string(['*ss'], 'query')"));
     assertNotNull(parser.parse(
         "SELECT id FROM test WHERE query_string([address, notes], 'query')"));
 

diff --git a/sql/src/test/java/org/opensearch/sql/sql/parser/AstQualifiedNameBuilderTest.java b/sql/src/test/java/org/opensearch/sql/sql/parser/AstQualifiedNameBuilderTest.java
@@ -32,9 +32,7 @@ public void canBuildRegularIdentifierForSQLStandard() {
   @Test
   public void canBuildRegularIdentifierForOpenSearch() {
     buildFromTableName(".opensearch_dashboards").expectQualifiedName(".opensearch_dashboards");
-    buildFromIdentifier("@timestamp").expectQualifiedName("@timestamp");
     buildFromIdentifier("logs-2020-01").expectQualifiedName("logs-2020-01");
-    buildFromIdentifier("*logs*").expectQualifiedName("*logs*");
   }
 
   @Test
-Original file line number
+Diff line change
@@ -1,3 +1,7 @@
+* 2
+*2
+* 2
+*2
 + 2
     -1.0 + 1.234
 - 5
@@ Expand Down @@