do not add newline before THEN in CASE expressions

commit_hash:8e33efa25915e1639b5b26eaf93bb1edd838a22b

28 files changed, 153 insertions, 315 deletions

diff --git a/yql/essentials/sql/v1/format/sql_format.cpp b/yql/essentials/sql/v1/format/sql_format.cpp
index d4bc63da05b..5ea843616fc 100644
--- a/yql/essentials/sql/v1/format/sql_format.cpp
+++ b/yql/essentials/sql/v1/format/sql_format.cpp
@@ -2384,17 +2384,6 @@ private:
         Visit(msg.GetToken5());
     }
 
-    void VisitWhenExpr(const TRule_when_expr& msg) {
-        VisitKeyword(msg.GetToken1());
-        Visit(msg.GetRule_expr2());
-
-        NewLine();
-        PushCurrentIndent();
-        VisitKeyword(msg.GetToken3());
-        Visit(msg.GetRule_expr4());
-        PopCurrentIndent();
-    }
-
     void VisitWithTableSettingsExpr(const TRule_with_table_settings& msg) {
         VisitKeyword(msg.GetToken1());
         Visit(msg.GetToken2());
@@ -2781,7 +2770,6 @@ TStaticData::TStaticData()
         {TRule_define_action_or_subquery_body::GetDescriptor(), MakePrettyFunctor(&TPrettyVisitor::VisitDefineActionOrSubqueryBody)},
         {TRule_exists_expr::GetDescriptor(), MakePrettyFunctor(&TPrettyVisitor::VisitExistsExpr)},
         {TRule_case_expr::GetDescriptor(), MakePrettyFunctor(&TPrettyVisitor::VisitCaseExpr)},
-        {TRule_when_expr::GetDescriptor(), MakePrettyFunctor(&TPrettyVisitor::VisitWhenExpr)},
         {TRule_with_table_settings::GetDescriptor(), MakePrettyFunctor(&TPrettyVisitor::VisitWithTableSettingsExpr)},
         {TRule_table_setting_value::GetDescriptor(), MakePrettyFunctor(&TPrettyVisitor::VisitTableSettingValue)},
         {TRule_ttl_tier_action::GetDescriptor(), MakePrettyFunctor(&TPrettyVisitor::VisitTtlTierAction)},
diff --git a/yql/essentials/sql/v1/format/sql_format_ut.h b/yql/essentials/sql/v1/format/sql_format_ut.h
index 3cd8fc0470b..761873d3b93 100644
--- a/yql/essentials/sql/v1/format/sql_format_ut.h
+++ b/yql/essentials/sql/v1/format/sql_format_ut.h
@@ -1449,11 +1449,11 @@ Y_UNIT_TEST(LambdaInsideExpr) {
 Y_UNIT_TEST(CaseExpr) {
     TCases cases = {
         {"SELECT CASE WHEN 1 == 2 THEN 3 WHEN 4 == 5 THEN 6 WHEN 7 == 8 THEN 9 ELSE 10 END;",
-            "SELECT\n\tCASE\n\t\tWHEN 1 == 2\n\t\t\tTHEN 3\n\t\tWHEN 4 == 5\n\t\t\tTHEN 6\n\t\tWHEN 7 == 8\n\t\t\tTHEN 9\n\t\tELSE 10\n\tEND;\n"},
+            "SELECT\n\tCASE\n\t\tWHEN 1 == 2 THEN 3\n\t\tWHEN 4 == 5 THEN 6\n\t\tWHEN 7 == 8 THEN 9\n\t\tELSE 10\n\tEND;\n"},
         {"SELECT CAST(CASE WHEN 1 == 2 THEN 3 WHEN 4 == 5 THEN 6 ELSE 10 END AS String);",
-            "SELECT\n\tCAST(\n\t\tCASE\n\t\t\tWHEN 1 == 2\n\t\t\t\tTHEN 3\n\t\t\tWHEN 4 == 5\n\t\t\t\tTHEN 6\n\t\t\tELSE 10\n\t\tEND AS String\n\t);\n"},
+            "SELECT\n\tCAST(\n\t\tCASE\n\t\t\tWHEN 1 == 2 THEN 3\n\t\t\tWHEN 4 == 5 THEN 6\n\t\t\tELSE 10\n\t\tEND AS String\n\t);\n"},
         {"SELECT CASE x WHEN 1 THEN 2 WHEN 3 THEN 4 WHEN 5 THEN 6 ELSE 10 END;",
-            "SELECT\n\tCASE x\n\t\tWHEN 1\n\t\t\tTHEN 2\n\t\tWHEN 3\n\t\t\tTHEN 4\n\t\tWHEN 5\n\t\t\tTHEN 6\n\t\tELSE 10\n\tEND;\n"},
+            "SELECT\n\tCASE x\n\t\tWHEN 1 THEN 2\n\t\tWHEN 3 THEN 4\n\t\tWHEN 5 THEN 6\n\t\tELSE 10\n\tEND;\n"},
     };
 
     TSetup setup;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_with_deep_aggregated_column_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_with_deep_aggregated_column_/formatted.sql
index b74d6ece891..310af6bbd49 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_with_deep_aggregated_column_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_with_deep_aggregated_column_/formatted.sql
@@ -15,8 +15,7 @@ SELECT
     region,
     max(
         CASE
-            WHEN age % 10u BETWEEN 1u AND region % 10u
-                THEN age
+            WHEN age % 10u BETWEEN 1u AND region % 10u THEN age
             ELSE 0u
         END
     ) AS max_age_at_range_intersect
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-compare_by_tuple_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-compare_by_tuple_/formatted.sql
index 4dd533a2450..68be5531d82 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-compare_by_tuple_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-compare_by_tuple_/formatted.sql
@@ -9,15 +9,13 @@ FROM (
         key,
         (
             CASE
-                WHEN length(subkey) != 0
-                    THEN subkey
+                WHEN length(subkey) != 0 THEN subkey
                 ELSE NULL
             END
         ) AS subkey,
         (
             CASE
-                WHEN length(value) != 0
-                    THEN value
+                WHEN length(value) != 0 THEN value
                 ELSE NULL
             END
         ) AS value
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-compare_tuple_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-compare_tuple_/formatted.sql
index ed999b4cae2..6f8403e28b0 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-compare_tuple_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-compare_tuple_/formatted.sql
@@ -9,15 +9,13 @@ FROM (
         key,
         (
             CASE
-                WHEN length(subkey) != 0
-                    THEN subkey
+                WHEN length(subkey) != 0 THEN subkey
                 ELSE NULL
             END
         ) AS subkey,
         (
             CASE
-                WHEN length(value) != 0
-                    THEN value
+                WHEN length(value) != 0 THEN value
                 ELSE NULL
             END
         ) AS value
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_rollup_grouping_hum_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_rollup_grouping_hum_/formatted.sql
index 7ddca82844f..9c1548a7a32 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_rollup_grouping_hum_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_rollup_grouping_hum_/formatted.sql
@@ -5,12 +5,9 @@ SELECT
     key_first,
     val_first,
     CASE grouping(key_first, val_first)
-        WHEN 1
-            THEN 'Total By First digit key'
-        WHEN 2
-            THEN 'Total By First char value'
-        WHEN 3
-            THEN 'Grand Total'
+        WHEN 1 THEN 'Total By First digit key'
+        WHEN 2 THEN 'Total By First char value'
+        WHEN 3 THEN 'Grand Total'
         ELSE 'Group'
     END AS group
 FROM plato.Input
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_rollup_grouping_hum_bind_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_rollup_grouping_hum_bind_/formatted.sql
index cb0c47f06d6..1bc48117841 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_rollup_grouping_hum_bind_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_rollup_grouping_hum_bind_/formatted.sql
@@ -2,12 +2,9 @@
 /* postgres can not */
 $hum_gr_kv = ($grouping) -> {
     RETURN CASE $grouping
-        WHEN 1
-            THEN 'Total By First digit key'
-        WHEN 2
-            THEN 'Total By First char value'
-        WHEN 3
-            THEN 'Grand Total'
+        WHEN 1 THEN 'Total By First digit key'
+        WHEN 2 THEN 'Total By First char value'
+        WHEN 3 THEN 'Grand Total'
         ELSE 'Group'
     END;
 };
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-yql-18511_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-yql-18511_/formatted.sql
index 9e45af8cca6..ae3c5d37ee7 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-yql-18511_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-yql-18511_/formatted.sql
@@ -1,12 +1,9 @@
 /* yt can not */
 $round_period = ($day, $period) -> {
     RETURN CASE
-        WHEN $period == 'd'
-            THEN $day
-        WHEN $period == 'w'
-            THEN DateTime::MakeDate(DateTime::StartOfWeek($day))
-        WHEN $period == 'm'
-            THEN DateTime::MakeDate(DateTime::StartOfMonth($day))
+        WHEN $period == 'd' THEN $day
+        WHEN $period == 'w' THEN DateTime::MakeDate(DateTime::StartOfWeek($day))
+        WHEN $period == 'm' THEN DateTime::MakeDate(DateTime::StartOfMonth($day))
         ELSE $day
     END
 };
@@ -47,12 +44,9 @@ SELECT
     month,
     GROUPING(month) AS grouping_month,
     CASE
-        WHEN GROUPING(week) == 1 AND GROUPING(month) == 1
-            THEN 'd'
-        WHEN GROUPING(day) == 1 AND GROUPING(month) == 1
-            THEN 'w'
-        WHEN GROUPING(day) == 1 AND GROUPING(week) == 1
-            THEN 'm'
+        WHEN GROUPING(week) == 1 AND GROUPING(month) == 1 THEN 'd'
+        WHEN GROUPING(day) == 1 AND GROUPING(month) == 1 THEN 'w'
+        WHEN GROUPING(day) == 1 AND GROUPING(week) == 1 THEN 'm'
         ELSE NULL
     END AS period_type,
     user_cards_segm,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_case-case_many_val_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_case-case_many_val_/formatted.sql
index 968019ea03d..a8d6fd249a0 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_case-case_many_val_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_case-case_many_val_/formatted.sql
@@ -2,204 +2,105 @@
 /* yt can not */
 $switch = ($x) -> {
     $res = CASE $x
-        WHEN 0
-            THEN 1
-        WHEN 1
-            THEN 2
-        WHEN 2
-            THEN 3
-        WHEN 3
-            THEN 4
-        WHEN 4
-            THEN 5
-        WHEN 5
-            THEN 6
-        WHEN 6
-            THEN 7
-        WHEN 7
-            THEN 8
-        WHEN 8
-            THEN 9
-        WHEN 9
-            THEN 10
-        WHEN 10
-            THEN 11
-        WHEN 11
-            THEN 12
-        WHEN 12
-            THEN 13
-        WHEN 13
-            THEN 14
-        WHEN 14
-            THEN 15
-        WHEN 15
-            THEN 16
-        WHEN 16
-            THEN 17
-        WHEN 17
-            THEN 18
-        WHEN 18
-            THEN 19
-        WHEN 19
-            THEN 20
-        WHEN 20
-            THEN 21
-        WHEN 21
-            THEN 22
-        WHEN 22
-            THEN 23
-        WHEN 23
-            THEN 24
-        WHEN 24
-            THEN 25
-        WHEN 25
-            THEN 26
-        WHEN 26
-            THEN 27
-        WHEN 27
-            THEN 28
-        WHEN 28
-            THEN 29
-        WHEN 29
-            THEN 30
-        WHEN 30
-            THEN 31
-        WHEN 31
-            THEN 32
-        WHEN 32
-            THEN 33
-        WHEN 33
-            THEN 34
-        WHEN 34
-            THEN 35
-        WHEN 35
-            THEN 36
-        WHEN 36
-            THEN 37
-        WHEN 37
-            THEN 38
-        WHEN 38
-            THEN 39
-        WHEN 39
-            THEN 40
-        WHEN 40
-            THEN 41
-        WHEN 41
-            THEN 42
-        WHEN 42
-            THEN 43
-        WHEN 43
-            THEN 44
-        WHEN 44
-            THEN 45
-        WHEN 45
-            THEN 46
-        WHEN 46
-            THEN 47
-        WHEN 47
-            THEN 48
-        WHEN 48
-            THEN 49
-        WHEN 49
-            THEN 50
-        WHEN 50
-            THEN 51
-        WHEN 51
-            THEN 52
-        WHEN 52
-            THEN 53
-        WHEN 53
-            THEN 54
-        WHEN 54
-            THEN 55
-        WHEN 55
-            THEN 56
-        WHEN 56
-            THEN 57
-        WHEN 57
-            THEN 58
-        WHEN 58
-            THEN 59
-        WHEN 59
-            THEN 60
-        WHEN 60
-            THEN 61
-        WHEN 61
-            THEN 62
-        WHEN 62
-            THEN 63
-        WHEN 63
-            THEN 64
-        WHEN 64
-            THEN 65
-        WHEN 65
-            THEN 66
-        WHEN 66
-            THEN 67
-        WHEN 67
-            THEN 68
-        WHEN 68
-            THEN 69
-        WHEN 69
-            THEN 70
-        WHEN 70
-            THEN 71
-        WHEN 71
-            THEN 72
-        WHEN 72
-            THEN 73
-        WHEN 73
-            THEN 74
-        WHEN 74
-            THEN 75
-        WHEN 75
-            THEN 76
-        WHEN 76
-            THEN 77
-        WHEN 77
-            THEN 78
-        WHEN 78
-            THEN 79
-        WHEN 79
-            THEN 80
-        WHEN 80
-            THEN 81
-        WHEN 81
-            THEN 82
-        WHEN 82
-            THEN 83
-        WHEN 83
-            THEN 84
-        WHEN 84
-            THEN 85
-        WHEN 85
-            THEN 86
-        WHEN 86
-            THEN 87
-        WHEN 87
-            THEN 88
-        WHEN 88
-            THEN 89
-        WHEN 89
-            THEN 90
-        WHEN 90
-            THEN 91
-        WHEN 91
-            THEN 92
-        WHEN 92
-            THEN 93
-        WHEN 93
-            THEN 94
-        WHEN 94
-            THEN 95
-        WHEN 95
-            THEN 96
-        WHEN 96
-            THEN 97
-        WHEN 97
-            THEN 98
-        WHEN 98
-            THEN 99
+        WHEN 0 THEN 1
+        WHEN 1 THEN 2
+        WHEN 2 THEN 3
+        WHEN 3 THEN 4
+        WHEN 4 THEN 5
+        WHEN 5 THEN 6
+        WHEN 6 THEN 7
+        WHEN 7 THEN 8
+        WHEN 8 THEN 9
+        WHEN 9 THEN 10
+        WHEN 10 THEN 11
+        WHEN 11 THEN 12
+        WHEN 12 THEN 13
+        WHEN 13 THEN 14
+        WHEN 14 THEN 15
+        WHEN 15 THEN 16
+        WHEN 16 THEN 17
+        WHEN 17 THEN 18
+        WHEN 18 THEN 19
+        WHEN 19 THEN 20
+        WHEN 20 THEN 21
+        WHEN 21 THEN 22
+        WHEN 22 THEN 23
+        WHEN 23 THEN 24
+        WHEN 24 THEN 25
+        WHEN 25 THEN 26
+        WHEN 26 THEN 27
+        WHEN 27 THEN 28
+        WHEN 28 THEN 29
+        WHEN 29 THEN 30
+        WHEN 30 THEN 31
+        WHEN 31 THEN 32
+        WHEN 32 THEN 33
+        WHEN 33 THEN 34
+        WHEN 34 THEN 35
+        WHEN 35 THEN 36
+        WHEN 36 THEN 37
+        WHEN 37 THEN 38
+        WHEN 38 THEN 39
+        WHEN 39 THEN 40
+        WHEN 40 THEN 41
+        WHEN 41 THEN 42
+        WHEN 42 THEN 43
+        WHEN 43 THEN 44
+        WHEN 44 THEN 45
+        WHEN 45 THEN 46
+        WHEN 46 THEN 47
+        WHEN 47 THEN 48
+        WHEN 48 THEN 49
+        WHEN 49 THEN 50
+        WHEN 50 THEN 51
+        WHEN 51 THEN 52
+        WHEN 52 THEN 53
+        WHEN 53 THEN 54
+        WHEN 54 THEN 55
+        WHEN 55 THEN 56
+        WHEN 56 THEN 57
+        WHEN 57 THEN 58
+        WHEN 58 THEN 59
+        WHEN 59 THEN 60
+        WHEN 60 THEN 61
+        WHEN 61 THEN 62
+        WHEN 62 THEN 63
+        WHEN 63 THEN 64
+        WHEN 64 THEN 65
+        WHEN 65 THEN 66
+        WHEN 66 THEN 67
+        WHEN 67 THEN 68
+        WHEN 68 THEN 69
+        WHEN 69 THEN 70
+        WHEN 70 THEN 71
+        WHEN 71 THEN 72
+        WHEN 72 THEN 73
+        WHEN 73 THEN 74
+        WHEN 74 THEN 75
+        WHEN 75 THEN 76
+        WHEN 76 THEN 77
+        WHEN 77 THEN 78
+        WHEN 78 THEN 79
+        WHEN 79 THEN 80
+        WHEN 80 THEN 81
+        WHEN 81 THEN 82
+        WHEN 82 THEN 83
+        WHEN 83 THEN 84
+        WHEN 84 THEN 85
+        WHEN 85 THEN 86
+        WHEN 86 THEN 87
+        WHEN 87 THEN 88
+        WHEN 88 THEN 89
+        WHEN 89 THEN 90
+        WHEN 90 THEN 91
+        WHEN 91 THEN 92
+        WHEN 92 THEN 93
+        WHEN 93 THEN 94
+        WHEN 94 THEN 95
+        WHEN 95 THEN 96
+        WHEN 96 THEN 97
+        WHEN 97 THEN 98
+        WHEN 98 THEN 99
         ELSE 100
     END;
     RETURN $res;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_case-case_multi_val_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_case-case_multi_val_/formatted.sql
index 82f929c6eed..43dcfdca291 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_case-case_multi_val_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_case-case_multi_val_/formatted.sql
@@ -2,10 +2,8 @@ SELECT
     key,
     subkey,
     CASE value
-        WHEN "jar"
-            THEN "JAR"
-        WHEN "foo"
-            THEN "FOO"
+        WHEN "jar" THEN "JAR"
+        WHEN "foo" THEN "FOO"
         ELSE value
     END AS value
 FROM plato.Input;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_case-case_opt_cond_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_case-case_opt_cond_/formatted.sql
index 2e23b2efd3c..8b0d32ca5d0 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_case-case_opt_cond_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_case-case_opt_cond_/formatted.sql
@@ -1,20 +1,17 @@
 SELECT
     CASE
-        WHEN CAST('true' AS Bool)
-            THEN 'FOO1'
+        WHEN CAST('true' AS Bool) THEN 'FOO1'
         ELSE 'BAR1'
     END
 UNION ALL
 SELECT
     CASE
-        WHEN CAST('false' AS Bool)
-            THEN 'FOO2'
+        WHEN CAST('false' AS Bool) THEN 'FOO2'
         ELSE 'BAR2'
     END
 UNION ALL
 SELECT
     CASE
-        WHEN NULL
-            THEN 'FOO3'
+        WHEN NULL THEN 'FOO3'
         ELSE 'BAR3'
     END;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_case-case_opt_then_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_case-case_opt_then_/formatted.sql
index 509354d7a30..873d7976da3 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_case-case_opt_then_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_case-case_opt_then_/formatted.sql
@@ -1,20 +1,17 @@
 SELECT
     CASE
-        WHEN TRUE
-            THEN CAST("123" AS int)
+        WHEN TRUE THEN CAST("123" AS int)
         ELSE 100501
     END
 UNION ALL
 SELECT
     CASE
-        WHEN TRUE
-            THEN NULL
+        WHEN TRUE THEN NULL
         ELSE 100502
     END
 UNION ALL
 SELECT
     CASE
-        WHEN FALSE
-            THEN NULL
+        WHEN FALSE THEN NULL
         ELSE 100503
     END;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_case-case_size_eq_cast_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_case-case_size_eq_cast_/formatted.sql
index b5f00bb375a..bf15d3ebd53 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_case-case_size_eq_cast_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_case-case_size_eq_cast_/formatted.sql
@@ -2,8 +2,7 @@ SELECT
     key,
     subkey,
     CASE length(value)
-        WHEN CAST(3 AS smallint)
-            THEN "JAR"
+        WHEN CAST(3 AS smallint) THEN "JAR"
         ELSE value
     END AS value
 FROM plato.Input;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_case-case_then_else_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_case-case_then_else_/formatted.sql
index 3ba70bde799..db10c23ada5 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_case-case_then_else_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_case-case_then_else_/formatted.sql
@@ -1,7 +1,6 @@
 SELECT
     CASE
-        WHEN key != subkey
-            THEN subkey
+        WHEN key != subkey THEN subkey
         ELSE value
     END
 FROM plato.Input;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_case-case_val_then_else_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_case-case_val_then_else_/formatted.sql
index 2205fb46206..7625aa4bdba 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_case-case_val_then_else_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_case-case_val_then_else_/formatted.sql
@@ -1,7 +1,6 @@
 SELECT
     CASE value
-        WHEN key
-            THEN subkey
+        WHEN key THEN subkey
         ELSE value
     END
 FROM plato.Input;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_case-case_val_when_then_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_case-case_val_when_then_/formatted.sql
index 18ae6f6c9b1..be71ea054d2 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_case-case_val_when_then_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_case-case_val_when_then_/formatted.sql
@@ -2,8 +2,7 @@ SELECT
     key,
     subkey,
     CASE value
-        WHEN subkey
-            THEN "WAT"
+        WHEN subkey THEN "WAT"
         ELSE value
     END AS value
 FROM plato.Input;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_case-case_when_then_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_case-case_when_then_/formatted.sql
index 556019877e5..c8a80d6d3e2 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_case-case_when_then_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_case-case_when_then_/formatted.sql
@@ -2,8 +2,7 @@ SELECT
     key,
     subkey,
     CASE
-        WHEN value != subkey
-            THEN "WAT"
+        WHEN value != subkey THEN "WAT"
         ELSE value
     END AS value
 FROM plato.Input;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_coalesce-coalesce_sugar_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_coalesce-coalesce_sugar_/formatted.sql
index 7d17532cbd1..c0d12b2228d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_coalesce-coalesce_sugar_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_coalesce-coalesce_sugar_/formatted.sql
@@ -8,8 +8,7 @@ $data = (
 
 SELECT
     CASE
-        WHEN eval < 5
-            THEN eval
+        WHEN eval < 5 THEN eval
         ELSE CAST(NULL AS Int64)
     END ?? -1,
     key
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_count-count_nullable_sub_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_count-count_nullable_sub_/formatted.sql
index 3b4e726e6bf..ea72787f105 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_count-count_nullable_sub_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_count-count_nullable_sub_/formatted.sql
@@ -5,8 +5,7 @@ SELECT
 FROM (
     SELECT
         CASE key
-            WHEN '0'
-                THEN NULL
+            WHEN '0' THEN NULL
             ELSE CAST(subkey AS int) / CAST(key AS int)
         END AS val,
         value
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_like-like_clause_no_pattern_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_like-like_clause_no_pattern_/formatted.sql
index e2ac1990289..f937bbd0833 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_like-like_clause_no_pattern_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_like-like_clause_no_pattern_/formatted.sql
@@ -1,8 +1,7 @@
 SELECT
     value,
     CASE
-        WHEN value LIKE "abc"
-            THEN "true"
+        WHEN value LIKE "abc" THEN "true"
         ELSE "false"
     END AS is_abc
 FROM plato.Input
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_rows_sorted_desc_multi_out_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_rows_sorted_desc_multi_out_/formatted.sql
index 3eb8c669064..a36e020c794 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_rows_sorted_desc_multi_out_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_rows_sorted_desc_multi_out_/formatted.sql
@@ -17,12 +17,9 @@ $splitter = ($rows) -> {
     RETURN Yql::OrderedMap(
         $rows, ($row) -> {
             RETURN CASE $row.x
-                WHEN 0
-                    THEN VARIANT ($row, "0", $varType)
-                WHEN 1
-                    THEN VARIANT ($row, "1", $varType)
-                WHEN 2
-                    THEN VARIANT ($row, "2", $varType)
+                WHEN 0 THEN VARIANT ($row, "0", $varType)
+                WHEN 1 THEN VARIANT ($row, "1", $varType)
+                WHEN 2 THEN VARIANT ($row, "2", $varType)
                 ELSE VARIANT ($row, "3", $varType)
             END;
         }
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_rows_sorted_multi_out_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_rows_sorted_multi_out_/formatted.sql
index 9e04f323016..62ed3c7cdb6 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_rows_sorted_multi_out_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_rows_sorted_multi_out_/formatted.sql
@@ -17,12 +17,9 @@ $splitter = ($rows) -> {
     RETURN Yql::OrderedMap(
         $rows, ($row) -> {
             RETURN CASE $row.x
-                WHEN 0
-                    THEN VARIANT ($row, "0", $varType)
-                WHEN 1
-                    THEN VARIANT ($row, "1", $varType)
-                WHEN 2
-                    THEN VARIANT ($row, "2", $varType)
+                WHEN 0 THEN VARIANT ($row, "0", $varType)
+                WHEN 1 THEN VARIANT ($row, "1", $varType)
+                WHEN 2 THEN VARIANT ($row, "2", $varType)
                 ELSE VARIANT ($row, "3", $varType)
             END;
         }
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_sorted_desc_multi_out_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_sorted_desc_multi_out_/formatted.sql
index e450fd6108c..bf1f8c4229e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_sorted_desc_multi_out_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_sorted_desc_multi_out_/formatted.sql
@@ -15,12 +15,9 @@ $splitter = ($row) -> {
     $recordType = TypeOf($row);
     $varType = VariantType(TupleType($recordType, $recordType, $recordType, $recordType));
     RETURN CASE $row.x
-        WHEN 0
-            THEN VARIANT ($row, "0", $varType)
-        WHEN 1
-            THEN VARIANT ($row, "1", $varType)
-        WHEN 2
-            THEN VARIANT ($row, "2", $varType)
+        WHEN 0 THEN VARIANT ($row, "0", $varType)
+        WHEN 1 THEN VARIANT ($row, "1", $varType)
+        WHEN 2 THEN VARIANT ($row, "2", $varType)
         ELSE VARIANT ($row, "3", $varType)
     END
 };
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_sorted_multi_out_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_sorted_multi_out_/formatted.sql
index 4ab6f96ac88..1f6ba893515 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_sorted_multi_out_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_sorted_multi_out_/formatted.sql
@@ -15,12 +15,9 @@ $splitter = ($row) -> {
     $recordType = TypeOf($row);
     $varType = VariantType(TupleType($recordType, $recordType, $recordType, $recordType));
     RETURN CASE $row.x
-        WHEN 0
-            THEN VARIANT ($row, "0", $varType)
-        WHEN 1
-            THEN VARIANT ($row, "1", $varType)
-        WHEN 2
-            THEN VARIANT ($row, "2", $varType)
+        WHEN 0 THEN VARIANT ($row, "0", $varType)
+        WHEN 1 THEN VARIANT ($row, "1", $varType)
+        WHEN 2 THEN VARIANT ($row, "2", $varType)
         ELSE VARIANT ($row, "3", $varType)
     END
 };
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-yql-10297_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-yql-10297_/formatted.sql
index 7eb40b79a0a..8ecece52432 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-yql-10297_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-yql-10297_/formatted.sql
@@ -16,10 +16,8 @@ DEFINE SUBQUERY $split_formula_log($in) AS
             )
         );
         RETURN CASE
-            WHEN $row.key == "0"
-                THEN VARIANT ($row, "0", $varType)
-            WHEN $row.key == "1"
-                THEN VARIANT ($row, "1", $varType)
+            WHEN $row.key == "0" THEN VARIANT ($row, "0", $varType)
+            WHEN $row.key == "1" THEN VARIANT ($row, "1", $varType)
             ELSE NULL
         END;
     };
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q12_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q12_/formatted.sql
index b24fa179d48..ba097b7d499 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q12_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q12_/formatted.sql
@@ -21,16 +21,14 @@ SELECT
     sum(
         CASE
             WHEN o_orderpriority == '1-URGENT'
-            OR o_orderpriority == '2-HIGH'
-                THEN 1
+            OR o_orderpriority == '2-HIGH' THEN 1
             ELSE 0
         END
     ) AS high_line_count,
     sum(
         CASE
             WHEN o_orderpriority != '1-URGENT'
-            AND o_orderpriority != '2-HIGH'
-                THEN 1
+            AND o_orderpriority != '2-HIGH' THEN 1
             ELSE 0
         END
     ) AS low_line_count
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q14_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q14_/formatted.sql
index 1e8accad4a7..cba2ed32350 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q14_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q14_/formatted.sql
@@ -6,8 +6,7 @@ $border = Date("1994-08-01");
 SELECT
     100.00 * sum(
         CASE
-            WHEN StartsWith(p.p_type, 'PROMO')
-                THEN l.l_extendedprice * (1 - l.l_discount)
+            WHEN StartsWith(p.p_type, 'PROMO') THEN l.l_extendedprice * (1 - l.l_discount)
             ELSE 0
         END
     ) / sum(l.l_extendedprice * (1 - l.l_discount)) AS promo_revenue
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q8_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q8_/formatted.sql
index 7437c3aa636..27c3a5513d4 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q8_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q8_/formatted.sql
@@ -95,8 +95,7 @@ SELECT
     o_year,
     sum(
         CASE
-            WHEN nation == 'MOZAMBIQUE'
-                THEN volume
+            WHEN nation == 'MOZAMBIQUE' THEN volume
             ELSE 0
         END
     ) / sum(volume) AS mkt_share