Merge pull request ClickHouse#45565 from ClickHouse/backport/22.8/41189

Backport ClickHouse#41189 to 22.8: Fix for positional arguments

Author: kssenii

src/Interpreters/TreeRewriter.cpp

@@ -1253,9 +1253,6 @@ TreeRewriterResultPtr TreeRewriter::analyzeSelect(
             all_source_columns_set.insert(name);
     }
 
-    normalize(query, result.aliases, all_source_columns_set, select_options.ignore_alias, settings, /* allow_self_aliases = */ true, getContext());
-
-
     if (getContext()->getSettingsRef().enable_positional_arguments)
     {
         if (select_query->groupBy())
@@ -1275,6 +1272,8 @@ TreeRewriterResultPtr TreeRewriter::analyzeSelect(
         }
     }
 
+    normalize(query, result.aliases, all_source_columns_set, select_options.ignore_alias, settings, /* allow_self_aliases = */ true, getContext());
+
     /// Remove unneeded columns according to 'required_result_columns'.
     /// Leave all selected columns in case of DISTINCT; columns that contain arrayJoin function inside.
     /// Must be after 'normalizeTree' (after expanding aliases, for aliases not get lost)

tests/queries/0_stateless/02006_test_positional_arguments.reference

@@ -117,7 +117,19 @@ select b from (select 5 as a, 'Hello' as b group by a);
 Hello
 select b from (select 5 as a, 'Hello' as b order by 1);
 Hello
+drop table if exists tp2;
 create table tp2(first_col String, second_col Int32) engine = MergeTree() order by tuple();
 select count(*) from (select first_col, count(second_col) from tp2 group by 1);
 0
 select total from (select first_col, count(second_col) as total from tp2 group by 1);
+drop table if exists test;
+create table test
+(
+`id`  UInt32,
+`time` UInt32,
+index `id` (`id`) type set(0) granularity 3,
+index `time` (`time`) type minmax granularity 3
+) engine = MergeTree()
+order by (`time`);
+select count(*) as `value`, 0 as `data` from test group by `data`;
+drop table test;

tests/queries/0_stateless/02006_test_positional_arguments.sql

@@ -49,6 +49,21 @@ select b from (select 5 as a, 'Hello' as b order by a);
 select b from (select 5 as a, 'Hello' as b group by a);
 select b from (select 5 as a, 'Hello' as b order by 1);
 
+drop table if exists tp2;
 create table tp2(first_col String, second_col Int32) engine = MergeTree() order by tuple();
 select count(*) from (select first_col, count(second_col) from tp2 group by 1);
 select total from (select first_col, count(second_col) as total from tp2 group by 1);
+
+drop table if exists test;
+create table test
+(
+`id`  UInt32,
+`time` UInt32,
+index `id` (`id`) type set(0) granularity 3,
+index `time` (`time`) type minmax granularity 3
+) engine = MergeTree()
+order by (`time`);
+
+select count(*) as `value`, 0 as `data` from test group by `data`;
+
+drop table test;