[parser] Detect invalid aggregation in select distinct

initial

2 files changed, 8 insertions, 1 deletions

diff --git a/ydb/library/yql/sql/v1/select.cpp b/ydb/library/yql/sql/v1/select.cpp
index c3fa583668..65d7a3624c 100644
--- a/ydb/library/yql/sql/v1/select.cpp
+++ b/ydb/library/yql/sql/v1/select.cpp
@@ -1923,7 +1923,7 @@ private:
         if (Having && !Having->Init(ctx, src)) {
             hasError = true;
         }
-        if (!src->IsCompositeSource() && !Distinct && !Columns.All && src->HasAggregations()) {
+        if (!src->IsCompositeSource() && !Columns.All && src->HasAggregations()) {
             WarnIfAliasFromSelectIsUsedInGroupBy(ctx, Terms, GroupBy, GroupByExpr);
 
             /// verify select aggregation compatibility
diff --git a/ydb/library/yql/sql/v1/sql_ut.cpp b/ydb/library/yql/sql/v1/sql_ut.cpp
index d6775fb53b..8b8f58b58f 100644
--- a/ydb/library/yql/sql/v1/sql_ut.cpp
+++ b/ydb/library/yql/sql/v1/sql_ut.cpp
@@ -2306,6 +2306,13 @@ Y_UNIT_TEST_SUITE(SqlToYQLErrors) {
             "<main>:1:17: Error: Column `subkey` must either be a key column in GROUP BY or it should be used in aggregation function\n");
     }
 
+    Y_UNIT_TEST(SelectDistinctWithBadAggregation) {
+        ExpectFailWithError("select distinct count(*), 1 + key from plato.Input",
+            "<main>:1:31: Error: Column `key` must either be a key column in GROUP BY or it should be used in aggregation function\n");
+        ExpectFailWithError("select distinct key, 2 * subkey from plato.Input group by key",
+            "<main>:1:26: Error: Column `subkey` must either be a key column in GROUP BY or it should be used in aggregation function\n");
+    }
+
     Y_UNIT_TEST(SelectWithBadAggregationInHaving) {
         ExpectFailWithError("select key from plato.Input group by key\n"
                             "having \"f\" || value == \"foo\"",