Fix column alias rewriting

src/Interpreters/ColumnAliasesVisitor.cpp

@@ -81,6 +81,7 @@ void ColumnAliasesMatcher::visit(ASTIdentifier & node, ASTPtr & ast, Data & data
             else
                 ast->setAlias(*column_name);
 
+            data.changed = true;
             // revisit ast to track recursive alias columns
             Visitor(data).visit(ast);
         }

src/Interpreters/ColumnAliasesVisitor.h

@@ -60,6 +60,9 @@ public:
         /// private_aliases are from lambda, so these are local names.
         NameSet private_aliases;
 
+        /// Check if query is changed by this visitor.
+        bool changed = false;
+
         Data(const ColumnsDescription & columns_, const NameToNameMap & array_join_result_columns_, ContextPtr context_)
             : columns(columns_), context(context_)
         {

src/Interpreters/TreeRewriter.cpp

@@ -951,9 +951,14 @@ TreeRewriterResultPtr TreeRewriter::analyzeSelect(
     /// rewrite filters for select query, must go after getArrayJoinedColumns
     if (settings.optimize_respect_aliases && result.metadata_snapshot)
     {
-        replaceAliasColumnsInQuery(query, result.metadata_snapshot->getColumns(), result.array_join_result_to_source, getContext());
+        /// If query is changed, we need to redo some work to correct name resolution.
+        if (replaceAliasColumnsInQuery(query, result.metadata_snapshot->getColumns(), result.array_join_result_to_source, getContext()))
+        {
+            result.aggregates = getAggregates(query, *select_query);
+            result.window_function_asts = getWindowFunctions(query, *select_query);
             result.collectUsedColumns(query, true);
         }
+    }
 
     result.ast_join = select_query->join();
 

src/Interpreters/replaceAliasColumnsInQuery.cpp

@@ -6,12 +6,13 @@
 namespace DB
 {
 
-void replaceAliasColumnsInQuery(
+bool replaceAliasColumnsInQuery(
     ASTPtr & ast, const ColumnsDescription & columns, const NameToNameMap & array_join_result_to_source, ContextPtr context)
 {
     ColumnAliasesVisitor::Data aliases_column_data(columns, array_join_result_to_source, context);
     ColumnAliasesVisitor aliases_column_visitor(aliases_column_data);
     aliases_column_visitor.visit(ast);
+    return aliases_column_data.changed;
 }
 
 }

src/Interpreters/replaceAliasColumnsInQuery.h

@@ -10,7 +10,8 @@ namespace DB
 
 class ColumnsDescription;
 
-void replaceAliasColumnsInQuery(
+/// Replace storage alias columns in select query if possible. Return true if the query is changed.
+bool replaceAliasColumnsInQuery(
     ASTPtr & ast, const ColumnsDescription & columns, const NameToNameMap & array_join_result_to_source, ContextPtr context);
 
 }

tests/queries/0_stateless/01576_alias_column_rewrite.reference

@@ -61,3 +61,4 @@ second-index
 1
 1
 1
+1	1

tests/queries/0_stateless/01576_alias_column_rewrite.sql

@@ -127,3 +127,11 @@ select sum(i) from pd group by dt_m settings allow_experimental_projection_optim
 
 drop table pd;
 drop table pl;
+
+drop table if exists t;
+
+create temporary table t (x UInt64, y alias x);
+insert into t values (1);
+select sum(x), sum(y) from t;
+
+drop table t;