enable new setting for CI and improve test

dbms/src/Core/Settings.h

@@ -398,7 +398,7 @@ struct Settings : public SettingsCollection<Settings>
     M(SettingBool, partial_revokes, false, "Makes it possible to revoke privileges partially.", 0) \
     M(SettingBool, deduplicate_blocks_in_dependent_materialized_views, false, "Should deduplicate blocks for materialized views if the block is not a duplicate for the table. Use true to always deduplicate in dependent tables.", 0) \
     M(SettingBool, use_compact_format_in_distributed_parts_names, false, "Changes format of directories names for distributed table insert parts.", 0) \
-    M(SettingUInt64, multiple_joins_rewriter_version, 1, "1 or 2. Second rewriter version knows about table columns and keep not clashed names as is.", 0) \
+    M(SettingUInt64, multiple_joins_rewriter_version, 2, "1 or 2. Second rewriter version knows about table columns and keep not clashed names as is.", 0) \
     \
     /** Obsolete settings that do nothing but left for compatibility reasons. Remove each one after half a year of obsolescence. */ \
     \

dbms/tests/queries/0_stateless/00847_multiple_join_same_column.reference

@@ -31,6 +31,18 @@ y.b: 0
 │   1 │   1 │   1 │
 │   2 │   2 │   2 │
 └─────┴─────┴─────┘
+┌─s.a─┬─s.a─┬─s_b─┬─s_b─┐
+│   1 │   1 │   1 │   1 │
+│   0 │   0 │   0 │   0 │
+└─────┴─────┴─────┴─────┘
+┌─y.a─┬─y.a─┬─y_b─┬─y_b─┐
+│   1 │   1 │   1 │   1 │
+│   0 │   0 │   0 │   0 │
+└─────┴─────┴─────┴─────┘
+┌─t_a─┬─t_a─┬─s_a─┬─s_a─┬─y_a─┬─y_a─┐
+│   1 │   1 │   1 │   1 │   1 │   1 │
+│   2 │   2 │   0 │   0 │   0 │   0 │
+└─────┴─────┴─────┴─────┴─────┴─────┘
 ┌─s.a─┬─s.a─┬─s_b─┬─s.b─┐
 │   1 │   1 │   1 │   1 │
 │   0 │   0 │   0 │   0 │

dbms/tests/queries/0_stateless/00847_multiple_join_same_column.sql

@@ -39,6 +39,28 @@ left join y on y.b = s.b
 order by t.a
 format PrettyCompactNoEscapes;
 
+set multiple_joins_rewriter_version = 1;
+
+select s.a, s.a, s.b as s_b, s.b from t
+left join s on s.a = t.a
+left join y on s.b = y.b
+order by t.a
+format PrettyCompactNoEscapes;
+
+select y.a, y.a, y.b as y_b, y.b from t
+left join s on s.a = t.a
+left join y on y.b = s.b
+order by t.a
+format PrettyCompactNoEscapes;
+
+select t.a, t.a as t_a, s.a, s.a as s_a, y.a, y.a as y_a from t
+left join s on t.a = s.a
+left join y on y.b = s.b
+order by t.a
+format PrettyCompactNoEscapes;
+
+set multiple_joins_rewriter_version = 2;
+
 select s.a, s.a, s.b as s_b, s.b from t
 left join s on s.a = t.a
 left join y on s.b = y.b