fix tests

Author: not-napoleon

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/logical/UnresolvedRelation.java

@@ -172,6 +172,6 @@ public String toString() {
      *         which changes a number of behaviors in the planner.
      */
     public boolean isTimeSeriesMode() {
-        return commandName.equalsIgnoreCase("TS");
+        return indexMode == IndexMode.TIME_SERIES;
     }
 }

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/session/FieldNameUtils.java

@@ -172,7 +172,7 @@ public static PreAnalysisResult resolveFieldNames(LogicalPlan parsed, EnrichReso
                 }
             } else {
                 referencesBuilder.get().addAll(p.references());
-                if (p instanceof UnresolvedRelation ur && ur.indexMode() == IndexMode.TIME_SERIES) {
+                if (p instanceof UnresolvedRelation ur && ur.isTimeSeriesMode()) {
                     // METRICS aggs generally rely on @timestamp without the user having to mention it.
                     referencesBuilder.get().add(new UnresolvedAttribute(ur.source(), MetadataAttribute.TIMESTAMP_FIELD));
                 }

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/session/FieldNameUtilsTests.java

@@ -17,8 +17,8 @@
 import org.elasticsearch.xpack.esql.parser.ParsingException;
 import org.elasticsearch.xpack.esql.plan.logical.Enrich;
 
+import java.util.HashSet;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 
@@ -1613,7 +1613,7 @@ public void testMetrics() {
             assertThat(e.getMessage(), containsString("line 1:1: mismatched input 'TS' expecting {"));
             return;
         }
-        assertFieldNames(
+        assertTsFieldNames(
             query,
             Set.of(
                 "@timestamp",
@@ -2977,15 +2977,19 @@ private void assertFieldNames(String query, EnrichResolution enrichResolution, S
         assertThat("Query-wide field names", preAnalysisResult.fieldNames(), equalTo(expected));
         assertThat("Lookup Indices that expect wildcard lookups", preAnalysisResult.wildcardJoinIndices(), equalTo(wildCardIndices));
         assertThat(preAnalysisResult.collectAllDimensions(), equalTo(false));
+    }
 
-        // try again with TS command
-        String tsQuery = query.toLowerCase(Locale.ROOT).replaceFirst("^from", "ts");
-        if (tsQuery.equals(query)) {
-            return;
-        }
-        preAnalysisResult = FieldNameUtils.resolveFieldNames(parser.createStatement(tsQuery, EsqlTestUtils.TEST_CFG), enrichResolution);
-        assertThat("Query-wide field names", preAnalysisResult.fieldNames(), equalTo(expected));
-        assertThat("Lookup Indices that expect wildcard lookups", preAnalysisResult.wildcardJoinIndices(), equalTo(wildCardIndices));
+    private void assertTsFieldNames(String query, Set<String> expected) {
+        // Expected may be unmodifiable
+        Set<String> tsExpected = new HashSet<>(expected);
+        tsExpected.add("@timestamp");
+        tsExpected.add("@timestamp.*");
+
+        EsqlSession.PreAnalysisResult preAnalysisResult = FieldNameUtils.resolveFieldNames(
+            parser.createStatement(query, EsqlTestUtils.TEST_CFG),
+            new EnrichResolution()
+        );
+        assertThat("Query-wide field names", preAnalysisResult.fieldNames(), equalTo(tsExpected));
         assertThat(preAnalysisResult.collectAllDimensions(), equalTo(true));
     }