[yql] Improve error message even more (mentioning window function only adds confusion)

ref:1b15c8bfe41ac7904cb585cab20c8cdf06563328

3 files changed, 4 insertions, 4 deletions

diff --git a/ydb/library/yql/sql/v1/aggregation.cpp b/ydb/library/yql/sql/v1/aggregation.cpp
index 40e2049c0da..4b8ce470458 100644
--- a/ydb/library/yql/sql/v1/aggregation.cpp
+++ b/ydb/library/yql/sql/v1/aggregation.cpp
@@ -106,14 +106,14 @@ protected:
             return false;
         }
         if (Expr->IsAggregated() && !Expr->IsAggregationKey() && !IsOverWindow()) {
-            ctx.Error(Pos) << "Aggregation of aggregated values is forbidden for non window functions";
+            ctx.Error(Pos) << "Aggregation of aggregated values is forbidden";
             return false;
         }
         if (AggMode == EAggregateMode::Distinct) {
             const auto column = Expr->GetColumnName();
             if (!column) {
                 // TODO: improve TBasicAggrFunc::CollectPreaggregateExprs()
-                ctx.Error(Pos) << "Aggregation of aggregated values is forbidden for non window functions";
+                ctx.Error(Pos) << "Aggregation of aggregated values is forbidden";
                 return false;
             }
             DistinctKey = *column;
diff --git a/ydb/library/yql/sql/v1/builtin.cpp b/ydb/library/yql/sql/v1/builtin.cpp
index a8ad3cf4eb4..767b7996466 100644
--- a/ydb/library/yql/sql/v1/builtin.cpp
+++ b/ydb/library/yql/sql/v1/builtin.cpp
@@ -172,7 +172,7 @@ private:
         if (PreaggregateExpr) {
             YQL_ENSURE(PreaggregateExpr->HasState(ENodeState::Initialized));
             if (PreaggregateExpr->IsAggregated() && !PreaggregateExpr->IsAggregationKey() && !Aggr->IsOverWindow()) {
-                ctx.Error(Aggr->GetPos()) << "Aggregation of aggregated values is forbidden for non window functions";
+                ctx.Error(Aggr->GetPos()) << "Aggregation of aggregated values is forbidden";
                 return false;
             }
         }
diff --git a/ydb/library/yql/sql/v1/sql_ut.cpp b/ydb/library/yql/sql/v1/sql_ut.cpp
index f0a778185d2..37c5fdc167e 100644
--- a/ydb/library/yql/sql/v1/sql_ut.cpp
+++ b/ydb/library/yql/sql/v1/sql_ut.cpp
@@ -3265,7 +3265,7 @@ select FormatType($f());
     }
 
     Y_UNIT_TEST(AggregationOfAgrregatedDistinctExpr) {
-        ExpectFailWithError("select sum(sum(distinct x + 1)) from plato.Input", "<main>:1:12: Error: Aggregation of aggregated values is forbidden for non window functions\n");
+        ExpectFailWithError("select sum(sum(distinct x + 1)) from plato.Input", "<main>:1:12: Error: Aggregation of aggregated values is forbidden\n");
     }
 }