that's it

Author: nik9000

x-pack/plugin/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/RestEsqlTestCase.java

@@ -764,7 +764,8 @@ public void testNamedParamsForIdentifierAndIdentifierPatterns() throws IOExcepti
             );
             error = re.getMessage();
             assertThat(error, containsString("ParsingException"));
-            assertThat(error, containsString("line 1:23: mismatched input '?cmd' expecting {'dissect', 'drop'"));
+            assertThat(error, containsString("line 1:23: mismatched input '?cmd' expecting {"));
+            assertThat(error, containsString("'dissect', 'eval', 'grok', 'limit', 'sort'"));
         }
     }
 

x-pack/plugin/esql/src/main/antlr/EsqlBaseLexer.g4

@@ -54,8 +54,8 @@ options {
  * the UNKNOWN_CMD token *last* because it takes over parsing for
  * all other commands.
  */
-import Enrich,
-       ChangePoint, // TODO figure out why Enrich has to be first.
+import ChangePoint,
+       Enrich,
        Explain,
        Expression,
        From,

x-pack/plugin/esql/src/main/antlr/EsqlBaseLexer.tokens

@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-lexer grammar Enrich;
+lexer grammar ChangePoint;
 
 //
 // | CHANGE_POINT command