YQL-19612 format for value_constructor

vitstn · vitstn · commit 408888e68013 · 2025-02-18T15:54:36.000+03:00
commit_hash:d31d086ec6fffa8aff47fc22a3921e2a15cd9008
diff --git a/yql/essentials/sql/v1/format/sql_format.cpp b/yql/essentials/sql/v1/format/sql_format.cpp
@@ -747,6 +747,54 @@ friend struct TStaticData;
         }
     }
 
+    void VisitValueConstructor(const TRule_value_constructor& msg) {
+        switch (msg.Alt_case()) {
+            case TRule_value_constructor::kAltValueConstructor1: {
+                auto& ctor = msg.GetAlt_value_constructor1();
+                Scopes.push_back(EScope::TypeName);
+                Visit(ctor.GetToken1());
+                Scopes.pop_back();
+                AfterInvokeExpr = true;
+                Visit(ctor.GetToken2());
+                Visit(ctor.GetRule_expr3());
+                Visit(ctor.GetToken4());
+                Visit(ctor.GetRule_expr5());
+                Visit(ctor.GetToken6());
+                Visit(ctor.GetRule_expr7());
+                Visit(ctor.GetToken8());
+                break;
+            }
+            case TRule_value_constructor::kAltValueConstructor2: {
+                auto& ctor = msg.GetAlt_value_constructor2();
+                Scopes.push_back(EScope::TypeName);
+                Visit(ctor.GetToken1());
+                Scopes.pop_back();
+                AfterInvokeExpr = true;
+                Visit(ctor.GetToken2());
+                Visit(ctor.GetRule_expr3());
+                Visit(ctor.GetToken4());
+                Visit(ctor.GetRule_expr5());
+                Visit(ctor.GetToken6());
+                break;
+            }
+            case TRule_value_constructor::kAltValueConstructor3: {
+                auto& ctor = msg.GetAlt_value_constructor3();
+                Scopes.push_back(EScope::TypeName);
+                Visit(ctor.GetToken1());
+                Scopes.pop_back();
+                AfterInvokeExpr = true;
+                Visit(ctor.GetToken2());
+                Visit(ctor.GetRule_expr3());
+                Visit(ctor.GetToken4());
+                Visit(ctor.GetRule_expr5());
+                Visit(ctor.GetToken6());
+                break;
+            }
+            case TRule_value_constructor::ALT_NOT_SET:
+                Y_ABORT("You should change implementation according to grammar changes");
+        }
+    }
+
     void VisitDefineActionOrSubqueryBody(const TRule_define_action_or_subquery_body& msg) {
         SkipSemicolons(msg.GetBlock1());
         if (msg.HasBlock2()) {
@@ -2913,6 +2961,7 @@ TStaticData::TStaticData()
         })
     , PrettyVisitDispatch({
         {TToken::GetDescriptor(), MakePrettyFunctor(&TPrettyVisitor::VisitToken)},
+        {TRule_value_constructor::GetDescriptor(), MakePrettyFunctor(&TPrettyVisitor::VisitValueConstructor)},
         {TRule_into_values_source::GetDescriptor(), MakePrettyFunctor(&TPrettyVisitor::VisitIntoValuesSource)},
         {TRule_select_kind::GetDescriptor(), MakePrettyFunctor(&TPrettyVisitor::VisitSelectKind)},
         {TRule_process_core::GetDescriptor(), MakePrettyFunctor(&TPrettyVisitor::VisitProcessCore)},
diff --git a/yql/essentials/sql/v1/format/sql_format_ut.h b/yql/essentials/sql/v1/format/sql_format_ut.h
@@ -1845,3 +1845,17 @@ Y_UNIT_TEST(AnsiLexer) {
     TSetup setup(/* ansiLexer = */ true);
     setup.Run(cases);
 }
+
+Y_UNIT_TEST(ValueConstructor) {
+    TCases cases = {
+        {"select Enum('a', Enum<'a','b'>)",
+            "SELECT\n\tEnum('a', Enum<'a', 'b'>)\n;\n"},
+        {"select Variant(true, '0', Variant<bool>)",
+            "SELECT\n\tVariant(TRUE, '0', Variant<bool>)\n;\n"},
+        {"select Callable(Callable<(Int32)->Int32>,($x)->($x))(0)",
+            "SELECT\n\tCallable(Callable<(Int32) -> Int32>, ($x) -> ($x))(0)\n;\n"},
+    };
+
+    TSetup setup(/* ansiLexer = */ true);
+    setup.Run(cases);
+}
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_variant_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_variant_/formatted.sql
@@ -3,5 +3,5 @@
 $vt = ParseType('Variant<One:Int32,Two:String>');
 
 SELECT
-    VARIANT (12, CAST(Unicode::ToUpper("o"u) AS String) || 'ne', $vt)
+    Variant(12, CAST(Unicode::ToUpper("o"u) AS String) || 'ne', $vt)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-nested_eval_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-nested_eval_/formatted.sql
@@ -1,6 +1,6 @@
 /* syntax version 1 */
 /* postgres can not */
-$make_struct = CALLABLE (
+$make_struct = Callable(
     Callable<(String) -> Struct<lel: Int32>>,
     ($_string) -> {
         RETURN AsStruct(5 AS lel);
@@ -22,7 +22,7 @@ $kekify_struct = ($struct) -> {
 };
 
 $struct = AsStruct(
-    CALLABLE (
+    Callable(
         Callable<(String) -> Struct<kek: Int32>>,
         ($string) -> {
             RETURN $kekify_struct($make_struct($string));
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-as_variant_enum_compare_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-as_variant_enum_compare_/formatted.sql
@@ -1,7 +1,7 @@
 /* postgres can not */
 /* syntax version 1 */
 SELECT
-    ENUM ('foo', Enum<'foo', 'bar'>) == AsEnum('foo'),
-    ENUM ('foo', Enum<'foo', 'bar'>) == AsEnum('bar'),
-    ENUM ('foo', Enum<'foo', 'bar'>) == AsEnum('baz')
+    Enum('foo', Enum<'foo', 'bar'>) == AsEnum('foo'),
+    Enum('foo', Enum<'foo', 'bar'>) == AsEnum('bar'),
+    Enum('foo', Enum<'foo', 'bar'>) == AsEnum('baz')
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-callable_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-callable_/formatted.sql
@@ -5,8 +5,8 @@ $lambda = ($x) -> {
 };
 
 $callables = AsTuple(
-    CALLABLE (Callable<(Int32) -> String>, $lambda),
-    CALLABLE (Callable<(Bool) -> String>, $lambda),
+    Callable(Callable<(Int32) -> String>, $lambda),
+    Callable(Callable<(Bool) -> String>, $lambda),
 );
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-cast_decimal_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-cast_decimal_/formatted.sql
@@ -42,7 +42,7 @@ $lambda = ($big_dec) -> {
     RETURN $big_dec;
 };
 
-$func = CALLABLE (Callable<(Decimal (10, 5)) -> Decimal (10, 5)>, $lambda);
+$func = Callable(Callable<(Decimal (10, 5)) -> Decimal (10, 5)>, $lambda);
 $small_dec = Decimal('3.0', 2, 1);
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-cast_decimal_implicit_fail_1_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-cast_decimal_implicit_fail_1_/formatted.sql
@@ -4,7 +4,7 @@ $lambda = ($small_dec) -> {
     RETURN $small_dec;
 };
 
-$func_3_1 = CALLABLE (Callable<(Decimal (3, 1)) -> Decimal (3, 1)>, $lambda);
+$func_3_1 = Callable(Callable<(Decimal (3, 1)) -> Decimal (3, 1)>, $lambda);
 $dec_4_2 = Decimal('11.1', 4, 2);
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-cast_decimal_implicit_fail_2_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-cast_decimal_implicit_fail_2_/formatted.sql
@@ -4,7 +4,7 @@ $lambda = ($small_dec) -> {
     RETURN $small_dec;
 };
 
-$func_3_1 = CALLABLE (Callable<(Decimal (3, 1)) -> Decimal (3, 1)>, $lambda);
+$func_3_1 = Callable(Callable<(Decimal (3, 1)) -> Decimal (3, 1)>, $lambda);
 $dec_5_1 = Decimal('22.2', 5, 1);
 
 SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-distinct_from_containers_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-distinct_from_containers_/formatted.sql
@@ -10,6 +10,6 @@ SELECT
     <|a: 1 / 0, b: Nothing(String?), c: 1|> IS NOT DISTINCT FROM <|c: 1u, d: 1u / 0u, e: Nothing(Utf8?)|>, --true
     [1, 2, NULL] IS NOT DISTINCT FROM [1, 2, just(1 / 0)], --false
     {1: NULL} IS DISTINCT FROM {1u: 2 / 0}, --false
-    VARIANT (1 / 0, '1', $vt1) IS DISTINCT FROM VARIANT (NULL, '1', $vt2), --false
-    VARIANT (1 / 0, 'b', $svt1) IS NOT DISTINCT FROM VARIANT (NULL, 'b', $svt2), --true
+    Variant(1 / 0, '1', $vt1) IS DISTINCT FROM Variant(NULL, '1', $vt2), --false
+    Variant(1 / 0, 'b', $svt1) IS NOT DISTINCT FROM Variant(NULL, 'b', $svt2), --true
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-exapnd_with_singular_types_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-exapnd_with_singular_types_/formatted.sql
@@ -2,7 +2,7 @@
 $null_t = TypeOf(NULL);
 $struct_t = Struct<a: String, b: Int32?, c: $null_t, d: pgtext>;
 
-$callable = CALLABLE (
+$callable = Callable(
     Callable<($struct_t) -> $struct_t>, ($x) -> {
         RETURN $x;
     }
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-lambda_as_optional_callable_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-lambda_as_optional_callable_/formatted.sql
@@ -1,7 +1,7 @@
 $callbackType = Callable<(Int32) -> Int32>;
-$defaultFunc = CALLABLE ($callbackType, ($x) -> ($x));
+$defaultFunc = Callable($callbackType, ($x) -> ($x));
 $outerType = CallableType(1, Int32, Int32, Optional<$callbackType>);
-$outer = CALLABLE ($outerType, ($x, $f) -> (($f ?? $defaultFunc)($x)));
+$outer = Callable($outerType, ($x, $f) -> (($f ?? $defaultFunc)($x)));
 
 SELECT
     $outer(1, ($y) -> ($y + 1)),
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_dict_varstruct_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_dict_varstruct_key_/formatted.sql
@@ -8,9 +8,9 @@ $second = ($x) -> {
 };
 
 $vt = ParseType('Variant<a:Int32,b:Uint32>');
-$v1 = VARIANT (1, 'a', $vt);
-$v2 = VARIANT (2u, 'b', $vt);
-$v3 = VARIANT (2, 'a', $vt);
+$v1 = Variant(1, 'a', $vt);
+$v2 = Variant(2u, 'b', $vt);
+$v3 = Variant(2, 'a', $vt);
 
 $l = AsList(
     AsTuple($v1, 'foo'),
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_dict_vartuple_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_dict_vartuple_key_/formatted.sql
@@ -8,9 +8,9 @@ $second = ($x) -> {
 };
 
 $vt = ParseType('Variant<Int32,Uint32>');
-$v1 = VARIANT (1, '0', $vt);
-$v2 = VARIANT (2u, '1', $vt);
-$v3 = VARIANT (2, '0', $vt);
+$v1 = Variant(1, '0', $vt);
+$v2 = Variant(2u, '1', $vt);
+$v3 = Variant(2, '0', $vt);
 
 $l = AsList(
     AsTuple($v1, 'foo'),
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_set_varstruct_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_set_varstruct_key_/formatted.sql
@@ -8,9 +8,9 @@ $second = ($x) -> {
 };
 
 $vt = ParseType('Variant<a:Int32,b:Uint32>');
-$v1 = VARIANT (1, 'a', $vt);
-$v2 = VARIANT (2u, 'b', $vt);
-$v3 = VARIANT (2, 'a', $vt);
+$v1 = Variant(1, 'a', $vt);
+$v2 = Variant(2u, 'b', $vt);
+$v3 = Variant(2, 'a', $vt);
 
 $l = AsList(
     AsTuple($v1, Void()),
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_set_vartuple_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_set_vartuple_key_/formatted.sql
@@ -8,9 +8,9 @@ $second = ($x) -> {
 };
 
 $vt = ParseType('Variant<Int32,Uint32>');
-$v1 = VARIANT (1, '0', $vt);
-$v2 = VARIANT (2u, '1', $vt);
-$v3 = VARIANT (2, '0', $vt);
+$v1 = Variant(1, '0', $vt);
+$v2 = Variant(2u, '1', $vt);
+$v3 = Variant(2, '0', $vt);
 
 $l = AsList(
     AsTuple($v1, Void()),
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_sorted_dict_vartuple_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_sorted_dict_vartuple_key_/formatted.sql
@@ -1,8 +1,8 @@
 /* postgres can not */
 $vt = ParseType('Variant<Int32,Uint32>');
-$v1 = VARIANT (1, '0', $vt);
-$v2 = VARIANT (2u, '1', $vt);
-$v3 = VARIANT (2, '0', $vt);
+$v1 = Variant(1, '0', $vt);
+$v2 = Variant(2u, '1', $vt);
+$v3 = Variant(2, '0', $vt);
 
 $l = AsList(
     AsTuple($v1, 'foo'),
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_sorted_set_vartuple_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_sorted_set_vartuple_key_/formatted.sql
@@ -1,8 +1,8 @@
 /* postgres can not */
 $vt = ParseType('Variant<Int32,Uint32>');
-$v1 = VARIANT (1, '0', $vt);
-$v2 = VARIANT (2u, '1', $vt);
-$v3 = VARIANT (2, '0', $vt);
+$v1 = Variant(1, '0', $vt);
+$v2 = Variant(2u, '1', $vt);
+$v3 = Variant(2, '0', $vt);
 
 $l = AsList(
     AsTuple($v1, Void()),
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-variant_builtins_opt_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-variant_builtins_opt_/formatted.sql
@@ -8,8 +8,8 @@ $handle_b = ($x) -> {
     RETURN CAST(($x || '2') AS Uint32);
 };
 
-$var_a = VARIANT ('5', 'a', $vartype);
-$var_b = VARIANT ('6', 'b', $vartype);
+$var_a = Variant('5', 'a', $vartype);
+$var_b = Variant('6', 'b', $vartype);
 
 SELECT
     Visit(Just($var_a), $handle_a AS a, $handle_b AS b),
@@ -19,8 +19,8 @@ SELECT
 ;
 
 $vartype_t = Variant<Optional<String>, Optional<String>>;
-$var_1 = VARIANT ('7', '0', $vartype_t);
-$var_2 = VARIANT ('8', '1', $vartype_t);
+$var_1 = Variant('7', '0', $vartype_t);
+$var_2 = Variant('8', '1', $vartype_t);
 
 SELECT
     Visit(Just($var_1), $handle_a, $handle_b),
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-variant_struct_builtins_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-variant_struct_builtins_/formatted.sql
@@ -17,9 +17,9 @@ $visitor = ($var) -> {
 };
 
 SELECT
-    $visitor(VARIANT (5, 'num', $vartype)),
-    $visitor(Just(VARIANT (TRUE, 'flag', $vartype))),
-    $visitor(Just(VARIANT ('somestr', 'str', $vartype))),
+    $visitor(Variant(5, 'num', $vartype)),
+    $visitor(Just(Variant(TRUE, 'flag', $vartype))),
+    $visitor(Just(Variant('somestr', 'str', $vartype))),
     $visitor(Nothing(OptionalType($vartype))),
     $visitor(NULL)
 ;
@@ -29,18 +29,18 @@ $visitor_def = ($var) -> {
 };
 
 SELECT
-    $visitor_def(VARIANT (5, 'num', $vartype)),
-    $visitor_def(Just(VARIANT (TRUE, 'flag', $vartype))),
-    $visitor_def(Just(VARIANT ('somestr', 'str', $vartype))),
+    $visitor_def(Variant(5, 'num', $vartype)),
+    $visitor_def(Just(Variant(TRUE, 'flag', $vartype))),
+    $visitor_def(Just(Variant('somestr', 'str', $vartype))),
     $visitor_def(Nothing(OptionalType($vartype))),
     $visitor_def(NULL)
 ;
 
 $vartype1 = Variant<num1: Int32, num2: Int32, num3: Int32>;
 
 SELECT
-    VariantItem(VARIANT (7, 'num2', $vartype1)),
-    VariantItem(Just(VARIANT (5, 'num1', $vartype1))),
+    VariantItem(Variant(7, 'num2', $vartype1)),
+    VariantItem(Just(Variant(5, 'num1', $vartype1))),
     VariantItem(Nothing(OptionalType($vartype1))),
     VariantItem(NULL)
 ;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-variant_struct_comp_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-variant_struct_comp_/formatted.sql
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-variant_tuple_builtins_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-variant_tuple_builtins_/formatted.sql
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-variant_tuple_comp_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-variant_tuple_comp_/formatted.sql
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_ansi_variant_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_ansi_variant_/formatted.sql
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

Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,5 @@`
`3`	`3`	`$vt = ParseType('Variant<One:Int32,Two:String>');`
`4`	`4`
`5`	`5`	`SELECT`
`6`		`- VARIANT (12, CAST(Unicode::ToUpper("o"u) AS String) \|\| 'ne', $vt)`
	`6`	`+ Variant(12, CAST(Unicode::ToUpper("o"u) AS String) \|\| 'ne', $vt)`
`7`	`7`	`;`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,6 @@ SELECT`
`10`	`10`	`<\|a: 1 / 0, b: Nothing(String?), c: 1\|> IS NOT DISTINCT FROM <\|c: 1u, d: 1u / 0u, e: Nothing(Utf8?)\|>, --true`
`11`	`11`	`[1, 2, NULL] IS NOT DISTINCT FROM [1, 2, just(1 / 0)], --false`
`12`	`12`	`{1: NULL} IS DISTINCT FROM {1u: 2 / 0}, --false`
`13`		`- VARIANT (1 / 0, '1', $vt1) IS DISTINCT FROM VARIANT (NULL, '1', $vt2), --false`
`14`		`- VARIANT (1 / 0, 'b', $svt1) IS NOT DISTINCT FROM VARIANT (NULL, 'b', $svt2), --true`
	`13`	`+ Variant(1 / 0, '1', $vt1) IS DISTINCT FROM Variant(NULL, '1', $vt2), --false`
	`14`	`+ Variant(1 / 0, 'b', $svt1) IS NOT DISTINCT FROM Variant(NULL, 'b', $svt2), --true`
`15`	`15`	`;`