Match expressions use constants as query string, to match the functio…

…n parameters checks
carlosdelest · Oct 30, 2024 · f70f64e · f70f64e
1 parent 598d5bc
commit f70f64e
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 43 deletions.
diff --git a/x-pack/plugin/esql/src/main/antlr/EsqlBaseParser.g4 b/x-pack/plugin/esql/src/main/antlr/EsqlBaseParser.g4
@@ -77,7 +77,7 @@ regexBooleanExpression
     ;
 
 matchBooleanExpression
-    : fieldExp=qualifiedName COLON queryString=primaryExpression
+    : fieldExp=qualifiedName COLON queryString=constant
     ;
 
 valueExpression

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/...k/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/parser/StatementParserTests.java b/...k/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/parser/StatementParserTests.java
@@ -2290,7 +2290,7 @@ public void testMetricWithGroupKeyAsAgg() {
         }
     }
 
-    public void testMatchOperator() {
+    public void testMatchOperatorConstantQueryString() {
         var plan = statement("FROM test | WHERE field:\"value\"");
         var filter = as(plan, Filter.class);
         var match = (Match) filter.condition();
@@ -2301,5 +2301,27 @@ public void testMatchOperator() {
 
     public void testInvalidMatchOperator() {
         expectError("from test | WHERE field:", "line 1:25: mismatched input '<EOF>' expecting {QUOTED_STRING, ");
+        expectError(
+            "from test | WHERE field:CONCAT(\"hello\", \"world\")",
+            "line 1:25: mismatched input 'CONCAT' expecting {QUOTED_STRING, INTEGER_LITERAL, DECIMAL_LITERAL, "
+        );
+        expectError("from test | WHERE field:123::STRING", "line 1:28: mismatched input '::' expecting {<EOF>, '|', 'and', 'or'}");
+        expectError(
+            "from test | WHERE field:(true OR false)",
+            "line 1:25: extraneous input '(' expecting {QUOTED_STRING, INTEGER_LITERAL, DECIMAL_LITERAL, "
+        );
+        expectError(
+            "from test | WHERE field:another_field_or_value",
+            "line 1:25: mismatched input 'another_field_or_value' expecting {QUOTED_STRING, INTEGER_LITERAL, DECIMAL_LITERAL, "
+        );
+        expectError("from test | WHERE field:2+3", "line 1:26: mismatched input '+' expecting {<EOF>, '|', 'and', 'or'}");
+        expectError(
+            "from test | WHERE \"field\":\"value\"",
+            "line 1:26: mismatched input ':' expecting {<EOF>, '|', 'and', '::', 'or', '+', '-', '*', '/', '%'}"
+        );
+        expectError(
+            "from test | WHERE CONCAT(\"field\", 1):\"value\"",
+            "line 1:37: mismatched input ':' expecting {<EOF>, '|', 'and', '::', 'or', '+', '-', '*', '/', '%'}"
+        );
     }
 }