fixup

Author: pabloem

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

@@ -119,20 +119,6 @@ public boolean equals(Object obj) {
     @Override
     public void postAnalysisVerification(Failures failures) {
         super.postAnalysisVerification(failures);
-        // We forbid aggregating 'dimension' fields - these are only allowed inside grouping functions
-        aggregates().forEach(agg -> agg.forEachDown(e -> {
-            if (e instanceof FieldAttribute fieldAttr && fieldAttr.isDimension()) {
-                failures.add(
-                    fail(
-                        fieldAttr,
-                        "cannot aggregate dimension field [{}] in a time-series aggregation. "
-                            + "If you want to aggregate a dimension field, use the FROM "
-                            + "command instead of the TS command.",
-                        fieldAttr.sourceText()
-                    )
-                );
-            }
-        }));
         // We forbid grouping by a metric field itself. Metric fields are allowed only inside aggregate functions.
         groupings().forEach(g -> g.forEachDown(e -> {
             if (e instanceof FieldAttribute fieldAttr && fieldAttr.isMetric()) {
@@ -217,6 +203,18 @@ protected void checkTimeSeriesAggregates(Failures failures) {
                         fail(count, "count_star [{}] can't be used with TS command; use count on a field instead", outer.sourceText())
                     );
                 }
+                if (outer.field() instanceof FieldAttribute fa && fa.isDimension()) {
+                    failures.add(
+                        fail(
+                            this,
+                            "cannot use dimension field [{}] in a time-series aggregation function [{}]. "
+                                + "Dimension fields can only be used for grouping in a BY clause. To aggregate "
+                                + "dimension fields, use the FROM command instead of the TS command.",
+                            fa.sourceText(),
+                            outer.sourceText()
+                        )
+                    );
+                }
                 if (outer instanceof TimeSeriesAggregateFunction ts) {
                     outer.field()
                         .forEachDown(

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

@@ -2693,8 +2693,9 @@ public void testNoDimensionsInAggsOnlyInByClause() {
         assertThat(
             error("TS test | STATS count(host) BY bucket(@timestamp, 1 minute)", tsdb),
             equalTo(
-                "1:23: cannot aggregate dimension field [host] in a time-series aggregation. "
-                    + "If you want to aggregate a dimension field, use the FROM command instead of the TS command."
+                "1:11: cannot use dimension field [host] in a time-series aggregation function [count(host)]. "
+                    + "Dimension fields can only be used for grouping in a BY clause. "
+                    + "To aggregate dimension fields, use the FROM command instead of the TS command."
             )
         );
     }