YQL-20170 fix

commit_hash:2c408c6ee755878a488f1591510d196d1bf5fba1

1 files changed, 5 insertions, 3 deletions

diff --git a/yql/essentials/sql/v1/node.cpp b/yql/essentials/sql/v1/node.cpp
index f6763c2be07..84395eb78cc 100644
--- a/yql/essentials/sql/v1/node.cpp
+++ b/yql/essentials/sql/v1/node.cpp
@@ -1544,9 +1544,11 @@ bool TColumnNode::DoInit(TContext& ctx, ISource* src) {
 
         if (GetColumnName()) {
             auto fullName = Source_ ? DotJoin(Source_, *GetColumnName()) : *GetColumnName();
-            auto alias = src->GetGroupByColumnAlias(fullName);
-            if (alias) {
-                ResetColumn(alias, {});
+            if (!ctx.GroupByExprAfterWhere) {
+                auto alias = src->GetGroupByColumnAlias(fullName);
+                if (alias) {
+                    ResetColumn(alias, {});
+                }
             }
             Artificial_ = !Source_ && src->IsExprAlias(*GetColumnName());
         }