Changed error message

Author: carlosdelest

docs/changelog/125479.yaml

@@ -1,5 +1,5 @@
 pr: 125479
-summary: ES|QL - Allow full text functions to be used in STATS ... WHERE
+summary: ES|QL - Allow full text functions to be used in STATS
 area: ES|QL
 type: enhancement
 issues:

x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/plugin/KqlFunctionIT.java

@@ -66,7 +66,7 @@ public void testKqlQueryWithinEval() {
             """;
 
         var error = expectThrows(VerificationException.class, () -> run(query));
-        assertThat(error.getMessage(), containsString("[KQL] function is only supported in WHERE and STATS ... WHERE commands"));
+        assertThat(error.getMessage(), containsString("[KQL] function is only supported in WHERE and STATS commands"));
     }
 
     public void testInvalidKqlQueryEof() {

x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/plugin/MatchFunctionIT.java

@@ -253,7 +253,7 @@ public void testMatchWithStats() {
             """;
 
         var error = expectThrows(ElasticsearchException.class, () -> run(errorQuery));
-        assertThat(error.getMessage(), containsString("[MATCH] function is only supported in WHERE and STATS ... WHERE commands"));
+        assertThat(error.getMessage(), containsString("[MATCH] function is only supported in WHERE and STATS commands"));
 
         var query = """
             FROM test
@@ -274,7 +274,7 @@ public void testMatchWithinEval() {
             """;
 
         var error = expectThrows(VerificationException.class, () -> run(query));
-        assertThat(error.getMessage(), containsString("[MATCH] function is only supported in WHERE and STATS ... WHERE commands"));
+        assertThat(error.getMessage(), containsString("[MATCH] function is only supported in WHERE and STATS commands"));
     }
 
     private void createAndPopulateIndex() {

x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/plugin/MatchOperatorIT.java

@@ -354,7 +354,7 @@ public void testMatchWithinEval() {
             """;
 
         var error = expectThrows(VerificationException.class, () -> run(query));
-        assertThat(error.getMessage(), containsString("[:] operator is only supported in WHERE and STATS ... WHERE commands"));
+        assertThat(error.getMessage(), containsString("[:] operator is only supported in WHERE and STATS commands"));
     }
 
     public void testMatchWithNonTextField() {

x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/plugin/QueryStringIT.java

@@ -63,7 +63,7 @@ public void testQueryStringWithinEval() {
             """;
 
         var error = expectThrows(VerificationException.class, () -> run(query));
-        assertThat(error.getMessage(), containsString("[QSTR] function is only supported in WHERE and STATS ... WHERE commands"));
+        assertThat(error.getMessage(), containsString("[QSTR] function is only supported in WHERE and STATS commands"));
     }
 
     public void testInvalidQueryStringEof() {

x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/plugin/TermIT.java

@@ -57,7 +57,7 @@ public void testTermWithinEval() {
             """;
 
         var error = expectThrows(VerificationException.class, () -> run(query));
-        assertThat(error.getMessage(), containsString("[Term] function is only supported in WHERE and STATS ... WHERE commands"));
+        assertThat(error.getMessage(), containsString("[Term] function is only supported in WHERE and STATS commands"));
     }
 
     public void testMultipleTerm() {

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlCapabilities.java

@@ -1067,7 +1067,7 @@ public enum Cap {
         FIRST_OVER_TIME(Build.current().isSnapshot()),
 
         /**
-         * Full text functions in STATS ... WHERE
+         * Full text functions in STATS
          */
         FULL_TEXT_FUNCTIONS_IN_STATS_WHERE;
 

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/fulltext/FullTextFunction.java

@@ -231,7 +231,7 @@ private static void checkFullTextQueryFunctions(LogicalPlan plan, Failures failu
         } else {
             plan.forEachExpression(FullTextFunction.class, ftf -> {
                 failures.add(
-                    fail(ftf, "[{}] {} is only supported in WHERE and STATS ... WHERE commands", ftf.functionName(), ftf.functionType())
+                    fail(ftf, "[{}] {} is only supported in WHERE and STATS commands", ftf.functionName(), ftf.functionType())
                 );
             });
         }
@@ -242,7 +242,7 @@ private static void checkFullTextFunctionsInAggs(Aggregate agg, Failures failure
             exp.forEachDown(e -> {
                 if (e instanceof FullTextFunction ftf) {
                     failures.add(
-                        fail(ftf, "[{}] {} is only supported in WHERE and STATS ... WHERE commands", ftf.functionName(), ftf.functionType())
+                        fail(ftf, "[{}] {} is only supported in WHERE and STATS commands", ftf.functionName(), ftf.functionType())
                     );
                 }
             });

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/analysis/VerifierTests.java

@@ -1209,7 +1209,7 @@ public void testWeightedAvg() {
 
     public void testMatchInsideEval() throws Exception {
         assertEquals(
-            "1:36: [:] operator is only supported in WHERE and STATS ... WHERE commands\n"
+            "1:36: [:] operator is only supported in WHERE and STATS commands\n"
                 + "line 1:36: [:] operator cannot operate on [title], which is not a field from an index mapping",
             error("row title = \"brown fox\" | eval x = title:\"fox\" ")
         );
@@ -1369,12 +1369,12 @@ public void testKqlFunctionsNotAllowedAfterCommands() throws Exception {
     }
 
     public void testQueryStringFunctionOnlyAllowedInWhere() throws Exception {
-        assertEquals("1:9: [QSTR] function is only supported in WHERE and STATS ... WHERE commands", error("row a = qstr(\"Anna\")"));
+        assertEquals("1:9: [QSTR] function is only supported in WHERE and STATS commands", error("row a = qstr(\"Anna\")"));
         checkFullTextFunctionsOnlyAllowedInWhere("QSTR", "qstr(\"Anna\")", "function");
     }
 
     public void testKqlFunctionOnlyAllowedInWhere() throws Exception {
-        assertEquals("1:9: [KQL] function is only supported in WHERE and STATS ... WHERE commands", error("row a = kql(\"Anna\")"));
+        assertEquals("1:9: [KQL] function is only supported in WHERE and STATS commands", error("row a = kql(\"Anna\")"));
         checkFullTextFunctionsOnlyAllowedInWhere("KQL", "kql(\"Anna\")", "function");
     }
 
@@ -1394,15 +1394,15 @@ public void testMatchOperatornOnlyAllowedInWhere() throws Exception {
     private void checkFullTextFunctionsOnlyAllowedInWhere(String functionName, String functionInvocation, String functionType)
         throws Exception {
         assertEquals(
-            "1:22: [" + functionName + "] " + functionType + " is only supported in WHERE and STATS ... WHERE commands",
+            "1:22: [" + functionName + "] " + functionType + " is only supported in WHERE and STATS commands",
             error("from test | eval y = " + functionInvocation)
         );
         assertEquals(
-            "1:18: [" + functionName + "] " + functionType + " is only supported in WHERE and STATS ... WHERE commands",
+            "1:18: [" + functionName + "] " + functionType + " is only supported in WHERE and STATS commands",
             error("from test | sort " + functionInvocation + " asc")
         );
         assertEquals(
-            "1:47: [" + functionName + "] " + functionType + " is only supported in WHERE and STATS ... WHERE commands",
+            "1:47: [" + functionName + "] " + functionType + " is only supported in WHERE and STATS commands",
             error("from test | stats max_salary = max(salary) by " + functionInvocation)
         );
     }
@@ -2478,7 +2478,7 @@ public void testMultiMatchTargetsExistingField() throws Exception {
     public void testMultiMatchInsideEval() throws Exception {
         assumeTrue("MultiMatch operator is available just for snapshots", Build.current().isSnapshot());
         assertEquals(
-            "1:36: [MultiMatch] function is only supported in WHERE and STATS ... WHERE commands\n"
+            "1:36: [MultiMatch] function is only supported in WHERE and STATS commands\n"
                 + "line 1:55: [MultiMatch] function cannot operate on [title], which is not a field from an index mapping",
             error("row title = \"brown fox\" | eval x = multi_match(\"fox\", title)")
         );