Fix merge

Author: carlosdelest

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/LocalPhysicalPlanOptimizerTests.java

@@ -1396,7 +1396,7 @@ private void checkMatchFunctionPushDown(
         Collection<DataType> fieldDataTypes,
         String queryFormat
     ) {
-        var analyzer = makeAnalyzer("mapping-all-types.json");
+        var analyzer = makeAnalyzer("mapping-all-types.json", new EnrichResolution());
         // Check for every possible query data type
         for (DataType fieldDataType : fieldDataTypes) {
             var queryValue = randomQueryValue(fieldDataType);