do not add newline after FLATTEN BY

commit_hash:929f90e2a47ca3aafdf081a36c776ae1cebef3be

38 files changed, 47 insertions, 96 deletions

diff --git a/yql/essentials/sql/v1/format/sql_format.cpp b/yql/essentials/sql/v1/format/sql_format.cpp
index bb8d20b9a00..d4bc63da05b 100644
--- a/yql/essentials/sql/v1/format/sql_format.cpp
+++ b/yql/essentials/sql/v1/format/sql_format.cpp
@@ -2047,10 +2047,7 @@ private:
         switch (msg.Alt_case()) {
         case TRule_flatten_by_arg::kAltFlattenByArg1: {
             const auto& alt = msg.GetAlt_flatten_by_arg1();
-            NewLine();
-            PushCurrentIndent();
             Visit(alt);
-            PopCurrentIndent();
             break;
         }
         case TRule_flatten_by_arg::kAltFlattenByArg2: {
diff --git a/yql/essentials/sql/v1/format/sql_format_ut.h b/yql/essentials/sql/v1/format/sql_format_ut.h
index abf893c72eb..3cd8fc0470b 100644
--- a/yql/essentials/sql/v1/format/sql_format_ut.h
+++ b/yql/essentials/sql/v1/format/sql_format_ut.h
@@ -791,7 +791,7 @@ Y_UNIT_TEST(Select) {
         {"select 1 from user flatten columns",
             "SELECT\n\t1\nFROM user\n\tFLATTEN COLUMNS;\n"},
         {"select 1 from user flatten list by user",
-            "SELECT\n\t1\nFROM user\n\tFLATTEN LIST BY\n\t\tuser;\n"},
+            "SELECT\n\t1\nFROM user\n\tFLATTEN LIST BY user;\n"},
         {"select 1 from user flatten list by (user,user)",
             "SELECT\n\t1\nFROM user\n\tFLATTEN LIST BY (\n\t\tuser,\n\t\tuser\n\t);\n"},
         {"select 1 from $user(1,2)",
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_gs_flatten_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_gs_flatten_/formatted.sql
index 734bf95f751..e4ae80a70c2 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_gs_flatten_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_gs_flatten_/formatted.sql
@@ -14,8 +14,7 @@ SELECT
     subkey,
     some(lst) AS lst_count
 FROM $input
-    FLATTEN LIST BY
-        lst
+    FLATTEN LIST BY lst
 WHERE lst != 1
 GROUP BY
     GROUPING SETS (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-double_join_with_list_from_range_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-double_join_with_list_from_range_/formatted.sql
index 06d63596a39..8c87d14aed2 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-double_join_with_list_from_range_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-double_join_with_list_from_range_/formatted.sql
@@ -13,8 +13,7 @@ $list =
             SELECT
                 ListFromRange(1us, 333us) AS lst
         )
-            FLATTEN LIST BY
-                lst
+            FLATTEN LIST BY lst
     );
 
 $usr =
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_and_where_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_and_where_/formatted.sql
index b7645e7a733..149da88a826 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_and_where_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_and_where_/formatted.sql
@@ -14,8 +14,7 @@ SELECT
     iv
 FROM $data
     AS d
-    FLATTEN BY
-        lv AS iv
+    FLATTEN BY lv AS iv
 WHERE iv < 'd'
 ORDER BY
     mod,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_by_aster_opt_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_by_aster_opt_/formatted.sql
index 1d0af91cd30..195f577d4c6 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_by_aster_opt_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_by_aster_opt_/formatted.sql
@@ -9,5 +9,4 @@ FROM (
     FROM plato.Input
         AS d
 )
-    FLATTEN BY
-        ok;
+    FLATTEN BY ok;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_by_group_by_alias_collision_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_by_group_by_alias_collision_/formatted.sql
index 6a7e84995d0..48cea7283e7 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_by_group_by_alias_collision_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_by_group_by_alias_collision_/formatted.sql
@@ -5,8 +5,7 @@ SELECT
     subkey,
     COUNT(key) AS cnt
 FROM AS_TABLE($data)
-    FLATTEN LIST BY
-        subkeys AS subkey
+    FLATTEN LIST BY subkeys AS subkey
 GROUP BY
     CAST(subkey AS String) AS subkey
 ORDER BY
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_by_opt_dict_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_by_opt_dict_/formatted.sql
index f2fd7e3d74e..6f4e5828620 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_by_opt_dict_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_by_opt_dict_/formatted.sql
@@ -13,7 +13,6 @@ $data_dict = (
 SELECT
     *
 FROM $data_dict
-    FLATTEN DICT BY
-        dk
+    FLATTEN DICT BY dk
 ORDER BY
     mod;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_by_typed_table_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_by_typed_table_/formatted.sql
index e7c3cdf182e..67bf6b3a257 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_by_typed_table_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_by_typed_table_/formatted.sql
@@ -4,5 +4,4 @@ SELECT
     bb
 FROM plato.Input
     VIEW opt_struct
-    FLATTEN BY
-        b AS bb;
+    FLATTEN BY b AS bb;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_corr_name_column_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_corr_name_column_/formatted.sql
index ab595d437f9..25f422573c2 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_corr_name_column_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_corr_name_column_/formatted.sql
@@ -18,8 +18,7 @@ SELECT
     l
 FROM $data
     AS l
-    FLATTEN BY
-        l
+    FLATTEN BY l
 ORDER BY
     n,
     l;
@@ -29,8 +28,7 @@ SELECT
     l
 FROM $data
     AS l
-    FLATTEN BY
-        l.l
+    FLATTEN BY l.l
 ORDER BY
     n,
     l;
@@ -40,8 +38,7 @@ SELECT
     l
 FROM $data
     AS s
-    FLATTEN BY
-        s.l
+    FLATTEN BY s.l
 ORDER BY
     n,
     l;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_expr_struct_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_expr_struct_/formatted.sql
index 689eeb4eff1..d8121d1b8d4 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_expr_struct_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_expr_struct_/formatted.sql
@@ -17,8 +17,7 @@ SELECT
     n,
     l
 FROM $data
-    FLATTEN BY
-        s.l AS l
+    FLATTEN BY s.l AS l
 ORDER BY
     n,
     l;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_list_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_list_/formatted.sql
index 8de5dcddf47..1ec7040b76d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_list_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_list_/formatted.sql
@@ -13,8 +13,7 @@ SELECT
     mod,
     iv
 FROM $data
-    FLATTEN BY
-        lv AS iv
+    FLATTEN BY lv AS iv
 ORDER BY
     mod,
     iv;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_list_on_flatten_by_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_list_on_flatten_by_/formatted.sql
index 6e98277968a..f4d4c46e471 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_list_on_flatten_by_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_list_on_flatten_by_/formatted.sql
@@ -7,8 +7,7 @@ $flatten = (
         bc_type_tuple
     FROM Input
         AS a
-        FLATTEN BY
-            parsed_answers_and_clicks AS answer_and_clicks
+        FLATTEN BY parsed_answers_and_clicks AS answer_and_clicks
     WHERE answer_and_clicks.1 == 1
 );
 
@@ -24,5 +23,4 @@ FROM (
     FROM $flatten
         AS a
 )
-    FLATTEN LIST BY
-        bc_type;
+    FLATTEN LIST BY bc_type;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_member_is_struct_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_member_is_struct_/formatted.sql
index fbb5f22f708..0bb45676594 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_member_is_struct_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_member_is_struct_/formatted.sql
@@ -11,8 +11,6 @@ FROM (
         keyitem.kk AS kkstr
     FROM Input
         AS d
-        FLATTEN BY
-            key AS keyitem
+        FLATTEN BY key AS keyitem
 )
-    FLATTEN BY
-        kkstr AS kkstritem;
+    FLATTEN BY kkstr AS kkstritem;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_mode_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_mode_/formatted.sql
index 981d4b9e983..3c793b0bf31 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_mode_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_mode_/formatted.sql
@@ -7,8 +7,7 @@ FROM (
     SELECT
         Just(1) AS x
 )
-    FLATTEN OPTIONAL BY
-        x;
+    FLATTEN OPTIONAL BY x;
 $lst = AsList(1, 2, 3);
 
 SELECT
@@ -17,8 +16,7 @@ FROM (
     SELECT
         $lst AS x
 )
-    FLATTEN LIST BY
-        x
+    FLATTEN LIST BY x
 ORDER BY
     x;
 
@@ -28,8 +26,7 @@ FROM (
     SELECT
         Just($lst) AS x
 )
-    FLATTEN LIST BY
-        x
+    FLATTEN LIST BY x
 ORDER BY
     x;
 
@@ -39,8 +36,7 @@ FROM (
     SELECT
         Just($lst) AS x
 )
-    FLATTEN OPTIONAL BY
-        x
+    FLATTEN OPTIONAL BY x
 ORDER BY
     x;
 $dct = AsDict(AsTuple(1, "foo"), AsTuple(2, "bar"), AsTuple(3, "baz"));
@@ -51,8 +47,7 @@ FROM (
     SELECT
         $dct AS x
 )
-    FLATTEN DICT BY
-        x
+    FLATTEN DICT BY x
 ORDER BY
     x;
 
@@ -62,8 +57,7 @@ FROM (
     SELECT
         Just($dct) AS x
 )
-    FLATTEN DICT BY
-        x
+    FLATTEN DICT BY x
 ORDER BY
     x;
 
@@ -73,5 +67,4 @@ FROM (
     SELECT
         Just($dct) AS x
 )
-    FLATTEN OPTIONAL BY
-        x;
+    FLATTEN OPTIONAL BY x;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_one_field_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_one_field_/formatted.sql
index 5ab1b403138..373230cecb6 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_one_field_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_one_field_/formatted.sql
@@ -12,7 +12,6 @@ $data = (
 SELECT
     *
 FROM $data
-    FLATTEN BY
-        lv AS iv
+    FLATTEN BY lv AS iv
 ORDER BY
     iv;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_with_join_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_with_join_/formatted.sql
index 66f9c4289dd..b99d97b1da0 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_with_join_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_with_join_/formatted.sql
@@ -15,8 +15,7 @@ SELECT
     j.key
 FROM $data
     AS d
-    FLATTEN BY
-        lv
+    FLATTEN BY lv
 JOIN plato.Input
     AS j
 ON d.mod == CAST(j.key AS uint32) / 10 % 10
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_with_resource_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_with_resource_/formatted.sql
index e3c5c291cff..1db43b93fe3 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_with_resource_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_with_resource_/formatted.sql
@@ -22,5 +22,4 @@ SELECT
     key,
     $load(resourceList) AS value
 FROM $input
-    FLATTEN BY
-        resourceList;
+    FLATTEN BY resourceList;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_with_subquery_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_with_subquery_/formatted.sql
index 0f09ff6e3f2..0252fc84a32 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_with_subquery_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_with_subquery_/formatted.sql
@@ -8,8 +8,7 @@ END DEFINE;
 SELECT
     key
 FROM $bar()
-    FLATTEN LIST BY
-        ks AS key
+    FLATTEN LIST BY ks AS key
 ORDER BY
     key;
 
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-struct_without_correlation_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-struct_without_correlation_/formatted.sql
index 5a4d3e61239..b024b79b028 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-struct_without_correlation_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-struct_without_correlation_/formatted.sql
@@ -18,8 +18,7 @@ SELECT
     `struct`.`struct`
 FROM $data_dict
     AS dd
-    FLATTEN BY
-        list_struct AS `struct`
+    FLATTEN BY list_struct AS `struct`
 ORDER BY
     mod,
     column1;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_take_skip_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_take_skip_/formatted.sql
index dce09448b4d..cdba52be90c 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_take_skip_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_take_skip_/formatted.sql
@@ -9,8 +9,7 @@ FROM (
     SELECT
         ListMap(ListFromRange(1, 100), ($x) -> (Unwrap(CAST($x AS String)))) AS key
 )
-    FLATTEN LIST BY
-        key
+    FLATTEN LIST BY key
 ORDER BY
     key;
 COMMIT;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_nonseq_flatmap_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_nonseq_flatmap_/formatted.sql
index c7d9a1bf773..041c9bafd7d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_nonseq_flatmap_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_nonseq_flatmap_/formatted.sql
@@ -8,8 +8,7 @@ $hashes = (
         SELECT
             ListFromRange(0, 3) AS multiplier
     )
-        FLATTEN BY
-            multiplier
+        FLATTEN BY multiplier
 );
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-flatten_by_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-flatten_by_/formatted.sql
index 8d6481a605e..02acddc5a09 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-flatten_by_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-flatten_by_/formatted.sql
@@ -6,8 +6,7 @@ $subquery1 =
         subkey,
         z
     FROM Input
-        FLATTEN LIST BY
-            value AS z;
+        FLATTEN LIST BY value AS z;
 
 $subquery2 =
     SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-flatten_list_nested_lambda_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-flatten_list_nested_lambda_/formatted.sql
index 47d32526562..ced03981531 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-flatten_list_nested_lambda_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-flatten_list_nested_lambda_/formatted.sql
@@ -4,8 +4,7 @@ $sub = (
     SELECT
         key
     FROM Input
-        FLATTEN LIST BY
-            key
+        FLATTEN LIST BY key
 );
 
 INSERT INTO Output
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-flatten_where_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-flatten_where_/formatted.sql
index 82f47a6d786..f8c51b9af4e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-flatten_where_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-flatten_where_/formatted.sql
@@ -10,5 +10,4 @@ FROM (
     FROM Input
     WHERE value > ''
 )
-    FLATTEN LIST BY
-        key2;
+    FLATTEN LIST BY key2;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-17715_concat_sort_desc_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-17715_concat_sort_desc_/formatted.sql
index 0a6857fa5ed..4f8cf94ae52 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-17715_concat_sort_desc_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-17715_concat_sort_desc_/formatted.sql
@@ -59,8 +59,7 @@ $target_events = (
         SELECT
             *
         FROM $target_events
-            FLATTEN LIST BY
-                segments
+            FLATTEN LIST BY segments
     )
         FLATTEN COLUMNS
 );
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-18300-flatmap-over-extend_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-18300-flatmap-over-extend_/formatted.sql
index 9d7922cef50..8ad7cab4279 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-18300-flatmap-over-extend_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-18300-flatmap-over-extend_/formatted.sql
@@ -21,5 +21,4 @@ FROM (
         ) AS joins
     FROM @tmp
 )
-    FLATTEN LIST BY
-        joins AS id;
+    FLATTEN LIST BY joins AS id;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-6038_direct_row_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-6038_direct_row_/formatted.sql
index 82627f73706..2266c1ba540 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-6038_direct_row_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-6038_direct_row_/formatted.sql
@@ -35,8 +35,7 @@ $users = (
         CAST(Random(idx + x) AS Uint64) % $count AS j,
         subkey
     FROM $users_0
-        FLATTEN BY
-            lst AS x
+        FLATTEN BY lst AS x
 );
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-7324_duplicate_arg_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-7324_duplicate_arg_/formatted.sql
index 79a03a5a8dd..ed481a70082 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-7324_duplicate_arg_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-7324_duplicate_arg_/formatted.sql
@@ -20,5 +20,4 @@ SELECT
     event_id,
     test_ids
 FROM $input
-    FLATTEN BY
-        event_ids AS event_id;
+    FLATTEN BY event_ids AS event_id;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_/formatted.sql
index fe15acc6038..9879a2ea2c8 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_/formatted.sql
@@ -8,7 +8,6 @@ FROM (
     SELECT
         ListFromRange(0, 100) AS x
 )
-    FLATTEN BY
-        x
+    FLATTEN BY x
 ORDER BY
     x;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_desc_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_desc_/formatted.sql
index 1ab09ebfc0b..7c8643ae901 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_desc_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_desc_/formatted.sql
@@ -9,7 +9,6 @@ FROM (
     SELECT
         ListFromRange(0, 100) AS x
 )
-    FLATTEN BY
-        x
+    FLATTEN BY x
 ORDER BY
     x DESC;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_with_assume_desc_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_with_assume_desc_/formatted.sql
index 28245b150e2..00e3c588454 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_with_assume_desc_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_with_assume_desc_/formatted.sql
@@ -11,7 +11,6 @@ FROM (
     SELECT
         ListFromRange(10, 0, -1) AS x
 )
-    FLATTEN BY
-        x
+    FLATTEN BY x
 ASSUME ORDER BY
     x DESC;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-ordered_fill_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-ordered_fill_/formatted.sql
index 2f0401316fa..30473230b78 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-ordered_fill_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-ordered_fill_/formatted.sql
@@ -9,8 +9,7 @@ FROM (
     SELECT
         ListFromRange(0, 100) AS x
 )
-    FLATTEN BY
-        x
+    FLATTEN BY x
 ORDER BY
     x;
 COMMIT;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-presort_order_by_table_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-presort_order_by_table_/formatted.sql
index 22d6ec5d4a4..da46548bfd6 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-presort_order_by_table_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-presort_order_by_table_/formatted.sql
@@ -13,8 +13,7 @@ FROM (
     SELECT
         $list AS x
 )
-    FLATTEN BY
-        x;
+    FLATTEN BY x;
 COMMIT;
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_typeinfo_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_typeinfo_/formatted.sql
index fadcae1a771..8ce489c4f07 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_typeinfo_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_typeinfo_/formatted.sql
@@ -28,8 +28,7 @@ FROM (
     SELECT
         *
     FROM $r1
-        FLATTEN LIST BY
-            arg_0
+        FLATTEN LIST BY arg_0
 )
     FLATTEN COLUMNS
 ORDER BY
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-presort_window_order_by_table_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-presort_window_order_by_table_/formatted.sql
index 25963e2b25e..9778d6cc997 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-presort_window_order_by_table_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-presort_window_order_by_table_/formatted.sql
@@ -13,8 +13,7 @@ FROM (
     SELECT
         $list AS x
 )
-    FLATTEN BY
-        x;
+    FLATTEN BY x;
 COMMIT;
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_mutable_resource_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_mutable_resource_/formatted.sql
index 2974c7ef0c2..20522ddce7e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_mutable_resource_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_mutable_resource_/formatted.sql
@@ -10,8 +10,7 @@ FROM (
         SELECT
             AsList(1, 2, 3, 4, 5, 6, 7, 8, 9, 10) AS x
     )
-        FLATTEN BY
-            x
+        FLATTEN BY x
 )
 WINDOW
     w AS (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_lead_in_mem_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_lead_in_mem_/formatted.sql
index c5c5bc76cf0..bba525371b3 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_lead_in_mem_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_lead_in_mem_/formatted.sql
@@ -8,8 +8,7 @@ $list = (
         SELECT
             AsList('foo', 'bar', 'baz', 'quux', 'bat') AS `list`
     )
-        FLATTEN BY
-            `list` AS item
+        FLATTEN BY `list` AS item
 );
 
 --INSERT INTO Output