aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzhvv117 <zhvv117@yandex-team.com>2024-12-06 19:34:08 +0300
committerzhvv117 <zhvv117@yandex-team.com>2024-12-06 19:51:24 +0300
commit46bab3363b8f2952a4618c3b6d763b8f92724580 (patch)
treee8e2955640bdededfd2e62d5ef39073e350144f3
parentfc049edd7fb71d559f889eff6657ce578dc4b159 (diff)
downloadydb-46bab3363b8f2952a4618c3b6d763b8f92724580.tar.gz
separate complex and multiline statements with a blank line
commit_hash:a5e96c76de71b92daf0469cf0e88dc79cd280d67
-rw-r--r--yql/essentials/sql/v1/format/sql_format.cpp31
-rw-r--r--yql/essentials/sql/v1/format/sql_format_ut.h5
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_eval_cluster_use_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_eval_cluster_use_compact_named_exprs_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_nested_query_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_opt_args_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_udf_args_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-closure_action_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-combine_subqueries_with_table_param_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-define_simple_action_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-dep_world_quote_code_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-empty_do_/formatted.sql4
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_anon_table_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_atom_wrong_type_expr_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_atom_wrong_type_param_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_code_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_column_/formatted.sql5
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_drop_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_each_input_table_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_filter_/formatted.sql3
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_folder_via_file_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_folder_via_file_in_job_/formatted.sql3
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_for_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_if_guard_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_input_output_table_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_input_output_table_subquery_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_like_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_on_modif_table_fail_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_pragma_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_python3_ann_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_python3_signature_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_python_signature_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_range_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_regexp_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_table_with_view_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_typeof_output_table_/formatted.sql4
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_unresolved_type_arg_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_values_output_table_subquery_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-evaluate_match_type_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-evaluate_pure_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-export_action_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-mixed_eval_typeof_world1_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-nested_action_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-nested_eval_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-nested_rewrite_io_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-parallel_for_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-pass_action_as_param_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_apply_quoted_code_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_if_select_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_type_splitmake_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_assumeorderby_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_extend_over_extend_for_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_merge1_/formatted.sql4
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_merge2_/formatted.sql4
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_merge_evaluate_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_merge_nested_world_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_orderby0_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_orderby1_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_orderby2_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-table_content_before_from_folder_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-avg_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-avg_distinct_expr_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-avg_if_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bitand_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bitor_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bitxor_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-booland_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-boolor_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bottom_/formatted.sql3
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bottom_by_/formatted.sql3
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-container_/formatted.sql3
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-corellation_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-count_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-count_if_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-def_value_full_table_/formatted.sql8
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-def_value_with_keys_/formatted.sql8
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-every_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-flatten_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-histogram_/formatted.sql3
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-hll_/formatted.sql3
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-linear_histogram_/formatted.sql3
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-list_/formatted.sql3
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-log_histogram_/formatted.sql3
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-logariphmic_histogram_/formatted.sql3
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-max_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-max_by_/formatted.sql4
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-median_/formatted.sql3
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-min_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-min_by_/formatted.sql4
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-mode_/formatted.sql3
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-some_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-stddev_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-sum_if_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-top_/formatted.sql3
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-top_by_/formatted.sql3
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-udaf_/formatted.sql9
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-udaf_distinct_expr_/formatted.sql8
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-udaf_in_udaf_/formatted.sql6
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-variance_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-agg_phases_table1_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-agg_phases_table2_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-agg_phases_table3_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_by_column_lookup_in_const_dict_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_distinct_list_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_list_in_key_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_with_lambda_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_with_lambda_inside_avg_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregation_with_named_node_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_extended_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_extended_subset_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_extended_tuple_/formatted.sql3
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_compact_sorted_with_diff_order_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-native_desc_group_compact_by_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_ansi_idents-inplace_yql_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-common_type_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-explicit_cast_/formatted.sql3
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-implicit_cast_callable_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-misc_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-presort_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-round_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-table_io_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-table_yt_key_filter_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-table_yt_native_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-tz_table_fill_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-tz_table_yt_key_filter_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-anon_table_binding_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-compact_named_exprs_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-compact_named_subq_actions_/formatted.sql5
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-compact_named_with_subq_contexts_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-drop_binding_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-insert_binding_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_concat_binding_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_concat_strict_binding_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_filter_binding_/formatted.sql11
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_filter_strict_binding_/formatted.sql12
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_from_binding_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_from_binding_inferscheme_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_range_binding_/formatted.sql6
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_range_strict_binding_/formatted.sql6
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_regexp_binding_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_regexp_strict_binding_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-tie_scalar_context_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-block_input_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-block_input_sys_columns_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-block_input_various_types_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-coalesce_complex_/formatted.sql3
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-combine_all_pg_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-combine_all_pg_filter_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-combine_hashed_pg_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-compare_dates_floats_bools_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_add_interval_scalar_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_equals_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_equals_scalar_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_greater_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_greater_or_equal_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_greater_or_equal_scalar_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_greater_scalar_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_group_by_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_less_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_less_or_equal_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_less_or_equal_scalar_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_less_scalar_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_not_equals_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_not_equals_scalar_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_sub_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_sub_interval_scalar_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_sub_scalar_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_top_sort_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-distinct_mixed_all_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-distinct_mixed_keys_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-distinct_opt_state_all_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-distinct_opt_state_keys_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-distinct_pure_all_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-distinct_pure_keys_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-finalize_hashed_keys_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-interval_add_date_scalar_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-lazy_nonstrict_basic_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-minmax_strings_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-minmax_strings_filter_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-minmax_tuple_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-pg_to_strings_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-sort_one_asc_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-sort_one_desc_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-sort_two_asc_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-sort_two_desc_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-sort_two_mix_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-string_with_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-top_sort_one_asc_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-top_sort_one_desc_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-top_sort_two_asc_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-top_sort_two_desc_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-top_sort_two_mix_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-tuple_nth_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-type_and_callable_stats_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_case-case_many_val_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-insert_diff_groups1_fail_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-insert_diff_groups2_fail_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-insert_diff_groups3_fail_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-many_inserts_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-min_group_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-align_publish_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-align_publish_native_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-insert_/formatted.sql4
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-insert_reorder_without_columnorder_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-insert_tmp_/formatted.sql3
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-insert_with_desc_sort_and_native_types_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-insert_with_new_cols_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-insert_with_reorder_cols_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-join_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-join_nosimple_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-ordered_plus_native_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_action_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_distinct_star_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_groupby_with_star_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_limit_offset_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_limit_offset_reorder_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_orderby_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_plain_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_plain_nosimple_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_sample_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_subquery_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_where_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_win_func_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-winfunc_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-decimal_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-in3_/formatted.sql3
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-multiply_limit_with_dups_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-norange_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-tuples_compare_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-yql-12941_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-yql-7237_/formatted.sql3
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_table_sort_asc_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_table_sort_desc_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_distinct-distinct_having_no_agg_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_distinct-distinct_union_all_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-blacklisted_pragmas1_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-blacklisted_pragmas_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-join_cbo_native_3_tables_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-mem_limit_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-pool_trees_whitelist_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-precompute_result_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-read_cost_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-read_cost_native_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-wrong_script_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-wrong_script_segf_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-wrong_script_timeout_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_epochs-read_modified_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_epochs-reset_sortness_on_append_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_epochs-use_and_drop_anonymous_/formatted.sql6
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_epochs-use_sorted_by_complex_type_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-as_dict_dict_key_/formatted.sql3
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-as_dict_tuple_key_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-callable_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-cast_variant_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-constraints_of_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-convert_to_lambda_optional_args_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-dict_common_type_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-empty_iterator2_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-empty_iterator_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-exapnd_with_singular_types_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-fallback_filternullelements_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-fallback_filternullmembers_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-inline_call_/formatted.sql5
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-iterable_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_builtins_/formatted.sql7
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_sample_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_sample_n_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_shuffle_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_top_sort_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-non_persistable_group_by_column_fail_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-non_persistable_group_by_having_some_fail_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-non_persistable_group_by_some_fail_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-non_persistable_inner_select_fail_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-non_persistable_insert_into_fail_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-non_persistable_order_by_fail_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-opt_list_map_/formatted.sql4
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-replace_member_/formatted.sql3
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-sets_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-static_fold_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-struct_merge_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-tagged_runtime_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_dict_dict_key_/formatted.sql7
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_dict_list_key_/formatted.sql6
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_dict_tuple_key_/formatted.sql16
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_dict_varstruct_key_/formatted.sql7
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_dict_vartuple_key_/formatted.sql7
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_set_dict_key_/formatted.sql5
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_set_list_key_/formatted.sql4
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_set_tuple_key_/formatted.sql10
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_set_varstruct_key_/formatted.sql5
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_set_vartuple_key_/formatted.sql5
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_sorted_dict_list_key_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_sorted_dict_tuple_key_/formatted.sql8
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_sorted_dict_vartuple_key_/formatted.sql3
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_sorted_set_list_key_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_sorted_set_tuple_key_/formatted.sql5
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_sorted_set_vartuple_key_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-tzdate_result_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-udaf_with_list_zip_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-unicode_literals_/formatted.sql3
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-variant_struct_comp_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-variant_tuple_comp_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-yql-10180_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-yql-15485_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_mode_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-flatten_with_resource_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flatten_by-struct_without_correlation_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-basic_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-functions_/formatted.sql5
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-group_by2_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-inside_evaluate_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-unused_types_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-fuse_multi_outs1_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-fuse_multi_outs2_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-less_outs_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-max_outtables_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-merge_multiouts_all_/formatted.sql3
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-merge_multiouts_part_/formatted.sql3
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-merge_multiouts_reuse_/formatted.sql3
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-out_mem_limit_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-out_table_record_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-runtime_dep_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-sorted_out_mix_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-yield_off_/formatted.sql3
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-yield_on_/formatted.sql3
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-yql-12610_old_table_props_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-yql-6477_table_path_/formatted.sql3
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-yql19332_aux_cols_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_ansi_join_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_noansi_join_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_tablesource_on_raw_list_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_with_table_of_tuples_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-yql-10038_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-yql-14677_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-anonymous_tables_/formatted.sql3
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-append_after_replace_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-append_missing_null_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-double_append_to_anonymous_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-fail_read_view_after_modify_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-from_two_sorted_by_calc_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-merge_publish_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-multiappend_sorted_/formatted.sql6
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-replace_inferred_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-replace_inferred_op_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-select_after_insert_relabeled_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-select_after_replace_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-select_after_replace_unwrap_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-aggr_diff_order_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-alias_where_group_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-anyjoin_common_dup_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-anyjoin_common_nodata_keys_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-anyjoin_common_nodup_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-anyjoin_merge_nodup_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-bush_dis_in_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-bush_dis_in_in_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-bush_dis_in_in_in_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-bush_in_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-bush_in_in_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-bush_in_in_in_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-cbo_4tables_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-cbo_4tables_only_sorted_merge_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-convert_check_key_mem2_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-convert_check_key_mem_/formatted.sql4
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-convert_key_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-count_bans_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-cross_join_with_lazy_list_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-do_not_suppres_equijoin_input_sorts_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-emptyjoin_unused_keys_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-filter_joined_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-flatten_columns1_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-flatten_columns2_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-force_merge_join_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-full_join_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-grace_join1_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-grace_join2_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-group_compact_by_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-inmem_by_uncomparable_structs_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-inmem_by_uncomparable_tuples_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-inmem_with_set_key_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-inmem_with_set_key_any_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-inner_all_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-inner_all_right_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_cbo_3_tables_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_comp_common_table_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_comp_map_table_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_key_cmp_udf_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_left_cbo_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_no_correlation_in_order_by_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_right_cbo_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_semi_correlation_in_order_by_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_table_conflict_fail_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_with_duplicate_keys_on_sorted_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_without_column_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_without_correlation_and_dict_access_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_without_correlation_and_struct_access_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_without_correlation_names_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-late_mergejoin_on_empty_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_all_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_join_null_column_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_join_right_pushdown_simple_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_null_literal_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_only_semi_and_other_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_only_with_other_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_semi_with_other_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_bug7646_csee_/formatted.sql5
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_bug7646_subst_/formatted.sql5
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_bug8533_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_inner_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_inner_1o2o_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_inner_1o_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_inner_2o_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_inner_empty_subq_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_not_selected_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_semi_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_semi_1o2o_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_semi_1o_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_semi_2o_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_semi_empty_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_semi_subq_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_take_skip_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_unused_keys_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_with_cache_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_dup_key_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_early_rewrite_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_early_rewrite_sequence_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_early_rewrite_star_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_left_null_column_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_on_complex_type_non_optional_left_only_single_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_on_complex_type_optional_left_only_single_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_on_complex_type_optional_left_semi_many_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_on_complex_type_optional_left_semi_single_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_on_tablerecord_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_on_very_complex_type_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_opt_vs_2xopt_/formatted.sql4
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_partial_uniq_keys_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_sharded_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_unused_keys_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_with_anonymous_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_with_empty_read_/formatted.sql4
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_with_empty_struct_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_any_no_join_reduce_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_big_primary_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_big_primary_unique_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_choose_primary_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_choose_primary_with_retry_/formatted.sql3
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_force_align1_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_force_align2_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_force_align3_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_force_no_sorted_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_force_one_sorted_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_force_per_link_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_left_null_column_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_narrows_output_sort_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_saves_output_sort_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_saves_output_sort_cross_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_saves_output_sort_nested_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_saves_output_sort_unmatched_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_semi_composite_to_inner_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_semi_to_inner_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_small_primary_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_sorts_output_for_sort_inner_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_sorts_output_for_sort_left_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_sorts_output_for_sort_nomatch_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_sorts_output_for_sort_right_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_unused_keys_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_with_different_key_names_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_with_different_key_names_nested_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_with_different_key_names_nonsorted_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_with_different_key_names_norename_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_with_reverse_key_order_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_with_table_range_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-nested_semi_join_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-nopushdown_filter_over_inner_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-opt_on_opt_side_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-opt_on_opt_side_with_group_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-order_of_qualified_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_common_cross_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_common_inner_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_common_inner_both_sides_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_common_inner_filter_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_common_left_cross_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_common_multiparents_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_common_multiparents_no_premap_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_common_right_tablecontent_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_common_semi_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_context_dep_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_map_cross_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_map_inner_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_map_semi_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_merge_extrasort1_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_merge_extrasort2_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_merge_inner_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_merge_with_remap_/formatted.sql3
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_no_premap_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_nonseq_flatmap_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_context_dep_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_cross_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_exclusion_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_inner_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_left_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_left_semi_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_null_column_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_random_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_renaming_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_rownumber_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pushdown_filter_over_inner_with_assume_strict_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pushdown_filter_over_inner_with_strict_udf_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pushdown_filter_over_left_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-simple_columns_partial_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-split_to_list_as_key_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_inners_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_inners_premap_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_inners_vk_sorted_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_mirror_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_multi_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_semionly_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_semionly_premap_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_with_diff_complex_key_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-starjoin_unused_keys_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-three_equalities_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-three_equalities_paren_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-trivial_view_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-two_aggrs_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-10654_pullup_with_sys_columns_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-14829_left_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-14829_leftonly_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-14847_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-16011_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-19081_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-4275_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-8125_/formatted.sql4
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-8131_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql_465_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_exists_common_syntax_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_query_common_syntax_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_query_example_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_common_syntax_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_on_error_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_returning_/formatted.sql5
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-jsonpath_unicode_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-calc_dependent_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-calc_dependent_with_tmp_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-datetime_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-decimal_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-key_double_opt_suffix_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-no_bypass_merge_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-split_input_with_key_filter1_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-split_input_with_key_filter2_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-string_with_ff_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-tzdate_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-uuid_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_no_arg_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_simple_/formatted.sql3
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_udf_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_use_labmda_as_arg_/formatted.sql3
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_with_tie_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_with_tie_bad_count_fail_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-forward_import_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-library_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-library_alias_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-library_udf_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-library_via_http_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-package_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-package_override_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_limit-dynamic_sort_limit_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_limit-yql-7900_empty_sorted_without_keys_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_limit-yql-8611_calc_peephole_/formatted.sql3
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-nested_lambda_fields_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-process_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-reduce_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-reduce_all_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-reduce_all_row_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-alerts-streaming_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-alerts_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-alerts_without_order_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-permute_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-simple_paritioning-streaming_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-simple_paritioning_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-test_type-streaming_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-test_type_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-test_type_predicate_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-and_absorption_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-flatmap_with_non_struct_out_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-length_over_merge_fs_multiusage_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-or_absorption_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-or_distributive_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-passthrough_sortness_over_map_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-pushdown_nonsep_over_aggregate_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-sort_over_sorted_prefix_keys_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-sort_over_sorted_same_keys_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-test_lmap_opts_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-total_order_/formatted.sql3
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-10070_extract_members_over_calcoverwindow_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-10737_lost_passthrough_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-14581_fuseflatmaps_with_external_lambda_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-17715_concat_sort_desc_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-18300-flatmap-over-extend_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-18408_filter_multiusage_pushdown_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-18733_no_filter_multiusage_pushdown_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-6008_limit_after_map_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-6133_skip_deps_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-7324_duplicate_arg_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-7532_wrong_field_subset_for_calcoverwindow_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-8223_direct_row_and_skipnullmembers_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-9297_publish_ytcopy_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql_6179_merge_chunks_of_outputs_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_complex_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_empty_list_sort_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_single_item_sort_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_take_zero_sort_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_with_assume_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-native_desc_assume_with_transform_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-native_desc_publish_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-native_desc_sort_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-native_desc_sort_calc_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-native_desc_sort_with_limit_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_missing_project_column_ignored_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_missing_project_column_join2_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_missing_project_column_join_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_missing_project_column_join_types_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_tuple_expr_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-ordered_fill_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-presort_order_by_table_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-singular_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-union_all_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_params-complex_yson_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_params-primitives_/formatted.sql4
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_params-tuple_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_params-variant_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-aggregate_factory_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-nulls_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-nulls_native_/formatted.sql3
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-pg_iterate_/formatted.sql6
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-classic_division_/formatted.sql3
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-config_exec_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-release_temp_data_chain_pull_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-release_temp_data_chain_pull_fail_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-release_temp_data_chain_pull_single_thread_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-release_temp_data_chain_pull_single_thread_fail_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-discard_reduce_lambda_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-fuse_reduces_with_presort_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-native_desc_reduce_with_presort_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_lambda_opt_args_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_multi_in_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_multi_in_trivial_lambda_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_multi_out_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_multi_out_bad_count_fail_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_pure_with_sort_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_row_and_columns_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_rows_and_filter_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_rows_sorted_desc_multi_out_/formatted.sql3
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_rows_sorted_multi_out_/formatted.sql3
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_sorted_desc_multi_out_/formatted.sql3
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_sorted_multi_out_/formatted.sql3
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_assume_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_lambda_outstream_/formatted.sql4
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_python_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_python_as_struct_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_python_stream_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_udf_validate_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_udf_validate_ignore_broken_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_all_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_all_expr_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_all_list_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_all_list_stream_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_all_multi_in_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_all_opt_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_by_struct_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_lambda_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_lambda_list_mem_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_lambda_list_table_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_lambda_presort_twin_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_lambda_presort_twin_list_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_difftype_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_difftype_assume_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_difftype_assume_keytuple_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_keytuple_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_keytuple_difftype_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_presort_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_ref_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_sampling_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_stage_and_flatmap_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_out_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_subfields_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_typeinfo_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_assume_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_assume_in_subquery_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_flat_lambda_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_flat_python_stream_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_presort_diff_order_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_few_keys_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_few_keys_stream_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_filter_and_having_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_having_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_presort_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_presort_stream_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_row_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_row_repack_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-bind_expr_subquery_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-bind_expr_udf_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-bind_join_left_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-bind_join_right_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-bind_multiple_sample_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-insert_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-join_left_sample_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-join_right_sample_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-mapjoin_left_sample_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-mapjoin_right_sample_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-orderedjoin_left_sample_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-orderedjoin_right_sample_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-reduce_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-reduce_with_presort_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-subquery_mapjoin_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-yql-14664_deps_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-fake_column_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-insert_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-insert_sorted_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-limit_directread_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-user_schema_bind_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-user_schema_directread_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-user_schema_no_infer_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-user_schema_patch_columns_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-anon_clash_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-discard_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-dot_in_alias_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-dot_name_subrequest_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-optional_as_warn_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-optional_in_job_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-optional_pull_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-qualified_all_and_group_by_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-refselect_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-result_rows_limit_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-result_size_limit_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-result_size_limit_with_fill_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-reuse_named_node_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-select_all_from_concat_anon_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-table_content_from_double_opt_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-table_content_from_sort_desc_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-table_content_with_tmp_folder_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-tablepathprefix_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-where_with_lambda_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_seq_mode-action_shared_subquery_expr_after_commit_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_seq_mode-shared_named_expr_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_seq_mode-shared_subquery_expr_after_commit_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_seq_mode-subquery_shared_subquery_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_base_fail_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_all_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_all_1_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_all_2_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_bug8923_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_qualified_all_disable_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_qualified_all_enable_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_without_1_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_without_2_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_without_left_semi_1_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_without_left_semi_2_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_fail_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_qualified_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_subreq_all_key_without_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_subreq_same_key_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_subreq_same_key_by_all_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_subreq_same_key_without_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_without_resolve_dublicates_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_without_resolve_dublicates_mult_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_qualified_all_and_group_by_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_subreq_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_subreq_all_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_union_all_qualified_star_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_stream_lookup_join-lookup_join_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_stream_lookup_join-lookup_join_narrow_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-concat_sorted_max_sorted_tables_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-concat_sorted_max_tables_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-range_over_filter_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-range_over_filter_udf_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q12_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q5_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-append_diff_flags_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-append_diff_layout1_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-append_diff_layout2_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-append_struct_/formatted.sql3
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-decimal_yt_llvm_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-decimal_yt_nollvm_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-float_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-ignore_v3_pragma_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-insert_struct_v3_with_native_/formatted.sql4
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-insert_struct_v3_wo_native_/formatted.sql4
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-json_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-mergejoin_with_sort_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-non_strict_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-replace_diff_layout_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-singulars_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-split_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-type_subset_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-uuid_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-named_args_for_script_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-named_args_for_script_with_posargs2_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-named_args_for_script_with_posargs_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-named_args_for_script_with_posargs_reuse_args_fail_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-python_script_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-python_script_from_file_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-python_struct_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udaf_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udaf_default_/formatted.sql7
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udaf_distinct_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udaf_lambda_/formatted.sql5
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udaf_short_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_union_all-union_all_with_discard_into_result_ansi_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_union_all-union_all_with_top_level_limits_ansi_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-file_eval_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-file_inner_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-file_inner_library_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-file_inner_udf_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-file_outer_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-file_outer_library_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-init_view_after_eval_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-secure_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-secure_eval_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-secure_eval_dyn_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-standalone_view_lambda_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-system_udf_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-few_source_different_columns_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-optimize_weak_fields_combine_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-optimize_weak_fields_filter_combine_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-optimize_weak_fields_map_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-optimize_weak_fields_map_combine_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_infer_scheme_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-all_columns_hide_window_special_ones_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-current_session_extended_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-distinct_over_window_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-distinct_over_window_full_frames_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-distinct_over_window_struct_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-presort_window_order_by_table_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-row_number_no_part_multi_input_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-udaf_window_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-udaf_with_def_value_/formatted.sql8
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_by_all_percentile_interval_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_expr_bounds_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_aggr_with_qualified_all_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_aggr_with_qualified_all_no_simple_columns_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_auto_arg_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_auto_arg_selective_rank_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_auto_arg_two_sort_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_in_lib_/formatted.sql2
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_order_by_udf_empty_rank_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_rank_by_all_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_rank_by_opt_all_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_rank_by_opt_part_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_rank_by_part_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_fuse_window_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_multiaggr_library_/formatted.sql1
-rw-r--r--yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-yql-15636_/formatted.sql1
854 files changed, 1431 insertions, 8 deletions
diff --git a/yql/essentials/sql/v1/format/sql_format.cpp b/yql/essentials/sql/v1/format/sql_format.cpp
index 030ac13f41..425f7cb6f1 100644
--- a/yql/essentials/sql/v1/format/sql_format.cpp
+++ b/yql/essentials/sql/v1/format/sql_format.cpp
@@ -463,7 +463,7 @@ public:
{
}
- TString Process(const NProtoBuf::Message& msg, bool& addLine) {
+ TString Process(const NProtoBuf::Message& msg, bool& addLineBefore, bool& addLineAfter, TMaybe<ui32>& stmtCoreAltCase) {
Scopes.push_back(EScope::Default);
MarkedTokens.reserve(ParsedTokens.size());
MarkTokens(msg);
@@ -480,7 +480,10 @@ public:
AddComment(text);
}
- addLine = AddLine.GetOrElse(true);
+ ui32 lines = OutLine - (OutColumn == 0 ? 1 : 0);
+ addLineBefore = AddLine.GetOrElse(true) || lines > 1;
+ addLineAfter = AddLine.GetOrElse(true) || lines - CommentLines > 1;
+ stmtCoreAltCase = StmtCoreAltCase;
return SB;
}
@@ -543,6 +546,10 @@ private:
Out(' ');
}
+ if (OutColumn == 0) {
+ ++CommentLines;
+ }
+
Out(text);
if (!text.StartsWith("--") &&
@@ -571,7 +578,9 @@ private:
MarkToken(token);
} else if (descr == TRule_sql_stmt_core::GetDescriptor()) {
if (AddLine.Empty()) {
- AddLine = !IsSimpleStatement(dynamic_cast<const TRule_sql_stmt_core&>(msg)).GetOrElse(false);
+ const auto& rule = dynamic_cast<const TRule_sql_stmt_core&>(msg);
+ AddLine = !IsSimpleStatement(rule).GetOrElse(false);
+ StmtCoreAltCase = rule.Alt_case();
}
} else if (descr == TRule_lambda_body::GetDescriptor()) {
Y_ENSURE(TokenIndex >= 1);
@@ -2725,9 +2734,11 @@ private:
ui32 LastLine = 0;
ui32 LastColumn = 0;
ui32 LastComment = 0;
+ ui32 CommentLines = 0;
i32 CurrentIndent = 0;
TVector<EScope> Scopes;
TMaybe<bool> AddLine;
+ TMaybe<ui32> StmtCoreAltCase;
ui64 InsideType = 0;
bool AfterNamespace = false;
bool AfterBracket = false;
@@ -2972,6 +2983,8 @@ public:
TVector<TTokenIterator> statements;
SplitByStatements(allTokens.begin(), allTokens.end(), statements);
TStringBuilder finalFormattedQuery;
+ bool prevAddLine = false;
+ TMaybe<ui32> prevStmtCoreAltCase;
for (size_t i = 1; i < statements.size(); ++i) {
TStringBuilder currentQueryBuilder;
for (auto it = statements[i - 1]; it != statements[i]; ++it) {
@@ -3022,8 +3035,11 @@ public:
}
TPrettyVisitor visitor(parsedTokens, comments);
- bool addLine;
- auto currentFormattedQuery = visitor.Process(*message, addLine);
+ bool addLineBefore = false;
+ bool addLineAfter = false;
+ TMaybe<ui32> stmtCoreAltCase;
+ auto currentFormattedQuery = visitor.Process(*message, addLineBefore, addLineAfter, stmtCoreAltCase);
+
TParsedTokenList stmtFormattedTokens;
auto onNextFormattedToken = [&](NSQLTranslation::TParsedToken&& token) {
stmtFormattedTokens.push_back(token);
@@ -3038,9 +3054,12 @@ public:
return false;
}
- if (addLine && !finalFormattedQuery.empty()) {
+ const bool differentStmtAltCase = prevStmtCoreAltCase.Defined() && stmtCoreAltCase != prevStmtCoreAltCase;
+ if ((addLineBefore || prevAddLine || differentStmtAltCase) && !finalFormattedQuery.empty()) {
finalFormattedQuery << "\n";
}
+ prevAddLine = addLineAfter;
+ prevStmtCoreAltCase = stmtCoreAltCase;
finalFormattedQuery << currentFormattedQuery;
if (parsedTokens.back().Name != "SEMICOLON") {
diff --git a/yql/essentials/sql/v1/format/sql_format_ut.h b/yql/essentials/sql/v1/format/sql_format_ut.h
index f431667ad2..64bdb1ebcf 100644
--- a/yql/essentials/sql/v1/format/sql_format_ut.h
+++ b/yql/essentials/sql/v1/format/sql_format_ut.h
@@ -872,9 +872,9 @@ Y_UNIT_TEST(CompositeTypesAndQuestions) {
Y_UNIT_TEST(Lambda) {
TCases cases = {
{"$f=($a,$b)->{$x=$a+$b;return $a*$x};$g=($a,$b?)->($a+$b??0);select $f(10,4),$g(1,2);",
- "$f = ($a, $b) -> {\n\t$x = $a + $b;\n\tRETURN $a * $x\n};\n"
+ "$f = ($a, $b) -> {\n\t$x = $a + $b;\n\tRETURN $a * $x\n};\n\n"
"$g = ($a, $b?) -> ($a + $b ?? 0);\n\n"
- "SELECT\n\t$f(10, 4),\n\t$g(1, 2)\n;\n"},
+ "SELECT\n\t$f(10, 4),\n\t$g(1, 2)\n;\n"},
};
TSetup setup;
@@ -1362,6 +1362,7 @@ FROM Input MATCH_RECOGNIZE(
);
)",
R"(PRAGMA FeatureR010 = "prototype";
+
USE plato;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_eval_cluster_use_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_eval_cluster_use_/formatted.sql
index 3602870153..13b1450a31 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_eval_cluster_use_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_eval_cluster_use_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* postgres can not */
$foo = CAST(Unicode::ToLower("PLATO"u) AS String);
+
USE yt: $foo;
INSERT INTO Output
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_eval_cluster_use_compact_named_exprs_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_eval_cluster_use_compact_named_exprs_/formatted.sql
index 2c810a3a6d..8ed1801d80 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_eval_cluster_use_compact_named_exprs_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_eval_cluster_use_compact_named_exprs_/formatted.sql
@@ -1,5 +1,6 @@
/* yt can not */
PRAGMA CompactNamedExprs;
+
$foo = CAST(Unicode::ToLower("PLATO"u) AS String);
INSERT INTO yt: $foo.Output
@@ -27,6 +28,7 @@ DEFINE ACTION $bar() AS
key
;
END DEFINE;
+
DO
$bar()
;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_nested_query_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_nested_query_/formatted.sql
index edb8bb4059..475c04aa89 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_nested_query_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_nested_query_/formatted.sql
@@ -18,6 +18,7 @@ DEFINE ACTION $action() AS
key
;
END DEFINE;
+
DO
$action()
;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_opt_args_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_opt_args_/formatted.sql
index 51085a4c68..8afb606be8 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_opt_args_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_opt_args_/formatted.sql
@@ -5,9 +5,11 @@ DEFINE ACTION $action($a, $b?) AS
$a + ($b ?? 0)
;
END DEFINE;
+
DO
$action(1)
;
+
DO
$action(2, 3)
;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_udf_args_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_udf_args_/formatted.sql
index 986fd17f8d..22d32ad95e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_udf_args_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-action_udf_args_/formatted.sql
@@ -5,7 +5,9 @@ DEFINE ACTION $f($x) AS
$x
;
END DEFINE;
+
$x = CAST(Unicode::ToUpper("abc"u) AS String);
+
DO
$f($x)
;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-closure_action_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-closure_action_/formatted.sql
index 17aee89c48..c8e14800a5 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-closure_action_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-closure_action_/formatted.sql
@@ -21,6 +21,7 @@ DEFINE ACTION $closure_action($a) AS
$a(3, 4)
;
END DEFINE;
+
DO
$closure_action($action)
;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-combine_subqueries_with_table_param_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-combine_subqueries_with_table_param_/formatted.sql
index ca7fd68e65..5184ecd7ac 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-combine_subqueries_with_table_param_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-combine_subqueries_with_table_param_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
$combineQueries = ($query, $list) -> {
RETURN EvaluateCode(
LambdaCode(
@@ -23,6 +24,7 @@ DEFINE SUBQUERY $calc($table) AS
$table
;
END DEFINE;
+
$fullQuery = $combineQueries($calc, AsList("Input", "Input"));
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-define_simple_action_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-define_simple_action_/formatted.sql
index 622e87a01b..1b66a45d21 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-define_simple_action_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-define_simple_action_/formatted.sql
@@ -15,6 +15,7 @@ DEFINE ACTION $action($b, $c) AS
$d
;
END DEFINE;
+
DO
$action(1, 2)
;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-dep_world_quote_code_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-dep_world_quote_code_/formatted.sql
index 729db2c15d..47cc04d6df 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-dep_world_quote_code_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-dep_world_quote_code_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
$combineQueries = ($query, $list) -> {
RETURN EvaluateCode(
LambdaCode(
@@ -43,6 +44,7 @@ END DEFINE;
EVALUATE FOR $z IN AsList("Input") DO
$aaa($z)
;
+
DO
$aaa("Input")
;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-empty_do_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-empty_do_/formatted.sql
index 4ce66dcd7b..1ab6bcd47a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-empty_do_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-empty_do_/formatted.sql
@@ -3,13 +3,17 @@
DO
EMPTY_ACTION()
;
+
$action1 = EMPTY_ACTION;
+
DO
$action1()
;
+
$action2 = ($a, $_b) -> {
RETURN $a;
};
+
DO
$action2(12)
;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_anon_table_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_anon_table_/formatted.sql
index 09ae0b0aef..3516c524e4 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_anon_table_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_anon_table_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
$a = CAST(Unicode::ToUpper("T"u) AS String) || "able";
$b = CAST(Unicode::ToUpper("T"u) AS String) || "able";
@@ -8,6 +9,7 @@ INSERT INTO @$a
SELECT
1 AS x
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_atom_wrong_type_expr_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_atom_wrong_type_expr_/formatted.sql
index d069c1eb34..eeeefbea94 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_atom_wrong_type_expr_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_atom_wrong_type_expr_/formatted.sql
@@ -1,6 +1,7 @@
/* yt can not */
/* custom error: Expected data or optional of data, but got: List<String> */
USE plato;
+
$n = ["foo"];
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_atom_wrong_type_param_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_atom_wrong_type_param_/formatted.sql
index a147b8a752..f8e7438079 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_atom_wrong_type_param_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_atom_wrong_type_param_/formatted.sql
@@ -1,6 +1,7 @@
/* yt can not */
/* custom error: Expected data or optional of data, but got optional of: List<String> */
USE plato;
+
DECLARE $n AS List<String>?;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_code_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_code_/formatted.sql
index 5068328776..9680ea63d8 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_code_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_code_/formatted.sql
@@ -3,6 +3,7 @@
SELECT
EvaluateCode(FuncCode("Int32", AtomCode("1")))
;
+
$inc = EvaluateCode(
LambdaCode(
($x) -> {
@@ -14,6 +15,7 @@ $inc = EvaluateCode(
SELECT
$inc(1)
;
+
$addPrefixForMembers = ($strValue) -> {
$code = EvaluateCode(
LambdaCode(
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_column_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_column_/formatted.sql
index 701b637ff1..094b5060ae 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_column_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_column_/formatted.sql
@@ -1,11 +1,13 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
$x = CAST(Unicode::ToLower("foo"u) AS String);
SELECT
AsStruct("1" AS foo, 2 AS bar).$x
;
+
$x = CAST(Unicode::ToLower("value"u) AS String);
SELECT
@@ -16,6 +18,7 @@ FROM
ORDER BY
key
;
+
$x = CAST(Unicode::ToLower("value"u) AS String);
SELECT
@@ -26,6 +29,7 @@ FROM
ORDER BY
key
;
+
$x = CAST(Unicode::ToLower("value"u) AS String);
SELECT
@@ -35,6 +39,7 @@ FROM
ORDER BY
t.$x
;
+
$x = CAST(Unicode::ToLower("value"u) AS String);
$y = CAST(Unicode::ToLower("key"u) AS String);
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_drop_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_drop_/formatted.sql
index 6ca86a40b3..f5c4966334 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_drop_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_drop_/formatted.sql
@@ -8,4 +8,5 @@ $path = (
FROM
folder("")
);
+
DROP TABLE $path;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_each_input_table_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_each_input_table_/formatted.sql
index 7037251934..06168b196c 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_each_input_table_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_each_input_table_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* syntax version 1 */
USE plato;
+
$a = ListMap(ListFromRange(0, 2), ($_x) -> (CAST(Unicode::ToUpper("i"u) AS String) || "nput"));
SELECT
@@ -8,6 +9,7 @@ SELECT
FROM
each($a VIEW raw)
;
+
$a = ListMap(ListFromRange(0, 1), ($_x) -> (CAST(Unicode::ToUpper("i"u) AS String) || "nput"));
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_filter_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_filter_/formatted.sql
index 312bc9d0a2..3eb0caa935 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_filter_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_filter_/formatted.sql
@@ -1,10 +1,13 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
$arg1 = "" || "";
+
$arg2 = ($_item) -> {
RETURN TRUE
};
+
$arg3 = "" || "";
$arg4 = "" || "raw";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_folder_via_file_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_folder_via_file_/formatted.sql
index 3dc8d256c3..a9c907805c 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_folder_via_file_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_folder_via_file_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
PRAGMA yt.FolderInlineItemsLimit = "0";
$list = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_folder_via_file_in_job_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_folder_via_file_in_job_/formatted.sql
index f410f7696f..b18b1b01e0 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_folder_via_file_in_job_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_folder_via_file_in_job_/formatted.sql
@@ -1,11 +1,14 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
PRAGMA yt.FolderInlineItemsLimit = "0";
+
$script = @@
def f(s):
return True
@@;
+
$callable = Python3::f(Callable<(String) -> Bool>, $script);
$list = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_for_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_for_/formatted.sql
index 9a89e01ccd..9c7a2c8a58 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_for_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_for_/formatted.sql
@@ -7,6 +7,7 @@ DEFINE ACTION $action1($x) AS
$x
;
END DEFINE;
+
$f = ($i) -> {
RETURN CAST(Unicode::ToUpper(CAST($i AS Utf8)) AS String);
};
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_if_guard_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_if_guard_/formatted.sql
index 48454ee9cd..168e62ba1e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_if_guard_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_if_guard_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
$list = ListTake(AsList("Input"), 0);
DEFINE ACTION $process() AS
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_input_output_table_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_input_output_table_/formatted.sql
index 02338ebdbf..a76146b498 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_input_output_table_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_input_output_table_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
$a = CAST(Unicode::ToUpper("o"u) AS String) || "utput";
$b = CAST(Unicode::ToUpper("i"u) AS String) || "nput";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_input_output_table_subquery_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_input_output_table_subquery_/formatted.sql
index 59d2cb2a3b..ab671c554f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_input_output_table_subquery_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_input_output_table_subquery_/formatted.sql
@@ -11,6 +11,7 @@ $b = (
SELECT
CAST(Unicode::ToUpper("i"u) AS String) || "npu"
);
+
$a = $a || CAST(Unicode::ToLower("T"u) AS String);
$b = $b || CAST(Unicode::ToLower("T"u) AS String);
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_like_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_like_/formatted.sql
index 1aac5498cd..3d5bda2214 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_like_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_like_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
$arg1 = "" || "";
$arg2 = CAST(Unicode::ToUpper("i"u) AS String) || "npu_";
$arg3 = "" || "";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_on_modif_table_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_on_modif_table_fail_/formatted.sql
index dd4bfffe41..f0de77f3a0 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_on_modif_table_fail_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_on_modif_table_fail_/formatted.sql
@@ -10,6 +10,7 @@ UNION ALL
SELECT
"subkey" AS field
;
+
COMMIT;
$whitelist =
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_pragma_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_pragma_/formatted.sql
index 7ece483ab1..da9224ad32 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_pragma_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_pragma_/formatted.sql
@@ -1,4 +1,5 @@
/* syntax version 1 */
/* postgres can not */
$a = "1" || CAST(Unicode::ToUpper("m") AS String);
+
PRAGMA yt.DataSizePerJob = $a;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_python3_ann_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_python3_ann_/formatted.sql
index a0d5d706d8..9931df7955 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_python3_ann_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_python3_ann_/formatted.sql
@@ -9,6 +9,7 @@ def f(x:Int32, y:Int32)->Int32:
"""
return x + y
@@;
+
--$f = Python3::f(EvaluateType(ParseTypeHandle(Core::PythonFuncSignature(AsAtom("Python3"), $script, "f"))), $script);
$f = Python3::f($script);
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_python3_signature_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_python3_signature_/formatted.sql
index 4aa9fe7bc3..7367fbb912 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_python3_signature_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_python3_signature_/formatted.sql
@@ -10,6 +10,7 @@ def f(x, y):
"""
return x + y
@@;
+
--$f = Python3::f(EvaluateType(ParseTypeHandle(Core::PythonFuncSignature(AsAtom("Python3"), $script, "f"))), $script);
$f = Python3::f($script);
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_python_signature_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_python_signature_/formatted.sql
index 34e7498364..396ba04993 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_python_signature_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_python_signature_/formatted.sql
@@ -10,6 +10,7 @@ def f(x, y):
"""
return x + y
@@;
+
--$f = Python::f(EvaluateType(ParseTypeHandle(Core::PythonFuncSignature(AsAtom("Python"), $script, "f"))), $script);
$f = Python::f($script);
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_range_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_range_/formatted.sql
index 99c5382e55..249ad01de4 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_range_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_range_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
$arg1 = "" || "";
$arg2 = CAST(Unicode::ToUpper("i"u) AS String) || "nput";
$arg3 = CAST(Unicode::ToUpper("i"u) AS String) || "nput";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_regexp_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_regexp_/formatted.sql
index d074bf0aa7..d4a40e9a92 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_regexp_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_regexp_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
$arg1 = "" || "";
$arg2 = (Unicode::ToUpper("i") ?? "") || "npu.";
$arg3 = "" || "";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_table_with_view_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_table_with_view_/formatted.sql
index aaef202ef1..6a5d9a9411 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_table_with_view_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_table_with_view_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
$x = "Input";
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_typeof_output_table_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_typeof_output_table_/formatted.sql
index ca8c80ff54..00c8c6b112 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_typeof_output_table_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_typeof_output_table_/formatted.sql
@@ -9,10 +9,12 @@ SELECT
FROM
Input
;
+
COMMIT;
$input =
PROCESS Output;
+
$c = EvaluateCode(ReprCode(FormatType(TypeOf($input))));
SELECT
@@ -25,10 +27,12 @@ SELECT
FROM
Input
;
+
COMMIT;
$input =
PROCESS Output;
+
$c = EvaluateCode(ReprCode(FormatType(TypeOf($input))));
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_unresolved_type_arg_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_unresolved_type_arg_/formatted.sql
index 9ff7bb9ec1..27b0303a02 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_unresolved_type_arg_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_unresolved_type_arg_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
$myAddSuffix = ($row, $value) -> {
$type = TypeOf($row);
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_values_output_table_subquery_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_values_output_table_subquery_/formatted.sql
index c37c8231ca..a5e25475fa 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_values_output_table_subquery_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-eval_values_output_table_subquery_/formatted.sql
@@ -6,6 +6,7 @@ $a = (
SELECT
CAST(Unicode::ToUpper("o"u) AS String) || "utpu"
);
+
$a = $a || CAST(Unicode::ToLower("T"u) AS String);
INSERT INTO $a (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-evaluate_match_type_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-evaluate_match_type_/formatted.sql
index 5f01248c78..92ba862812 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-evaluate_match_type_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-evaluate_match_type_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
$keep_only_last = ($row) -> {
$members = ListFilter(StructMembers($row), ($x) -> (FIND($x, "key") IS NOT NULL));
RETURN ChooseMembers($row, $members)
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-evaluate_pure_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-evaluate_pure_/formatted.sql
index 86f0c0292c..60d0512a25 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-evaluate_pure_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-evaluate_pure_/formatted.sql
@@ -22,6 +22,7 @@ SELECT
EvaluateExpr(CurrentUtcTimestamp()),
CurrentUtcTimestamp()
;
+
$y = Yson("{a=7u;c=[<d=%true>1;#;\"привет\";-3.4]}");
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-export_action_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-export_action_/formatted.sql
index b9b7176a8f..ae2a1828b9 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-export_action_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-export_action_/formatted.sql
@@ -2,7 +2,9 @@
/* postgres can not */
/* kikimr can not - range not supported */
PRAGMA library("lib1.sql");
+
IMPORT lib1 SYMBOLS $action;
+
DO
$action("Input")
;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-mixed_eval_typeof_world1_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-mixed_eval_typeof_world1_/formatted.sql
index ab5392bc31..cb404b3ab1 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-mixed_eval_typeof_world1_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-mixed_eval_typeof_world1_/formatted.sql
@@ -2,6 +2,7 @@
/* postgres can not */
/* custom error:Anonymous table "@Output1" must be materialized*/
USE plato;
+
$force_remove_members = ($struct, $to_remove) -> {
$remover = EvaluateCode(
LambdaCode(
@@ -50,6 +51,7 @@ DEFINE ACTION $func($input, $output) AS
;
COMMIT;
END DEFINE;
+
$exps = [('Input', 'Output1'), ('Input', 'Output2'), ('Input', 'Output3')];
EVALUATE FOR $exp_name IN $exps DO BEGIN
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-nested_action_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-nested_action_/formatted.sql
index fb42eb3a78..bf99c61a36 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-nested_action_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-nested_action_/formatted.sql
@@ -19,6 +19,7 @@ DEFINE ACTION $action($b, $c) AS
$bbb()
;
END DEFINE;
+
DO
$action(1, 2)
;
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
index 157571f7a1..12f2d0a106 100644
--- 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
@@ -6,6 +6,7 @@ $make_struct = CALLABLE (
RETURN AsStruct(5 AS lel);
}
);
+
$kekify_struct = ($struct) -> {
RETURN EvaluateCode(
FuncCode(
@@ -19,6 +20,7 @@ $kekify_struct = ($struct) -> {
)
);
};
+
$struct = AsStruct(
CALLABLE (
Callable<(String) -> Struct<kek: Int32>>,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-nested_rewrite_io_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-nested_rewrite_io_/formatted.sql
index bd399035cc..e7da103ac2 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-nested_rewrite_io_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-nested_rewrite_io_/formatted.sql
@@ -13,12 +13,14 @@ $mapping =
FROM
Input
LIMIT 1;
+
$transformer = ($type) -> {
$t = EvaluateType(ParseTypeHandle($type));
RETURN ($value) -> {
RETURN CAST($value AS $t);
};
};
+
$converter = ($row) -> {
RETURN EvaluateCode(
LambdaCode(
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-parallel_for_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-parallel_for_/formatted.sql
index 461f0b3c8b..f40290fc69 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-parallel_for_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-parallel_for_/formatted.sql
@@ -7,6 +7,7 @@ EVALUATE PARALLEL FOR $i IN [1, 2, 1, 2, 1] DO BEGIN
$i AS a
;
END DO;
+
COMMIT;
INSERT INTO Output WITH truncate
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-pass_action_as_param_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-pass_action_as_param_/formatted.sql
index 2407e05beb..79bda03fe5 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-pass_action_as_param_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-pass_action_as_param_/formatted.sql
@@ -8,6 +8,7 @@ DEFINE ACTION $dup($x) AS
$x()
;
END DEFINE;
+
DO
$dup(EMPTY_ACTION)
;
@@ -17,6 +18,7 @@ DEFINE ACTION $sel_foo() AS
"foo"
;
END DEFINE;
+
DO
$dup($sel_foo)
;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_apply_quoted_code_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_apply_quoted_code_/formatted.sql
index 92c4202ef9..07054ca186 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_apply_quoted_code_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_apply_quoted_code_/formatted.sql
@@ -3,6 +3,7 @@
$func = ($x) -> {
RETURN $x == 1;
};
+
$structApply = ($strValue, $f) -> {
$code = EvaluateCode(
LambdaCode(
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_if_select_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_if_select_/formatted.sql
index 95d2c8060b..ffe32d3d2f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_if_select_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_if_select_/formatted.sql
@@ -8,6 +8,7 @@ SELECT
FROM
Input
;
+
COMMIT;
$n = (
@@ -16,6 +17,7 @@ $n = (
FROM
@foo
);
+
$predicate = $n > 1;
IF $predicate DO BEGIN
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_type_splitmake_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_type_splitmake_/formatted.sql
index ad006bab1b..97d25cedeb 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_type_splitmake_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-runtime_type_splitmake_/formatted.sql
@@ -3,9 +3,11 @@
$formatTagged = ($x) -> {
RETURN AsStruct(FormatType($x.Base) AS Base, $x.Tag AS Tag)
};
+
$formatArgument = ($x) -> {
RETURN AsStruct(FormatType($x.Type) AS Type, $x.Name AS Name, $x.Flags AS Flags)
};
+
$formatCallable = ($x) -> {
RETURN AsStruct(
$x.OptionalArgumentsCount AS OptionalArgumentsCount,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_assumeorderby_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_assumeorderby_/formatted.sql
index 016761acbe..0ec9d1df3d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_assumeorderby_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_assumeorderby_/formatted.sql
@@ -12,6 +12,7 @@ DEFINE SUBQUERY $sub() AS
x
);
END DEFINE;
+
$sub2 = SubqueryAssumeOrderBy($sub, [("x", TRUE)]);
PROCESS $sub2();
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_extend_over_extend_for_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_extend_over_extend_for_/formatted.sql
index e92570016e..f84167c7e7 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_extend_over_extend_for_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_extend_over_extend_for_/formatted.sql
@@ -5,6 +5,7 @@ DEFINE SUBQUERY $sub($i) AS
$i AS x
;
END DEFINE;
+
$s = SubqueryExtendFor([1, 2, 3], $sub);
$s2 = SubqueryExtendFor([1, 2, 3], $sub);
$s3 = SubqueryExtend($s, $s2);
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_merge1_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_merge1_/formatted.sql
index 0f886da74c..cde8b6e515 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_merge1_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_merge1_/formatted.sql
@@ -17,15 +17,19 @@ DEFINE SUBQUERY $sub3() AS
3 AS y
;
END DEFINE;
+
$s = SubqueryExtend($sub1, $sub2);
PROCESS $s();
+
$s = SubqueryUnionAll($sub1, $sub3);
PROCESS $s();
+
$s = SubqueryMerge($sub1, $sub2);
PROCESS $s();
+
$s = SubqueryUnionMerge($sub1, $sub3);
PROCESS $s();
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_merge2_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_merge2_/formatted.sql
index 69d6a20be3..715e7c2e77 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_merge2_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_merge2_/formatted.sql
@@ -5,15 +5,19 @@ DEFINE SUBQUERY $sub($i) AS
$i AS x
;
END DEFINE;
+
$s = SubqueryExtendFor([1, 2, 3], $sub);
PROCESS $s();
+
$s = SubqueryUnionAllFor([1, 2, 3], $sub);
PROCESS $s();
+
$s = SubqueryMergeFor([1, 2, 3], $sub);
PROCESS $s();
+
$s = SubqueryUnionMergeFor([1, 2, 3], $sub);
PROCESS $s();
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_merge_evaluate_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_merge_evaluate_/formatted.sql
index d9665a480f..14b464f5c8 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_merge_evaluate_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_merge_evaluate_/formatted.sql
@@ -15,6 +15,7 @@ DEFINE SUBQUERY $sub2($i, $j?) AS
$j
;
END DEFINE;
+
$sub = EvaluateCode(If(1 > 2, QuoteCode($sub1), QuoteCode($sub2)));
$s = SubqueryExtendFor([1, 2, 3], $sub);
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_merge_nested_world_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_merge_nested_world_/formatted.sql
index 77880a8e44..5c21800f8e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_merge_nested_world_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_merge_nested_world_/formatted.sql
@@ -18,6 +18,7 @@ DEFINE SUBQUERY $s($_i) AS
EACH($t)
;
END DEFINE;
+
$extractor = SubqueryMergeFor([1], $s);
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_orderby0_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_orderby0_/formatted.sql
index 2ad524a650..1bd97dd770 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_orderby0_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_orderby0_/formatted.sql
@@ -13,9 +13,11 @@ DEFINE SUBQUERY $sub() AS
y
);
END DEFINE;
+
$sub2 = SubqueryOrderBy($sub, []);
PROCESS $sub2();
+
$sub3 = SubqueryOrderBy($sub, ListCreate(Tuple<String, Bool>));
PROCESS $sub3();
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_orderby1_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_orderby1_/formatted.sql
index f8b8d5742c..aaade477b4 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_orderby1_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_orderby1_/formatted.sql
@@ -12,6 +12,7 @@ DEFINE SUBQUERY $sub() AS
x
);
END DEFINE;
+
$sub2 = SubqueryOrderBy($sub, [("x", FALSE)]);
PROCESS $sub2();
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_orderby2_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_orderby2_/formatted.sql
index 7b934aa9d2..50db3454c8 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_orderby2_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-subquery_orderby2_/formatted.sql
@@ -13,6 +13,7 @@ DEFINE SUBQUERY $sub() AS
y
);
END DEFINE;
+
$sub2 = SubqueryOrderBy($sub, [("x", FALSE), ("y", TRUE)]);
PROCESS $sub2();
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-table_content_before_from_folder_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-table_content_before_from_folder_/formatted.sql
index 9aa6189973..a3d672546c 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-table_content_before_from_folder_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_action-table_content_before_from_folder_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
PRAGMA yt.EvaluationTableSizeLimit = "1";
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-avg_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-avg_/formatted.sql
index 8fde2f4600..5c1f7b2fca 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-avg_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-avg_/formatted.sql
@@ -16,6 +16,7 @@ SELECT
)
)
;
+
USE plato;
INSERT INTO @a
@@ -24,6 +25,7 @@ SELECT
FROM
as_table($t)
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-avg_distinct_expr_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-avg_distinct_expr_/formatted.sql
index 484ab3d61d..5ee7ca220b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-avg_distinct_expr_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-avg_distinct_expr_/formatted.sql
@@ -2,6 +2,7 @@
/* postgres can not */
$t = AsList(AsStruct(1 AS a), AsStruct(2 AS a), AsStruct(1 AS a));
$f = AGGREGATION_FACTORY("avg");
+
USE plato;
INSERT INTO @a
@@ -10,6 +11,7 @@ SELECT
FROM
as_table($t)
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-avg_if_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-avg_if_/formatted.sql
index edff214ed5..500eb0dddb 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-avg_if_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-avg_if_/formatted.sql
@@ -16,6 +16,7 @@ SELECT
)
)
;
+
USE plato;
INSERT INTO @a
@@ -24,6 +25,7 @@ SELECT
FROM
as_table($t)
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bitand_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bitand_/formatted.sql
index 93f3c4df0b..55fccdc8dd 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bitand_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bitand_/formatted.sql
@@ -16,6 +16,7 @@ SELECT
)
)
;
+
USE plato;
INSERT INTO @a
@@ -24,6 +25,7 @@ SELECT
FROM
as_table($t)
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bitor_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bitor_/formatted.sql
index ac813b8cd9..3e98603919 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bitor_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bitor_/formatted.sql
@@ -16,6 +16,7 @@ SELECT
)
)
;
+
USE plato;
INSERT INTO @a
@@ -24,6 +25,7 @@ SELECT
FROM
as_table($t)
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bitxor_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bitxor_/formatted.sql
index 08a22f19bc..ef65ca7b79 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bitxor_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bitxor_/formatted.sql
@@ -16,6 +16,7 @@ SELECT
)
)
;
+
USE plato;
INSERT INTO @a
@@ -24,6 +25,7 @@ SELECT
FROM
as_table($t)
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-booland_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-booland_/formatted.sql
index 2428a7b15b..3974f6bbbf 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-booland_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-booland_/formatted.sql
@@ -16,6 +16,7 @@ SELECT
)
)
;
+
USE plato;
INSERT INTO @a
@@ -24,6 +25,7 @@ SELECT
FROM
as_table($t)
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-boolor_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-boolor_/formatted.sql
index 596c47e77c..e6f112abdc 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-boolor_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-boolor_/formatted.sql
@@ -16,6 +16,7 @@ SELECT
)
)
;
+
USE plato;
INSERT INTO @a
@@ -24,6 +25,7 @@ SELECT
FROM
as_table($t)
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bottom_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bottom_/formatted.sql
index fbbc717a3a..c891a554d0 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bottom_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bottom_/formatted.sql
@@ -10,6 +10,7 @@ $t = AsList(
AsStruct(1 AS a),
AsStruct(9 AS a)
);
+
$f = AGGREGATION_FACTORY("bottom", 3);
SELECT
@@ -26,6 +27,7 @@ SELECT
)
)
;
+
USE plato;
INSERT INTO @a
@@ -34,6 +36,7 @@ SELECT
FROM
as_table($t)
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bottom_by_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bottom_by_/formatted.sql
index 7f321b2803..15fe84a8d2 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bottom_by_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-bottom_by_/formatted.sql
@@ -7,6 +7,7 @@ $t = AsList(
AsStruct(2 AS key, 256 AS value),
AsStruct(7 AS key, 111 AS value)
);
+
$f = AGGREGATION_FACTORY("bottomby", 3);
SELECT
@@ -23,6 +24,7 @@ SELECT
)
)
;
+
USE plato;
INSERT INTO @a
@@ -31,6 +33,7 @@ SELECT
FROM
as_table($t)
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-container_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-container_/formatted.sql
index 96899a6cb7..b374685cc2 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-container_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-container_/formatted.sql
@@ -17,6 +17,7 @@ SELECT
SELECT
ListAggregate(Nothing(ParseType("List<Int32>?")), $factory)
;
+
$factory = AGGREGATION_FACTORY("count");
SELECT
@@ -34,6 +35,7 @@ SELECT
SELECT
ListAggregate(Nothing(ParseType("List<Int32>?")), $factory)
;
+
$factory = AGGREGATION_FACTORY("sum");
SELECT
@@ -85,6 +87,7 @@ SELECT
)
)
;
+
$factory = AGGREGATION_FACTORY("count");
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-corellation_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-corellation_/formatted.sql
index 1a7fac95a5..508819acf2 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-corellation_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-corellation_/formatted.sql
@@ -16,6 +16,7 @@ SELECT
)
)
;
+
USE plato;
INSERT INTO @a
@@ -24,6 +25,7 @@ SELECT
FROM
as_table($t)
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-count_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-count_/formatted.sql
index de3f6e2132..c00440038a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-count_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-count_/formatted.sql
@@ -16,6 +16,7 @@ SELECT
)
)
;
+
USE plato;
INSERT INTO @a
@@ -24,6 +25,7 @@ SELECT
FROM
as_table($t)
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-count_if_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-count_if_/formatted.sql
index 8d5d14d959..4ff1865cb5 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-count_if_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-count_if_/formatted.sql
@@ -16,6 +16,7 @@ SELECT
)
)
;
+
USE plato;
INSERT INTO @a
@@ -24,6 +25,7 @@ SELECT
FROM
as_table($t)
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-def_value_full_table_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-def_value_full_table_/formatted.sql
index 510faed2cf..746e03ccb5 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-def_value_full_table_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-def_value_full_table_/formatted.sql
@@ -35,26 +35,34 @@ $my_table =
2 AS value1,
7 AS value2
;
+
-- Эмуляция агрегационной функции COUNT
$cnt_create = ($_item, $_parent) -> {
RETURN 1ul
};
+
$cnt_add = ($state, $_item, $_parent) -> {
RETURN 1ul + $state
};
+
$cnt_merge = ($state1, $state2) -> {
RETURN $state1 + $state2
};
+
$cnt_get_result = ($state) -> {
RETURN $state
};
+
$cnt_serialize = ($state) -> {
RETURN $state
};
+
$cnt_deserialize = ($state) -> {
RETURN $state
};
+
$cnt_default = 0l;
+
$cnt_udaf_factory = AggregationFactory(
"UDAF",
$cnt_create,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-def_value_with_keys_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-def_value_with_keys_/formatted.sql
index 392bcb56ea..0b2528d0e0 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-def_value_with_keys_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-def_value_with_keys_/formatted.sql
@@ -35,26 +35,34 @@ $my_table =
2 AS value1,
7 AS value2
;
+
-- Эмуляция агрегационной функции COUNT
$cnt_create = ($_item, $_parent) -> {
RETURN 1ul
};
+
$cnt_add = ($state, $_item, $_parent) -> {
RETURN 1ul + $state
};
+
$cnt_merge = ($state1, $state2) -> {
RETURN $state1 + $state2
};
+
$cnt_get_result = ($state) -> {
RETURN $state
};
+
$cnt_serialize = ($state) -> {
RETURN $state
};
+
$cnt_deserialize = ($state) -> {
RETURN $state
};
+
$cnt_default = 0ul;
+
$cnt_udaf_factory = AggregationFactory(
"UDAF",
$cnt_create,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-every_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-every_/formatted.sql
index c4b1f6802c..c11a320aca 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-every_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-every_/formatted.sql
@@ -16,6 +16,7 @@ SELECT
)
)
;
+
USE plato;
INSERT INTO @a
@@ -24,6 +25,7 @@ SELECT
FROM
as_table($t)
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-flatten_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-flatten_/formatted.sql
index f192c467f0..474b9e586a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-flatten_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-flatten_/formatted.sql
@@ -13,6 +13,7 @@ SELECT
ListAggregate([ListCreate(Int32), [3]], $g),
ListAggregate([[1, 2], ListCreate(Int32)], $g)
;
+
$i = AGGREGATION_FACTORY("AGGREGATE_LIST_DISTINCT");
$j = AggregateFlatten($i);
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-histogram_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-histogram_/formatted.sql
index bced8965a1..d79dd122b9 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-histogram_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-histogram_/formatted.sql
@@ -16,6 +16,7 @@ SELECT
)
)
;
+
$f = AGGREGATION_FACTORY("histogram", 5);
SELECT
@@ -31,6 +32,7 @@ SELECT
)
)
;
+
USE plato;
INSERT INTO @a
@@ -39,6 +41,7 @@ SELECT
FROM
as_table($t)
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-hll_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-hll_/formatted.sql
index 3b98c0191f..44a808f043 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-hll_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-hll_/formatted.sql
@@ -16,6 +16,7 @@ SELECT
)
)
;
+
$f = AGGREGATION_FACTORY("hll", 4);
SELECT
@@ -31,6 +32,7 @@ SELECT
)
)
;
+
USE plato;
INSERT INTO @a
@@ -39,6 +41,7 @@ SELECT
FROM
as_table($t)
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-linear_histogram_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-linear_histogram_/formatted.sql
index 300b7f0086..fb4c9692bf 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-linear_histogram_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-linear_histogram_/formatted.sql
@@ -16,6 +16,7 @@ SELECT
)
)
;
+
$f = AGGREGATION_FACTORY("linearhistogram", 10, 0.0, 1000.0);
SELECT
@@ -31,6 +32,7 @@ SELECT
)
)
;
+
USE plato;
INSERT INTO @a
@@ -39,6 +41,7 @@ SELECT
FROM
as_table($t)
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-list_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-list_/formatted.sql
index 829d12e798..0972fe8780 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-list_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-list_/formatted.sql
@@ -16,6 +16,7 @@ SELECT
)
)
;
+
$f = AGGREGATION_FACTORY("aggregate_list", length(CAST(Unicode::ToUpper("xx"u) AS String)));
SELECT
@@ -31,6 +32,7 @@ SELECT
)
)
;
+
USE plato;
INSERT INTO @a
@@ -39,6 +41,7 @@ SELECT
FROM
as_table($t)
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-log_histogram_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-log_histogram_/formatted.sql
index 46ebc870f5..73aef839cd 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-log_histogram_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-log_histogram_/formatted.sql
@@ -16,6 +16,7 @@ SELECT
)
)
;
+
$f = AGGREGATION_FACTORY("loghistogram", 10, 0.01, 1000.0);
SELECT
@@ -31,6 +32,7 @@ SELECT
)
)
;
+
USE plato;
INSERT INTO @a
@@ -39,6 +41,7 @@ SELECT
FROM
as_table($t)
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-logariphmic_histogram_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-logariphmic_histogram_/formatted.sql
index 891c9fe32c..5156bcebcb 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-logariphmic_histogram_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-logariphmic_histogram_/formatted.sql
@@ -16,6 +16,7 @@ SELECT
)
)
;
+
$f = AGGREGATION_FACTORY("logarithmichistogram", 10, 0.01, 1000.0);
SELECT
@@ -31,6 +32,7 @@ SELECT
)
)
;
+
USE plato;
INSERT INTO @a
@@ -39,6 +41,7 @@ SELECT
FROM
as_table($t)
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-max_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-max_/formatted.sql
index 4760d1f41b..ca55590064 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-max_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-max_/formatted.sql
@@ -16,6 +16,7 @@ SELECT
)
)
;
+
USE plato;
INSERT INTO @a
@@ -24,6 +25,7 @@ SELECT
FROM
as_table($t)
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-max_by_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-max_by_/formatted.sql
index db33ab3ac2..5117325f22 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-max_by_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-max_by_/formatted.sql
@@ -4,6 +4,7 @@ $t = AsList(
AsStruct(1 AS key, 200 AS value),
AsStruct(2 AS key, 100 AS value)
);
+
$f = AGGREGATION_FACTORY("maxby");
SELECT
@@ -20,6 +21,7 @@ SELECT
)
)
;
+
$f = AGGREGATION_FACTORY("maxby", 10);
SELECT
@@ -36,6 +38,7 @@ SELECT
)
)
;
+
USE plato;
INSERT INTO @a
@@ -44,6 +47,7 @@ SELECT
FROM
as_table($t)
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-median_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-median_/formatted.sql
index 3ea5b1be6e..c3b36305bf 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-median_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-median_/formatted.sql
@@ -16,6 +16,7 @@ SELECT
)
)
;
+
$f = AGGREGATION_FACTORY("percentile", 0.9);
SELECT
@@ -31,6 +32,7 @@ SELECT
)
)
;
+
USE plato;
INSERT INTO @a
@@ -39,6 +41,7 @@ SELECT
FROM
as_table($t)
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-min_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-min_/formatted.sql
index 8e2007f847..a99d3a74bd 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-min_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-min_/formatted.sql
@@ -16,6 +16,7 @@ SELECT
)
)
;
+
USE plato;
INSERT INTO @a
@@ -24,6 +25,7 @@ SELECT
FROM
as_table($t)
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-min_by_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-min_by_/formatted.sql
index 5f62f7eff1..b5496ac377 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-min_by_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-min_by_/formatted.sql
@@ -4,6 +4,7 @@ $t = AsList(
AsStruct(1 AS key, 200 AS value),
AsStruct(2 AS key, 100 AS value)
);
+
$f = AGGREGATION_FACTORY("minby");
SELECT
@@ -20,6 +21,7 @@ SELECT
)
)
;
+
$f = AGGREGATION_FACTORY("minby", 10);
SELECT
@@ -36,6 +38,7 @@ SELECT
)
)
;
+
USE plato;
INSERT INTO @a
@@ -44,6 +47,7 @@ SELECT
FROM
as_table($t)
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-mode_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-mode_/formatted.sql
index 1b6ef75cc6..39a05eca8a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-mode_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-mode_/formatted.sql
@@ -16,6 +16,7 @@ SELECT
)
)
;
+
$f = AGGREGATION_FACTORY("topfreq", 10, 20);
SELECT
@@ -31,6 +32,7 @@ SELECT
)
)
;
+
USE plato;
INSERT INTO @a
@@ -39,6 +41,7 @@ SELECT
FROM
as_table($t)
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-some_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-some_/formatted.sql
index 7c77e9c940..cd370c964c 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-some_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-some_/formatted.sql
@@ -16,6 +16,7 @@ SELECT
)
)
;
+
USE plato;
INSERT INTO @a
@@ -24,6 +25,7 @@ SELECT
FROM
as_table($t)
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-stddev_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-stddev_/formatted.sql
index 20d5789abb..cef7b28ba6 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-stddev_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-stddev_/formatted.sql
@@ -16,6 +16,7 @@ SELECT
)
)
;
+
USE plato;
INSERT INTO @a
@@ -24,6 +25,7 @@ SELECT
FROM
as_table($t)
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-sum_if_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-sum_if_/formatted.sql
index f5877a5016..be7afbe4df 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-sum_if_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-sum_if_/formatted.sql
@@ -16,6 +16,7 @@ SELECT
)
)
;
+
USE plato;
INSERT INTO @a
@@ -24,6 +25,7 @@ SELECT
FROM
as_table($t)
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-top_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-top_/formatted.sql
index 0f0ec8060d..d53af37f16 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-top_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-top_/formatted.sql
@@ -10,6 +10,7 @@ $t = AsList(
AsStruct(1 AS a),
AsStruct(9 AS a)
);
+
$f = AGGREGATION_FACTORY("top", 3);
SELECT
@@ -26,6 +27,7 @@ SELECT
)
)
;
+
USE plato;
INSERT INTO @a
@@ -34,6 +36,7 @@ SELECT
FROM
as_table($t)
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-top_by_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-top_by_/formatted.sql
index 30c3ce93df..2fe4606f3a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-top_by_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-top_by_/formatted.sql
@@ -7,6 +7,7 @@ $t = AsList(
AsStruct(2 AS key, 256 AS value),
AsStruct(7 AS key, 111 AS value)
);
+
$f = AGGREGATION_FACTORY("topby", 3);
SELECT
@@ -23,6 +24,7 @@ SELECT
)
)
;
+
USE plato;
INSERT INTO @a
@@ -31,6 +33,7 @@ SELECT
FROM
as_table($t)
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-udaf_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-udaf_/formatted.sql
index 759c0417e8..bc64c4914e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-udaf_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-udaf_/formatted.sql
@@ -4,21 +4,27 @@
$create = ($_item, $_parent) -> {
RETURN 1
};
+
$add = ($state, $_item, $_parent) -> {
RETURN 1 + $state
};
+
$merge = ($state1, $state2) -> {
RETURN $state1 + $state2
};
+
$get_result = ($state) -> {
RETURN $state
};
+
$serialize = ($state) -> {
RETURN $state
};
+
$deserialize = ($state) -> {
RETURN $state
};
+
$default = 0;
$f = AGGREGATION_FACTORY("udaf", $create, $add, $merge, $get_result, $serialize, $deserialize, $default);
$t = AsList(AsStruct(1 AS a), AsStruct(2 AS a));
@@ -36,6 +42,7 @@ SELECT
)
)
;
+
$t = AsList(AsStruct(1 / 0 AS a), AsStruct(2 / 0 AS a));
SELECT
@@ -51,6 +58,7 @@ SELECT
)
)
;
+
USE plato;
INSERT INTO @a
@@ -59,6 +67,7 @@ SELECT
FROM
as_table($t)
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-udaf_distinct_expr_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-udaf_distinct_expr_/formatted.sql
index a6bb9bfc5a..bbfc74ca88 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-udaf_distinct_expr_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-udaf_distinct_expr_/formatted.sql
@@ -4,24 +4,31 @@
$create = ($_item, $_parent) -> {
RETURN 1
};
+
$add = ($state, $_item, $_parent) -> {
RETURN 1 + $state
};
+
$merge = ($state1, $state2) -> {
RETURN $state1 + $state2
};
+
$get_result = ($state) -> {
RETURN $state
};
+
$serialize = ($state) -> {
RETURN $state
};
+
$deserialize = ($state) -> {
RETURN $state
};
+
$default = 0;
$f = AGGREGATION_FACTORY("udaf", $create, $add, $merge, $get_result, $serialize, $deserialize, $default);
$t = AsList(AsStruct(1 AS a), AsStruct(2 AS a), AsStruct(1 AS a));
+
USE plato;
INSERT INTO @a
@@ -30,6 +37,7 @@ SELECT
FROM
as_table($t)
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-udaf_in_udaf_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-udaf_in_udaf_/formatted.sql
index 8b63cedbb6..f648394aea 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-udaf_in_udaf_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-udaf_in_udaf_/formatted.sql
@@ -6,9 +6,11 @@ $merge_dicts = ($dict1, $dict2) -> {
}
)
};
+
$create_single_item_dict = ($item, $_parent) -> {
RETURN AsDict(AsTuple($item, 1))
};
+
$count_values = AGGREGATION_FACTORY(
"UDAF",
$create_single_item_dict,
@@ -17,18 +19,22 @@ $count_values = AGGREGATION_FACTORY(
},
$merge_dicts
);
+
$create_dict_from_list = ($list, $_parent) -> {
RETURN ListAggregate($list, $count_values)
};
+
$add_list_to_dict = ($dict, $list, $parent) -> {
RETURN $merge_dicts($create_dict_from_list($list, $parent), $dict)
};
+
$count_list_values = AGGREGATION_FACTORY(
"UDAF",
$create_dict_from_list,
$add_list_to_dict,
$merge_dicts
);
+
$test_data = AsList(AsList(1, 2), AsList(3, 2), AsList(3, 3), AsList(1, 3), AsList(3, 1), AsList(2, 2));
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-variance_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-variance_/formatted.sql
index f8a1b2a8aa..d910dd7cb3 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-variance_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggr_factory-variance_/formatted.sql
@@ -16,6 +16,7 @@ SELECT
)
)
;
+
USE plato;
INSERT INTO @a
@@ -24,6 +25,7 @@ SELECT
FROM
as_table($t)
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-agg_phases_table1_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-agg_phases_table1_/formatted.sql
index 8fe289a485..15f6991d54 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-agg_phases_table1_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-agg_phases_table1_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
PRAGMA EmitAggApply;
PRAGMA yt.UseAggPhases = "1";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-agg_phases_table2_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-agg_phases_table2_/formatted.sql
index 930d7d4f2d..44e675df71 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-agg_phases_table2_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-agg_phases_table2_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
PRAGMA EmitAggApply;
PRAGMA yt.UseAggPhases = "1";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-agg_phases_table3_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-agg_phases_table3_/formatted.sql
index de4a1acbb4..20dc458047 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-agg_phases_table3_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-agg_phases_table3_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
PRAGMA EmitAggApply;
PRAGMA yt.UseAggPhases = "1";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_by_column_lookup_in_const_dict_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_by_column_lookup_in_const_dict_/formatted.sql
index 483e66f137..1461d21945 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_by_column_lookup_in_const_dict_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_by_column_lookup_in_const_dict_/formatted.sql
@@ -1,5 +1,6 @@
/* syntax version 1 */
USE plato;
+
$dict = AsDict(("800", "foo"));
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_distinct_list_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_distinct_list_/formatted.sql
index a38d68001b..c1b7264c18 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_distinct_list_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_distinct_list_/formatted.sql
@@ -12,6 +12,7 @@ UNION ALL
SELECT
AsList(1, 2) AS x
;
+
COMMIT;
SELECT
@@ -51,6 +52,7 @@ SELECT
AsList(1, 2) AS x,
AsList(5) AS y
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_list_in_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_list_in_key_/formatted.sql
index 01bbdaf32b..17c5cf568d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_list_in_key_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_list_in_key_/formatted.sql
@@ -15,6 +15,7 @@ SELECT
AsList(1, 2) AS x,
3 AS y
;
+
COMMIT;
SELECT
@@ -59,6 +60,7 @@ SELECT
AsList(5) AS y,
6 AS z
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_with_lambda_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_with_lambda_/formatted.sql
index f2f8456ada..d9571ad31a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_with_lambda_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_with_lambda_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
$empty = ($list) -> {
RETURN ListCreate(TypeOf($list[0]));
};
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_with_lambda_inside_avg_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_with_lambda_inside_avg_/formatted.sql
index 02f014f451..68927d33b2 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_with_lambda_inside_avg_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregate_with_lambda_inside_avg_/formatted.sql
@@ -1,9 +1,11 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
$cast_to_double = ($column) -> {
RETURN CAST($column AS Double);
};
+
$column_name = 'key';
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregation_with_named_node_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregation_with_named_node_/formatted.sql
index e311215032..cebc0be9be 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregation_with_named_node_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-aggregation_with_named_node_/formatted.sql
@@ -7,6 +7,7 @@ $data = (
FROM
plato.Input
);
+
$quant = 0.1;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_extended_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_extended_/formatted.sql
index ace50faabb..ecb55f87ee 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_extended_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_extended_/formatted.sql
@@ -2,6 +2,7 @@
/* postgres can not */
$init = ($row) -> (AsStruct($row.ts ?? 0 AS value, 1 AS count));
$calculate = ($_row, $state) -> ($state.value);
+
-- split partition into two-element grooups, make session key to be cumulative sum of ts from partition start
$update = ($row, $state) -> {
$state = AsStruct($state.count + 1 AS count, $state.value AS value);
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_extended_subset_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_extended_subset_/formatted.sql
index 5f6f14e628..894d699830 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_extended_subset_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_extended_subset_/formatted.sql
@@ -2,6 +2,7 @@
/* postgres can not */
$init = ($row) -> (AsStruct($row.ts ?? 0 AS value, 1 AS count));
$calculate = ($_row, $state) -> ($state.value);
+
-- split partition into two-element grooups, make session key to be cumulative sum of ts from partition start
$update = ($row, $state) -> {
$state = AsStruct($state.count + 1 AS count, $state.value AS value);
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_extended_tuple_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_extended_tuple_/formatted.sql
index ea47f06446..54f78efc29 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_extended_tuple_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_by_session_extended_tuple_/formatted.sql
@@ -2,6 +2,7 @@
/* syntax version 1 */
$timeout = 60 * 30;
$init = ($row) -> (AsTuple($row.unixtime, $row.unixtime, $row.video_content_id));
+
$update = ($row, $state) -> {
$is_end_session = (($row.unixtime - $state.1) >= $timeout) OR ($row.video_content_id IS NOT NULL AND $row.video_content_id != ($state.2 ?? "-")) ?? FALSE;
$new_state = AsTuple(
@@ -15,9 +16,11 @@ $update = ($row, $state) -> {
);
RETURN AsTuple($is_end_session, $new_state);
};
+
$calculate = ($row, $state) -> (
AsTuple($row.unixtime, $state.2)
);
+
$source = [
<|
vsid: "v",
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_compact_sorted_with_diff_order_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_compact_sorted_with_diff_order_/formatted.sql
index 491385a0e6..ece7551fbc 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_compact_sorted_with_diff_order_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-group_compact_sorted_with_diff_order_/formatted.sql
@@ -33,6 +33,7 @@ ORDER BY
value,
subkey
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-native_desc_group_compact_by_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-native_desc_group_compact_by_/formatted.sql
index 2ab648428d..8a857d81a7 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-native_desc_group_compact_by_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_aggregate-native_desc_group_compact_by_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
PRAGMA yt.UseNativeDescSort;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_ansi_idents-inplace_yql_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_ansi_idents-inplace_yql_/formatted.sql
index 45eab604f7..00bc5d81b3 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_ansi_idents-inplace_yql_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_ansi_idents-inplace_yql_/formatted.sql
@@ -2,6 +2,7 @@
/* syntax version 1 */
/* postgres can not */
PRAGMA warning("disable", "4510");
+
$foo = "YQL"::'(lambda ''(item) (Concat (String ''"foo\''") item))';
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-common_type_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-common_type_/formatted.sql
index 268987d5ab..8793d59ed9 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-common_type_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-common_type_/formatted.sql
@@ -51,6 +51,7 @@ SELECT
SELECT
[unwrap(CAST(1 AS interval)), unwrap(CAST(-1 AS interval64))]
;
+
$datetime_values = [$date_val, $date32_val, $datetime_val, $datetime64_val, $timestamp_val, $timestamp64_val];
$interval_values = [$interval_val, $interval64_val];
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-explicit_cast_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-explicit_cast_/formatted.sql
index d1b7557e5e..005042d7c8 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-explicit_cast_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-explicit_cast_/formatted.sql
@@ -39,6 +39,7 @@ SELECT
CAST($datetime64_min AS date32),
CAST($datetime64_max AS date32)
;
+
$date_max_value = 49673l;
$date_max = unwrap(CAST($date_max_value - 1 AS date));
$datetime_max = unwrap(CAST($date_max_value * 86400 - 1 AS datetime));
@@ -64,6 +65,7 @@ SELECT
CAST($interval_min AS interval64),
CAST($interval_max AS interval64)
;
+
$date32_val = unwrap(CAST($date_max_value - 1 AS date32));
$datetime64_val = unwrap(CAST($date_max_value * 86400 - 1 AS datetime64));
$timestamp64_val = unwrap(CAST($date_max_value * 86400 * 1000000 - 1 AS timestamp64));
@@ -103,6 +105,7 @@ SELECT
CAST($timestamp64_minus1 AS datetime),
CAST($timestamp64_minus1 AS timestamp)
;
+
-- bigdate to narrow out of range
$date32_big_val = unwrap(CAST($date_max_value AS date32));
$datetime64_big_val = unwrap(CAST($date_max_value * 86400 AS datetime64));
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-implicit_cast_callable_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-implicit_cast_callable_/formatted.sql
index 59d9fdd630..66a9ac8e6f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-implicit_cast_callable_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-implicit_cast_callable_/formatted.sql
@@ -1,8 +1,10 @@
/* postgres can not */
USE plato;
+
$identity = ($x) -> {
RETURN $x
};
+
$idDate32 = CALLABLE (Callable<(date32) -> date32>, $identity);
$idDatetime64 = CALLABLE (Callable<(datetime64) -> datetime64>, $identity);
$idTimestamp64 = CALLABLE (Callable<(timestamp64) -> timestamp64>, $identity);
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-misc_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-misc_/formatted.sql
index 9b2f7dc7c3..7e31836d8b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-misc_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-misc_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA warning("disable", "4510");
+
$date32_min = unwrap(CAST(-53375809 AS date32));
$date32_max = unwrap(CAST(53375807 AS date32));
$datetime64_min = unwrap(CAST(-4611669897600 AS datetime64));
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-presort_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-presort_/formatted.sql
index b67e0b1d9c..5589dba8bc 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-presort_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-presort_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA warning("disable", "4510");
+
$wa1 = Date32("1900-01-01");
$wd1 = Datetime64("1900-01-01T02:03:04Z");
$wt1 = Timestamp64("1900-01-01T02:03:04.567891Z");
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-round_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-round_/formatted.sql
index cf75cb0f93..1325db32c0 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-round_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-round_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA warning("disable", "4510");
+
$date_max_value = 49673l;
$date_max = unwrap(CAST($date_max_value - 1 AS date));
$datetime_max = unwrap(CAST($date_max_value * 86400 - 1 AS datetime));
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-table_io_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-table_io_/formatted.sql
index c162fc9cf1..f84bc923bd 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-table_io_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-table_io_/formatted.sql
@@ -19,6 +19,7 @@ WHERE
ORDER BY
row
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-table_yt_key_filter_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-table_yt_key_filter_/formatted.sql
index 3eb497abb8..ed1a086ee0 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-table_yt_key_filter_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-table_yt_key_filter_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* multirun can not */
USE plato;
+
PRAGMA yt.UseNewPredicateExtraction;
INSERT INTO OutDate32
@@ -38,6 +39,7 @@ FROM
ORDER BY
key
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-table_yt_native_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-table_yt_native_/formatted.sql
index 9d457be456..528182bb51 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-table_yt_native_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-table_yt_native_/formatted.sql
@@ -9,6 +9,7 @@ SELECT
timestamp64('1969-12-31T0:0:0Z') AS ts64,
interval64('P65536D') AS i64
;
+
COMMIT;
INSERT INTO Output
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-tz_table_fill_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-tz_table_fill_/formatted.sql
index 1203b6887b..9d8fb34840 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-tz_table_fill_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-tz_table_fill_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
$waz = TzDate32("1900-01-01,Europe/Moscow");
$wdz = TzDatetime64("1900-01-01T02:03:04,Europe/Moscow");
$wtz = TzTimestamp64("1900-01-01T02:03:04.567891,Europe/Moscow");
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-tz_table_yt_key_filter_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-tz_table_yt_key_filter_/formatted.sql
index b3e6f7e2c7..e681d0d2e9 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-tz_table_yt_key_filter_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_bigdate-tz_table_yt_key_filter_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* multirun can not */
USE plato;
+
PRAGMA yt.UseNewPredicateExtraction;
INSERT INTO OutTzDate32
@@ -38,6 +39,7 @@ FROM
ORDER BY
key
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-anon_table_binding_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-anon_table_binding_/formatted.sql
index 55f7243537..7c27b89f79 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-anon_table_binding_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-anon_table_binding_/formatted.sql
@@ -1,12 +1,14 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
$c = "cccc";
INSERT INTO @$c
SELECT
1 AS x
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-compact_named_exprs_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-compact_named_exprs_/formatted.sql
index 37a390f9bf..d5c36492f7 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-compact_named_exprs_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-compact_named_exprs_/formatted.sql
@@ -1,5 +1,6 @@
/* yt can not */
PRAGMA CompactNamedExprs;
+
$foo = 1 + 2;
$a, $b = AsTuple(1 + 3, 2 + 5);
$l = ($x) -> ($x + $foo);
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-compact_named_subq_actions_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-compact_named_subq_actions_/formatted.sql
index a9fd175957..362491866d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-compact_named_subq_actions_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-compact_named_subq_actions_/formatted.sql
@@ -12,6 +12,7 @@ DEFINE SUBQUERY $sub1() AS
$src
;
END DEFINE;
+
$foo = 1 + 2;
DEFINE SUBQUERY $sub2($sub, $extra) AS
@@ -50,15 +51,19 @@ DEFINE ACTION $hello_world($sub, $name, $suffix?) AS
$sub()
;
END DEFINE;
+
DO
EMPTY_ACTION()
;
+
DO
$hello_world($sub1, NULL)
;
+
DO
$hello_world($sub1, NULL, "John")
;
+
DO
$hello_world($sub1, NULL, "Earth")
;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-compact_named_with_subq_contexts_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-compact_named_with_subq_contexts_/formatted.sql
index 70807c1eed..27af67ab72 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-compact_named_with_subq_contexts_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-compact_named_with_subq_contexts_/formatted.sql
@@ -5,6 +5,7 @@ $a = (
SELECT
CAST(Unicode::ToUpper("o"u) AS String) || "utpu"
);
+
$b = $a || CAST(Unicode::ToLower("T"u) AS String);
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-drop_binding_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-drop_binding_/formatted.sql
index 4d3c9c8c95..21aadccfd6 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-drop_binding_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-drop_binding_/formatted.sql
@@ -2,5 +2,7 @@
/* postgres can not */
/* kikimr can not - can't drop non-existent table */
USE plato;
+
$a = "Output";
+
DROP TABLE $a;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-insert_binding_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-insert_binding_/formatted.sql
index 2bcda654a0..f2e5349905 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-insert_binding_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-insert_binding_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
$a = "Output";
INSERT INTO $a
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_concat_binding_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_concat_binding_/formatted.sql
index 44a31f1d7c..26b8de1a03 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_concat_binding_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_concat_binding_/formatted.sql
@@ -7,7 +7,9 @@ SELECT
FROM
plato.concat($a, $a)
;
+
USE plato;
+
$a = "Input";
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_concat_strict_binding_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_concat_strict_binding_/formatted.sql
index cbbc9638a8..1441899c77 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_concat_strict_binding_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_concat_strict_binding_/formatted.sql
@@ -7,7 +7,9 @@ SELECT
FROM
plato.concat_strict($a, $a)
;
+
USE plato;
+
$a = "Input";
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_filter_binding_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_filter_binding_/formatted.sql
index 9524349198..0525e585bd 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_filter_binding_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_filter_binding_/formatted.sql
@@ -2,9 +2,11 @@
/* postgres can not */
/* kikimr can not - range not supported */
$a = "";
+
$b = ($_item) -> {
RETURN TRUE;
};
+
$c = "";
$d = "";
@@ -13,10 +15,13 @@ SELECT
FROM
plato.filter($a, $b, $c, $d)
;
+
$a = "";
+
$b = ($_item) -> {
RETURN TRUE;
};
+
$c = "";
$d = "raw";
@@ -25,10 +30,13 @@ SELECT
FROM
plato.filter($a, $b, $c, $d)
;
+
USE plato;
+
$b = ($_item) -> {
RETURN TRUE;
};
+
$c = "";
$d = "";
@@ -37,10 +45,13 @@ SELECT
FROM
filter($a, $b, $c, $d)
;
+
$a = "";
+
$b = ($_item) -> {
RETURN TRUE;
};
+
$c = "";
$d = "raw";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_filter_strict_binding_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_filter_strict_binding_/formatted.sql
index 05c6fd0a07..d8923894f6 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_filter_strict_binding_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_filter_strict_binding_/formatted.sql
@@ -2,9 +2,11 @@
/* postgres can not */
/* kikimr can not - range not supported */
$a = "";
+
$b = ($_item) -> {
RETURN TRUE;
};
+
$c = "";
$d = "";
@@ -13,10 +15,13 @@ SELECT
FROM
plato.filter_strict($a, $b, $c, $d)
;
+
$a = "";
+
$b = ($_item) -> {
RETURN TRUE;
};
+
$c = "";
$d = "raw";
@@ -25,11 +30,15 @@ SELECT
FROM
plato.filter_strict($a, $b, $c, $d)
;
+
USE plato;
+
$a = "";
+
$b = ($_item) -> {
RETURN TRUE;
};
+
$c = "";
$d = "";
@@ -38,10 +47,13 @@ SELECT
FROM
filter_strict($a, $b, $c, $d)
;
+
$a = "";
+
$b = ($_item) -> {
RETURN TRUE;
};
+
$c = "";
$d = "raw";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_from_binding_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_from_binding_/formatted.sql
index bd8655eaad..98d8560cec 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_from_binding_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_from_binding_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
$x = "Input";
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_from_binding_inferscheme_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_from_binding_inferscheme_/formatted.sql
index 8d4f2e161c..25374bc24a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_from_binding_inferscheme_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_from_binding_inferscheme_/formatted.sql
@@ -1,8 +1,10 @@
/* syntax version 1 */
/* kikimr can not */
PRAGMA yt.InferSchema;
+
/* postgres can not */
USE plato;
+
$x = "Input";
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_range_binding_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_range_binding_/formatted.sql
index 778a0901cd..59a095e9c2 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_range_binding_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_range_binding_/formatted.sql
@@ -12,6 +12,7 @@ SELECT
FROM
plato.range($a, $b, $c, $d, $e)
;
+
$a = "";
$b = "Inp";
$c = "Input1";
@@ -23,6 +24,7 @@ SELECT
FROM
plato.range($a, $b, $c, $d, $e)
;
+
$a = "";
$b = "Inp";
$c = "Input2";
@@ -34,7 +36,9 @@ SELECT
FROM
plato.range($a, $b, $c, $d, $e)
;
+
USE plato;
+
$a = "";
$b = "Input";
$c = "Input";
@@ -46,6 +50,7 @@ SELECT
FROM
range($a, $b, $c, $d, $e)
;
+
$a = "";
$b = "Inp";
$c = "Input1";
@@ -57,6 +62,7 @@ SELECT
FROM
range($a, $b, $c, $d, $e)
;
+
$a = "";
$b = "Inp";
$c = "Input2";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_range_strict_binding_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_range_strict_binding_/formatted.sql
index 1471e6afe3..adbc661cf3 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_range_strict_binding_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_range_strict_binding_/formatted.sql
@@ -12,6 +12,7 @@ SELECT
FROM
plato.range_strict($a, $b, $c, $d, $e)
;
+
$a = "";
$b = "Inp";
$c = "Input1";
@@ -23,6 +24,7 @@ SELECT
FROM
plato.range_strict($a, $b, $c, $d, $e)
;
+
$a = "";
$b = "Inp";
$c = "Input2";
@@ -34,7 +36,9 @@ SELECT
FROM
plato.range_strict($a, $b, $c, $d, $e)
;
+
USE plato;
+
$a = "";
$b = "Input";
$c = "Input";
@@ -46,6 +50,7 @@ SELECT
FROM
range_strict($a, $b, $c, $d, $e)
;
+
$a = "";
$b = "Inp";
$c = "Input1";
@@ -57,6 +62,7 @@ SELECT
FROM
range_strict($a, $b, $c, $d, $e)
;
+
$a = "";
$b = "Inp";
$c = "Input2";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_regexp_binding_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_regexp_binding_/formatted.sql
index 7f884ff3d3..26d91a86ad 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_regexp_binding_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_regexp_binding_/formatted.sql
@@ -11,7 +11,9 @@ SELECT
FROM
plato.regexp($a, $b, $c, $d)
;
+
USE plato;
+
$a = "";
$b = "Input";
$c = "";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_regexp_strict_binding_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_regexp_strict_binding_/formatted.sql
index cbc998bcaa..c8ca222dc2 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_regexp_strict_binding_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-table_regexp_strict_binding_/formatted.sql
@@ -11,7 +11,9 @@ SELECT
FROM
plato.regexp_strict($a, $b, $c, $d)
;
+
USE plato;
+
$a = "";
$b = "Input";
$c = "";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-tie_scalar_context_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-tie_scalar_context_/formatted.sql
index 47d53f7750..9112def280 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-tie_scalar_context_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_binding-tie_scalar_context_/formatted.sql
@@ -15,6 +15,7 @@ $ids = (
"2" AS id
)
);
+
$first_ids, $second_ids = $foo(unwrap($ids));
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-block_input_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-block_input_/formatted.sql
index 603f59939e..734adaa1f8 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-block_input_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-block_input_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA yt.JobBlockInput;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-block_input_sys_columns_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-block_input_sys_columns_/formatted.sql
index e08722621a..2e20cf5a89 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-block_input_sys_columns_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-block_input_sys_columns_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA yt.JobBlockInput;
$a = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-block_input_various_types_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-block_input_various_types_/formatted.sql
index 864d93d247..1a5992dcab 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-block_input_various_types_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-block_input_various_types_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA yt.JobBlockInput;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-coalesce_complex_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-coalesce_complex_/formatted.sql
index ac48223f7a..82d8aca00a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-coalesce_complex_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-coalesce_complex_/formatted.sql
@@ -1,10 +1,12 @@
USE plato;
+
$strings = [
<|key: Just(Just("foo")), subkey: Just("bar"), value: 1|>,
<|key: Just(Nothing(String?)), subkey: Just("two"), value: 2|>,
<|key: Nothing(String??), subkey: Just("three"), value: 3|>,
<|key: Nothing(String??), subkey: Nothing(String?), value: 4|>,
];
+
$tuples = [
<|key: Just(Just(AsTuple(1, 2))), subkey: Just(AsTuple(3, 4)), value: 1|>,
<|key: Just(Nothing(Tuple<Int, Int>?)), subkey: Just(AsTuple(4, 5)), value: 2|>,
@@ -25,6 +27,7 @@ SELECT
FROM
as_table($tuples)
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-combine_all_pg_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-combine_all_pg_/formatted.sql
index 9a975dbfda..0d98aa2dc8 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-combine_all_pg_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-combine_all_pg_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA yt.UsePartitionsByKeysForFinalAgg = "false";
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-combine_all_pg_filter_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-combine_all_pg_filter_/formatted.sql
index 0a6682ac7f..ebccf3ad28 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-combine_all_pg_filter_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-combine_all_pg_filter_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA yt.UsePartitionsByKeysForFinalAgg = "false";
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-combine_hashed_pg_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-combine_hashed_pg_/formatted.sql
index f825a5941d..fa195a5876 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-combine_hashed_pg_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-combine_hashed_pg_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA yt.UsePartitionsByKeysForFinalAgg = "false";
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-compare_dates_floats_bools_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-compare_dates_floats_bools_/formatted.sql
index cf0529af6d..1acffaab84 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-compare_dates_floats_bools_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-compare_dates_floats_bools_/formatted.sql
@@ -18,6 +18,7 @@ SELECT
Interval('PT1M') AS i1,
Interval('PT1H') AS i2,
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_add_interval_scalar_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_add_interval_scalar_/formatted.sql
index b818a1f50c..56e0c99310 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_add_interval_scalar_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_add_interval_scalar_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA yt.DisableOptimizers = "OutHorizontalJoin,HorizontalJoin,MultiHorizontalJoin,FuseMultiOutsWithOuterMaps";
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_equals_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_equals_/formatted.sql
index 81acba3187..4cd7428291 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_equals_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_equals_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA yt.DisableOptimizers = "OutHorizontalJoin,HorizontalJoin,MultiHorizontalJoin,FuseMultiOutsWithOuterMaps";
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_equals_scalar_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_equals_scalar_/formatted.sql
index 6aa157b08c..fb5e65d167 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_equals_scalar_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_equals_scalar_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA yt.DisableOptimizers = "OutHorizontalJoin,HorizontalJoin,MultiHorizontalJoin,FuseMultiOutsWithOuterMaps";
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_greater_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_greater_/formatted.sql
index 9c7b3790de..d213b36c11 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_greater_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_greater_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA yt.DisableOptimizers = "OutHorizontalJoin,HorizontalJoin,MultiHorizontalJoin,FuseMultiOutsWithOuterMaps";
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_greater_or_equal_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_greater_or_equal_/formatted.sql
index 367c57bd1f..2524f4db9c 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_greater_or_equal_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_greater_or_equal_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA yt.DisableOptimizers = "OutHorizontalJoin,HorizontalJoin,MultiHorizontalJoin,FuseMultiOutsWithOuterMaps";
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_greater_or_equal_scalar_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_greater_or_equal_scalar_/formatted.sql
index 0561330506..bee5d330a8 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_greater_or_equal_scalar_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_greater_or_equal_scalar_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA yt.DisableOptimizers = "OutHorizontalJoin,HorizontalJoin,MultiHorizontalJoin,FuseMultiOutsWithOuterMaps";
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_greater_scalar_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_greater_scalar_/formatted.sql
index 8605e1f50d..228b2a3565 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_greater_scalar_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_greater_scalar_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA yt.DisableOptimizers = "OutHorizontalJoin,HorizontalJoin,MultiHorizontalJoin,FuseMultiOutsWithOuterMaps";
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_group_by_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_group_by_/formatted.sql
index c3aec71416..f3354176f2 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_group_by_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_group_by_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA yt.UseNativeDescSort;
PRAGMA yt.UsePartitionsByKeysForFinalAgg = "false";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_less_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_less_/formatted.sql
index caeeed399f..640d23ce86 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_less_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_less_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA yt.DisableOptimizers = "OutHorizontalJoin,HorizontalJoin,MultiHorizontalJoin,FuseMultiOutsWithOuterMaps";
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_less_or_equal_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_less_or_equal_/formatted.sql
index ad801b49a4..1ca25354b5 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_less_or_equal_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_less_or_equal_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA yt.DisableOptimizers = "OutHorizontalJoin,HorizontalJoin,MultiHorizontalJoin,FuseMultiOutsWithOuterMaps";
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_less_or_equal_scalar_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_less_or_equal_scalar_/formatted.sql
index 4eb9243987..9fbeab708e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_less_or_equal_scalar_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_less_or_equal_scalar_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA yt.DisableOptimizers = "OutHorizontalJoin,HorizontalJoin,MultiHorizontalJoin,FuseMultiOutsWithOuterMaps";
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_less_scalar_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_less_scalar_/formatted.sql
index 910374e5f7..d3d767e866 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_less_scalar_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_less_scalar_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA yt.DisableOptimizers = "OutHorizontalJoin,HorizontalJoin,MultiHorizontalJoin,FuseMultiOutsWithOuterMaps";
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_not_equals_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_not_equals_/formatted.sql
index 4600057752..afaf15c2ad 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_not_equals_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_not_equals_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA yt.DisableOptimizers = "OutHorizontalJoin,HorizontalJoin,MultiHorizontalJoin,FuseMultiOutsWithOuterMaps";
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_not_equals_scalar_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_not_equals_scalar_/formatted.sql
index 62e860d3d4..0b753f8c1d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_not_equals_scalar_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_not_equals_scalar_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA yt.DisableOptimizers = "OutHorizontalJoin,HorizontalJoin,MultiHorizontalJoin,FuseMultiOutsWithOuterMaps";
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_sub_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_sub_/formatted.sql
index 8dfd066d6b..9d6cbb76db 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_sub_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_sub_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA yt.DisableOptimizers = "OutHorizontalJoin,HorizontalJoin,MultiHorizontalJoin,FuseMultiOutsWithOuterMaps";
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_sub_interval_scalar_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_sub_interval_scalar_/formatted.sql
index c1342f188a..dbe11b343d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_sub_interval_scalar_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_sub_interval_scalar_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA yt.DisableOptimizers = "OutHorizontalJoin,HorizontalJoin,MultiHorizontalJoin,FuseMultiOutsWithOuterMaps";
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_sub_scalar_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_sub_scalar_/formatted.sql
index 525520f326..dbe46f0292 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_sub_scalar_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_sub_scalar_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA yt.DisableOptimizers = "OutHorizontalJoin,HorizontalJoin,MultiHorizontalJoin,FuseMultiOutsWithOuterMaps";
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_top_sort_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_top_sort_/formatted.sql
index f652014834..59c5b0b362 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_top_sort_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-date_top_sort_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA yt.UseNativeDescSort;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-distinct_mixed_all_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-distinct_mixed_all_/formatted.sql
index c65b38192a..8688fd664e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-distinct_mixed_all_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-distinct_mixed_all_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA yt.UsePartitionsByKeysForFinalAgg = "false";
+
USE plato;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-distinct_mixed_keys_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-distinct_mixed_keys_/formatted.sql
index 9e5fb9e4b4..76f4e63780 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-distinct_mixed_keys_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-distinct_mixed_keys_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA yt.UsePartitionsByKeysForFinalAgg = "false";
+
USE plato;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-distinct_opt_state_all_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-distinct_opt_state_all_/formatted.sql
index 5fe9b59df0..74ff91d486 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-distinct_opt_state_all_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-distinct_opt_state_all_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA yt.UsePartitionsByKeysForFinalAgg = "false";
+
USE plato;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-distinct_opt_state_keys_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-distinct_opt_state_keys_/formatted.sql
index b3775cd060..6a68b53ed4 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-distinct_opt_state_keys_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-distinct_opt_state_keys_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA yt.UsePartitionsByKeysForFinalAgg = "false";
+
USE plato;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-distinct_pure_all_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-distinct_pure_all_/formatted.sql
index ba66b73867..d3b52b5248 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-distinct_pure_all_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-distinct_pure_all_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA yt.UsePartitionsByKeysForFinalAgg = "false";
+
USE plato;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-distinct_pure_keys_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-distinct_pure_keys_/formatted.sql
index fee6d6b2da..11c9ce4019 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-distinct_pure_keys_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-distinct_pure_keys_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA yt.UsePartitionsByKeysForFinalAgg = "false";
+
USE plato;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-finalize_hashed_keys_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-finalize_hashed_keys_/formatted.sql
index 13ec5dbb2f..29656797b4 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-finalize_hashed_keys_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-finalize_hashed_keys_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA yt.UsePartitionsByKeysForFinalAgg = "false";
+
USE plato;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-interval_add_date_scalar_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-interval_add_date_scalar_/formatted.sql
index a0e4269cf2..dca6688d54 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-interval_add_date_scalar_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-interval_add_date_scalar_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA yt.DisableOptimizers = "OutHorizontalJoin,HorizontalJoin,MultiHorizontalJoin,FuseMultiOutsWithOuterMaps";
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-lazy_nonstrict_basic_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-lazy_nonstrict_basic_/formatted.sql
index b118d33677..a3d29787e2 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-lazy_nonstrict_basic_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-lazy_nonstrict_basic_/formatted.sql
@@ -1,5 +1,7 @@
USE plato;
+
PRAGMA yt.DisableOptimizers = "OutHorizontalJoin,HorizontalJoin,MultiHorizontalJoin";
+
$ns_tolower = ($x) -> (AssumeNonStrict(String::AsciiToLower($x)));
$ns_toupper = ($x) -> (AssumeNonStrict(String::AsciiToUpper($x)));
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-minmax_strings_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-minmax_strings_/formatted.sql
index aefd902c1c..6de209e92e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-minmax_strings_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-minmax_strings_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA yt.UsePartitionsByKeysForFinalAgg = "false";
+
USE plato;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-minmax_strings_filter_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-minmax_strings_filter_/formatted.sql
index 7edb5ae24c..46cdcee475 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-minmax_strings_filter_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-minmax_strings_filter_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA yt.UsePartitionsByKeysForFinalAgg = "false";
+
USE plato;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-minmax_tuple_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-minmax_tuple_/formatted.sql
index c6a0d49f9d..836983c297 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-minmax_tuple_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-minmax_tuple_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA yt.UsePartitionsByKeysForFinalAgg = "false";
+
USE plato;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-pg_to_strings_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-pg_to_strings_/formatted.sql
index c92f580255..fb07ee7cf6 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-pg_to_strings_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-pg_to_strings_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA yt.DisableOptimizers = "OutHorizontalJoin,HorizontalJoin,MultiHorizontalJoin";
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-sort_one_asc_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-sort_one_asc_/formatted.sql
index 611e4ec03e..1c42bb4128 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-sort_one_asc_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-sort_one_asc_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA yt.UseNativeDescSort;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-sort_one_desc_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-sort_one_desc_/formatted.sql
index 37493e84dc..bbe2293248 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-sort_one_desc_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-sort_one_desc_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA yt.UseNativeDescSort;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-sort_two_asc_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-sort_two_asc_/formatted.sql
index de0291bdde..b4b29deb06 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-sort_two_asc_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-sort_two_asc_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA yt.UseNativeDescSort;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-sort_two_desc_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-sort_two_desc_/formatted.sql
index 0e4714c15a..6bbd326d42 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-sort_two_desc_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-sort_two_desc_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA yt.UseNativeDescSort;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-sort_two_mix_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-sort_two_mix_/formatted.sql
index a3a3f53d00..977410c754 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-sort_two_mix_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-sort_two_mix_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA yt.UseNativeDescSort;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-string_with_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-string_with_/formatted.sql
index 362252671f..491bfbcede 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-string_with_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-string_with_/formatted.sql
@@ -1,5 +1,6 @@
PRAGMA AnsiLike;
PRAGMA warning("disable", "4510");
+
USE plato;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-top_sort_one_asc_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-top_sort_one_asc_/formatted.sql
index 07e8ff2146..4338aadad9 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-top_sort_one_asc_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-top_sort_one_asc_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA yt.UseNativeDescSort;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-top_sort_one_desc_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-top_sort_one_desc_/formatted.sql
index 15ffc8c1e2..45892c7a12 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-top_sort_one_desc_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-top_sort_one_desc_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA yt.UseNativeDescSort;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-top_sort_two_asc_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-top_sort_two_asc_/formatted.sql
index 8266aed5a7..b0bad88dbc 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-top_sort_two_asc_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-top_sort_two_asc_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA yt.UseNativeDescSort;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-top_sort_two_desc_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-top_sort_two_desc_/formatted.sql
index 04cdcb75db..6b038fefef 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-top_sort_two_desc_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-top_sort_two_desc_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA yt.UseNativeDescSort;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-top_sort_two_mix_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-top_sort_two_mix_/formatted.sql
index 0f112ea821..b93fa76a12 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-top_sort_two_mix_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-top_sort_two_mix_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA yt.UseNativeDescSort;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-tuple_nth_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-tuple_nth_/formatted.sql
index eeab36dfdf..ac097e7bba 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-tuple_nth_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-tuple_nth_/formatted.sql
@@ -12,6 +12,7 @@ SELECT
FROM
Input
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-type_and_callable_stats_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-type_and_callable_stats_/formatted.sql
index 6d1d7edc99..35f39f4afa 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-type_and_callable_stats_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_blocks-type_and_callable_stats_/formatted.sql
@@ -1,5 +1,7 @@
PRAGMA BlockEngine = 'force';
+
USE plato;
+
$match = Re2::Match(@@\d+@@);
$grep = Re2::Grep('911');
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 8ce76eb517..4e8615f90c 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
@@ -105,6 +105,7 @@ $switch = ($x) -> {
END;
RETURN $res;
};
+
$expected = ListFromRange(1, 101);
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-insert_diff_groups1_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-insert_diff_groups1_fail_/formatted.sql
index a03bd5c2f3..8e5c6643eb 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-insert_diff_groups1_fail_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-insert_diff_groups1_fail_/formatted.sql
@@ -1,5 +1,6 @@
/* custom error:Insert with different "column_groups" to existing table is not allowed*/
USE plato;
+
PRAGMA yt.ColumnGroupMode = "perusage";
$s1 =
@@ -26,6 +27,7 @@ SELECT
FROM
$s1
;
+
COMMIT;
INSERT INTO @a WITH column_groups = "{a=#}"
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-insert_diff_groups2_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-insert_diff_groups2_fail_/formatted.sql
index 6f340495e4..1883e54072 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-insert_diff_groups2_fail_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-insert_diff_groups2_fail_/formatted.sql
@@ -1,5 +1,6 @@
/* custom error:Insert with different "column_groups" to existing table is not allowed*/
USE plato;
+
PRAGMA yt.ColumnGroupMode = "perusage";
$s1 =
@@ -26,6 +27,7 @@ SELECT
FROM
$s1
;
+
COMMIT;
INSERT INTO Output WITH column_groups = "{a=#}"
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-insert_diff_groups3_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-insert_diff_groups3_fail_/formatted.sql
index 8035f052d7..e95eeea5a9 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-insert_diff_groups3_fail_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-insert_diff_groups3_fail_/formatted.sql
@@ -1,5 +1,6 @@
/* custom error:Insert with "column_groups" to existing table is not allowed*/
USE plato;
+
PRAGMA yt.ColumnGroupMode = "perusage";
INSERT INTO Output WITH column_groups = "{a=#}"
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-many_inserts_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-many_inserts_/formatted.sql
index 76e03e206c..0040b43dfd 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-many_inserts_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-many_inserts_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA yt.ColumnGroupMode = "perusage";
$s1 =
@@ -46,6 +47,7 @@ SELECT
FROM
$s1
;
+
COMMIT;
INSERT INTO @a WITH column_groups = "{a=#}"
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-min_group_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-min_group_/formatted.sql
index b6f13383d1..3253f35ff5 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-min_group_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_group-min_group_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA yt.MinColumnGroupSize = "3";
PRAGMA yt.ColumnGroupMode = "perusage";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-align_publish_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-align_publish_/formatted.sql
index 1a1a94963f..367d08a873 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-align_publish_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-align_publish_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA OrderedColumns;
+
USE plato;
INSERT INTO @table1 WITH TRUNCATE (
@@ -8,6 +9,7 @@ INSERT INTO @table1 WITH TRUNCATE (
)
VALUES
('1', '2', '3');
+
COMMIT;
INSERT INTO Output WITH TRUNCATE
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-align_publish_native_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-align_publish_native_/formatted.sql
index 61a3781967..339c77dbbb 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-align_publish_native_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-align_publish_native_/formatted.sql
@@ -1,6 +1,7 @@
/* ignore runonopt plan diff */
PRAGMA OrderedColumns;
PRAGMA yt.UseNativeYtTypes;
+
USE plato;
INSERT INTO @table1 WITH TRUNCATE (
@@ -10,6 +11,7 @@ INSERT INTO @table1 WITH TRUNCATE (
)
VALUES
('1', '2', '3');
+
COMMIT;
INSERT INTO Output WITH TRUNCATE
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-insert_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-insert_/formatted.sql
index e22e57dbc3..7f8f7b9b16 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-insert_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-insert_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* syntax version 1 */
USE plato;
+
PRAGMA OrderedColumns;
INSERT INTO Input
@@ -11,6 +12,7 @@ SELECT
FROM
Input
;
+
COMMIT;
SELECT
@@ -31,6 +33,7 @@ ORDER BY
subkey,
key
;
+
COMMIT;
SELECT
@@ -62,6 +65,7 @@ ORDER BY
subkey,
key
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-insert_reorder_without_columnorder_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-insert_reorder_without_columnorder_/formatted.sql
index b7b6f7ed48..b8bfa0480f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-insert_reorder_without_columnorder_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-insert_reorder_without_columnorder_/formatted.sql
@@ -1,7 +1,9 @@
/* postgres can not */
USE plato;
+
PRAGMA DisableOrderedColumns;
PRAGMA warning("disable", "4517");
+
$Group = 1u;
INSERT INTO Output (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-insert_tmp_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-insert_tmp_/formatted.sql
index 4875ba5926..4f3ed4d2e5 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-insert_tmp_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-insert_tmp_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* syntax version 1 */
USE plato;
+
PRAGMA OrderedColumns;
INSERT INTO @tmp
@@ -12,6 +13,7 @@ ORDER BY
subkey,
key
;
+
COMMIT;
SELECT
@@ -43,6 +45,7 @@ ORDER BY
subkey,
key
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-insert_with_desc_sort_and_native_types_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-insert_with_desc_sort_and_native_types_/formatted.sql
index 1ed4479a44..1d4ee1ef43 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-insert_with_desc_sort_and_native_types_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-insert_with_desc_sort_and_native_types_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* hybridfile can not YQL-17743 */
USE plato;
+
PRAGMA OrderedColumns;
PRAGMA yt.UseNativeYtTypes;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-insert_with_new_cols_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-insert_with_new_cols_/formatted.sql
index f2865ca459..e626ef2a19 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-insert_with_new_cols_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-insert_with_new_cols_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* syntax version 1 */
USE plato;
+
PRAGMA OrderedColumns;
INSERT INTO Output WITH truncate
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-insert_with_reorder_cols_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-insert_with_reorder_cols_/formatted.sql
index 4da22ca1ac..f83f21baa1 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-insert_with_reorder_cols_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-insert_with_reorder_cols_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* syntax version 1 */
USE plato;
+
PRAGMA PositionalUnionAll;
PRAGMA yt.UseNativeYtTypes;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-join_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-join_/formatted.sql
index ca337ddcef..f28388240a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-join_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-join_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* syntax version 1 */
USE plato;
+
PRAGMA OrderedColumns;
$foo =
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-join_nosimple_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-join_nosimple_/formatted.sql
index def6bc5744..29398d86d9 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-join_nosimple_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-join_nosimple_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* syntax version 1 */
USE plato;
+
PRAGMA OrderedColumns;
PRAGMA DisableSimpleColumns;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-ordered_plus_native_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-ordered_plus_native_/formatted.sql
index 36a08c0957..fef40516b5 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-ordered_plus_native_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-ordered_plus_native_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* syntax version 1 */
USE plato;
+
PRAGMA OrderedColumns;
PRAGMA yt.UseNativeYtTypes;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_action_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_action_/formatted.sql
index 46cb1a86b5..af79c2b074 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_action_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_action_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* syntax version 1 */
USE plato;
+
PRAGMA OrderedColumns;
EVALUATE FOR $i IN ["1", "2", "3"] DO BEGIN
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_distinct_star_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_distinct_star_/formatted.sql
index 74929643a3..f08dca7363 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_distinct_star_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_distinct_star_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* syntax version 1 */
USE plato;
+
PRAGMA OrderedColumns;
SELECT DISTINCT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_groupby_with_star_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_groupby_with_star_/formatted.sql
index f19722a440..300d06b711 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_groupby_with_star_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_groupby_with_star_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* syntax version 1 */
USE plato;
+
PRAGMA OrderedColumns;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_limit_offset_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_limit_offset_/formatted.sql
index 15660c0ada..1aa88a5b0b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_limit_offset_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_limit_offset_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* syntax version 1 */
USE plato;
+
PRAGMA OrderedColumns;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_limit_offset_reorder_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_limit_offset_reorder_/formatted.sql
index 9747f2ab2b..748f60c8ff 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_limit_offset_reorder_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_limit_offset_reorder_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* syntax version 1 */
USE plato;
+
PRAGMA OrderedColumns;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_orderby_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_orderby_/formatted.sql
index 68cdc0a8f9..e8a7ddf385 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_orderby_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_orderby_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* syntax version 1 */
USE plato;
+
PRAGMA OrderedColumns;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_plain_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_plain_/formatted.sql
index 620988c96f..200c7555b5 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_plain_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_plain_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* syntax version 1 */
USE plato;
+
PRAGMA OrderedColumns;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_plain_nosimple_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_plain_nosimple_/formatted.sql
index 6a6d46f2ec..df2a2176fe 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_plain_nosimple_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_plain_nosimple_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* syntax version 1 */
USE plato;
+
PRAGMA OrderedColumns;
PRAGMA DisableSimpleColumns;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_sample_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_sample_/formatted.sql
index d25c8816c0..1b4f90a5e2 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_sample_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_sample_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* syntax version 1 */
USE plato;
+
PRAGMA OrderedColumns;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_subquery_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_subquery_/formatted.sql
index ad516df7a3..e706f81546 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_subquery_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_subquery_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* syntax version 1 */
USE plato;
+
PRAGMA OrderedColumns;
DEFINE SUBQUERY $select_star($table) AS
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_where_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_where_/formatted.sql
index 50ffe99236..8b3ac87f0a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_where_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_where_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* syntax version 1 */
USE plato;
+
PRAGMA OrderedColumns;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_win_func_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_win_func_/formatted.sql
index bd3663f799..412e179430 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_win_func_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-select_win_func_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* syntax version 1 */
USE plato;
+
PRAGMA OrderedColumns;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-winfunc_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-winfunc_/formatted.sql
index ea8325754c..256378a67d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-winfunc_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_column_order-winfunc_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA OrderedColumns;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-decimal_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-decimal_/formatted.sql
index 718778a7a6..57000dc496 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-decimal_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-decimal_/formatted.sql
@@ -2,6 +2,7 @@
/* postgres can not */
/* yt can not */
PRAGMA warning("disable", "4510");
+
$opt_type = Struct<x: Decimal (15, 10)?>;
$keys = AsTuple(AsAtom("x"));
$pred = ($row) -> (($row.x < Decimal("-inf", 15, 10)) ?? FALSE);
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-in3_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-in3_/formatted.sql
index 174bfe6736..96c9ca2353 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-in3_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-in3_/formatted.sql
@@ -5,6 +5,7 @@
/* yt can not */
PRAGMA warning("disable", "4510");
PRAGMA warning("disable", "1108");
+
$Input = [(4, 100), (5, 100)];
SELECT
@@ -32,6 +33,7 @@ SELECT
)
)
;
+
$Input2 = [(30, 20, 88), (31, 21, 99)];
SELECT
@@ -63,6 +65,7 @@ SELECT
)
)
;
+
$Input3 = [(20, 10, 30, 99), (21, 10, 31, 88)];
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-multiply_limit_with_dups_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-multiply_limit_with_dups_/formatted.sql
index 031b5c7c19..9f49d76ec8 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-multiply_limit_with_dups_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-multiply_limit_with_dups_/formatted.sql
@@ -5,11 +5,13 @@
/* yt can not */
PRAGMA warning("disable", "4510");
PRAGMA warning("disable", "1108");
+
$lst = ListExtend(
ListFromRange(0, 5000),
ListFromRange(0, 5000),
ListFromRange(5000, 10000)
);
+
$lst = ListMap($lst, ($x) -> (AsTuple(CAST($x AS String), $x)));
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-norange_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-norange_/formatted.sql
index ee6bda407e..5ed3573574 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-norange_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-norange_/formatted.sql
@@ -2,6 +2,7 @@
/* postgres can not */
/* yt can not */
PRAGMA warning("disable", "4510");
+
$opt_type = Struct<x: Int32?, y: Int32?, z: String?, t: String?>;
$xy_keys = AsTuple(AsAtom("x"), AsAtom("y"));
$range_for = ($pred) -> (YQL::RangeComputeFor($opt_type, $pred, $xy_keys));
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-tuples_compare_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-tuples_compare_/formatted.sql
index fa6ac9b2ca..cbab4b582d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-tuples_compare_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-tuples_compare_/formatted.sql
@@ -2,6 +2,7 @@
/* postgres can not */
/* yt can not */
PRAGMA warning("disable", "4510");
+
$type = Struct<x: Int32, y: Int32, z: Int32>;
$keys = AsTuple(AsAtom("x"), AsAtom("y"), AsAtom("z"));
$range_for = ($pred) -> (YQL::RangeComputeFor($type, $pred, $keys));
@@ -20,6 +21,7 @@ SELECT
$range_for($pred5),
$range_for($pred6),
;
+
$pred1 = ($row) -> (($row.x, $row.y) >= (11, 22));
$pred2 = ($row) -> (($row.x, $row.y) > (11, 22));
$pred3 = ($row) -> (($row.x, $row.y) < (11, 22));
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-yql-12941_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-yql-12941_/formatted.sql
index 6deff9f27a..8b7643cb38 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-yql-12941_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_compute_range-yql-12941_/formatted.sql
@@ -2,6 +2,7 @@
/* postgres can not */
/* yt can not */
PRAGMA warning("disable", "4510");
+
$opt_type = Struct<x: UInt32?, y: Int32?>;
$xy_keys = AsTuple(AsAtom("x"), AsAtom("y"));
$range_for = ($pred) -> (YQL::RangeComputeFor($opt_type, $pred, $xy_keys));
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-yql-7237_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-yql-7237_/formatted.sql
index 307e7626fb..f955ab1659 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-yql-7237_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_csee-yql-7237_/formatted.sql
@@ -1,5 +1,6 @@
/* syntax version 1 */
USE plato;
+
$push_final_data = AsList(
AsStruct("manufacturer" AS manufacturer, "state" AS state)
);
@@ -10,7 +11,9 @@ SELECT
FROM
AS_TABLE($push_final_data)
;
+
COMMIT;
+
$manufacturer_name_fix = ($manufacturer) -> {
$lowered_manufacturer = CAST(Unicode::ToLower(CAST(String::Strip($manufacturer) AS Utf8)) AS String);
$in = AsList(
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_table_sort_asc_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_table_sort_asc_/formatted.sql
index c734f98698..73172d3d41 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_table_sort_asc_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_table_sort_asc_/formatted.sql
@@ -10,6 +10,7 @@ FROM
ORDER BY
x ASC
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_table_sort_desc_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_table_sort_desc_/formatted.sql
index 7245005e6c..1647884730 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_table_sort_desc_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_datetime-date_tz_table_sort_desc_/formatted.sql
@@ -10,6 +10,7 @@ FROM
ORDER BY
x DESC
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_distinct-distinct_having_no_agg_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_distinct-distinct_having_no_agg_/formatted.sql
index baab515934..d319ce4c56 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_distinct-distinct_having_no_agg_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_distinct-distinct_having_no_agg_/formatted.sql
@@ -1,5 +1,6 @@
/* syntax version 1 */
PRAGMA warning("disable", "4526");
+
USE plato;
SELECT DISTINCT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_distinct-distinct_union_all_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_distinct-distinct_union_all_/formatted.sql
index 2fa3d9e7c9..0470e1f578 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_distinct-distinct_union_all_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_distinct-distinct_union_all_/formatted.sql
@@ -1,5 +1,6 @@
/* syntax version 1 */
USE plato;
+
PRAGMA AnsiOrderByLimitInUnionAll;
SELECT DISTINCT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-blacklisted_pragmas1_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-blacklisted_pragmas1_/formatted.sql
index c4378e4350..798892baa8 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-blacklisted_pragmas1_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-blacklisted_pragmas1_/formatted.sql
@@ -2,6 +2,7 @@
/* dq can not */
/* syntax version 1 */
USE plato;
+
PRAGMA OrderedColumns;
PRAGMA yt.PoolTrees = 'test';
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-blacklisted_pragmas_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-blacklisted_pragmas_/formatted.sql
index a66cae46d2..51f55ea1d7 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-blacklisted_pragmas_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-blacklisted_pragmas_/formatted.sql
@@ -2,6 +2,7 @@
/* dq can not */
/* syntax version 1 */
USE plato;
+
PRAGMA OrderedColumns;
PRAGMA yt.MaxRowWeight = '32M';
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-join_cbo_native_3_tables_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-join_cbo_native_3_tables_/formatted.sql
index 257887eeba..366b5f80f5 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-join_cbo_native_3_tables_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-join_cbo_native_3_tables_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA CostBasedOptimizer = "native";
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-mem_limit_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-mem_limit_/formatted.sql
index 5e92edb93f..eb56a0d044 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-mem_limit_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-mem_limit_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* dqfile can not */
USE plato;
+
PRAGMA DqEngine = "force";
PRAGMA dq.MemoryLimit = "1M";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-pool_trees_whitelist_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-pool_trees_whitelist_/formatted.sql
index 460c5428a1..3915245b95 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-pool_trees_whitelist_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-pool_trees_whitelist_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* syntax version 1 */
USE plato;
+
PRAGMA OrderedColumns;
PRAGMA yt.PoolTrees = 'physical,cloud';
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-precompute_result_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-precompute_result_/formatted.sql
index 44695cbc07..e5dea4e75c 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-precompute_result_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-precompute_result_/formatted.sql
@@ -6,6 +6,7 @@ $l =
FROM
Input
;
+
$l = EvaluateExpr($l);
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-read_cost_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-read_cost_/formatted.sql
index 297ca2e173..8b17025a87 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-read_cost_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-read_cost_/formatted.sql
@@ -1,5 +1,6 @@
PRAGMA warning("disable", "4510");
PRAGMA CostBasedOptimizer = "PG";
+
USE plato;
$foo =
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-read_cost_native_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-read_cost_native_/formatted.sql
index 1d42ae4772..fd5e845953 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-read_cost_native_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-read_cost_native_/formatted.sql
@@ -1,5 +1,6 @@
PRAGMA warning("disable", "4510");
PRAGMA CostBasedOptimizer = "Native";
+
USE plato;
$foo =
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-wrong_script_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-wrong_script_/formatted.sql
index d8fb55de2e..a4f96ca89d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-wrong_script_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-wrong_script_/formatted.sql
@@ -1,6 +1,7 @@
/* custom error:Failed to cast arguments*/
/* dqfile can not */
USE plato;
+
$f = Python3::f(
@@
def f(x):
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-wrong_script_segf_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-wrong_script_segf_/formatted.sql
index 59b5ea4b2d..88384f7e07 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-wrong_script_segf_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-wrong_script_segf_/formatted.sql
@@ -1,6 +1,7 @@
/* custom error:PrintBacktraceToStderr*/
/* dqfile can not */
USE plato;
+
$f = Python3::f(
@@
def f(x):
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-wrong_script_timeout_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-wrong_script_timeout_/formatted.sql
index 95dbd54cb0..33e249e44d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-wrong_script_timeout_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_dq-wrong_script_timeout_/formatted.sql
@@ -1,5 +1,6 @@
/* dqfile can not */
USE plato;
+
$f = Python3::f(
@@
def f(x):
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_epochs-read_modified_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_epochs-read_modified_/formatted.sql
index f896443873..23d59146a0 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_epochs-read_modified_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_epochs-read_modified_/formatted.sql
@@ -15,6 +15,7 @@ SELECT
FROM
Output
;
+
COMMIT;
SELECT
@@ -36,6 +37,7 @@ SELECT
FROM
Output
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_epochs-reset_sortness_on_append_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_epochs-reset_sortness_on_append_/formatted.sql
index 745a3c7aa6..42f022d65b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_epochs-reset_sortness_on_append_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_epochs-reset_sortness_on_append_/formatted.sql
@@ -12,6 +12,7 @@ VALUES
('21', '30'),
('31', '40'),
('41', '50');
+
COMMIT;
INSERT INTO Output
@@ -22,6 +23,7 @@ FROM
ORDER BY
a
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_epochs-use_and_drop_anonymous_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_epochs-use_and_drop_anonymous_/formatted.sql
index 99cfd220cc..ff11765b7b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_epochs-use_and_drop_anonymous_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_epochs-use_and_drop_anonymous_/formatted.sql
@@ -10,6 +10,7 @@ FROM
WHERE
key > "100"
;
+
COMMIT;
INSERT INTO Output
@@ -20,7 +21,9 @@ FROM
WHERE
key != "150"
;
+
DROP TABLE @tmp;
+
COMMIT;
INSERT INTO @tmp
@@ -31,6 +34,7 @@ FROM
WHERE
key > "200"
;
+
COMMIT;
INSERT INTO Output
@@ -41,5 +45,7 @@ FROM
WHERE
key != "150"
;
+
DROP TABLE @tmp;
+
COMMIT;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_epochs-use_sorted_by_complex_type_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_epochs-use_sorted_by_complex_type_/formatted.sql
index d20e6fe3ba..2f9eb00b31 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_epochs-use_sorted_by_complex_type_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_epochs-use_sorted_by_complex_type_/formatted.sql
@@ -14,6 +14,7 @@ ORDER BY
key,
lst
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-as_dict_dict_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-as_dict_dict_key_/formatted.sql
index 59563743a3..629d88e654 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-as_dict_dict_key_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-as_dict_dict_key_/formatted.sql
@@ -3,11 +3,14 @@ $d1 = AsDict(
AsTuple(AsList(1, 2, 3), "foo"),
AsTuple(AsList(1, 2), "bar")
);
+
$d2 = AsDict(
AsTuple(AsList(1, 3), "baz"),
AsTuple(AsList(1, 2), "qwe")
);
+
$d3 = DictCreate(DictKeyType(TypeOf($d2)), DictPayloadType(TypeOf($d2)));
+
$d = AsDict(
AsTuple($d1, 17),
AsTuple($d2, 32)
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-as_dict_tuple_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-as_dict_tuple_key_/formatted.sql
index 33d23f9a90..a1df8d632e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-as_dict_tuple_key_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-as_dict_tuple_key_/formatted.sql
@@ -17,6 +17,7 @@ SELECT
SELECT
DictContains($d, AsTuple())
;
+
$d = AsDict(
AsTuple(AsTuple(1), "foo"),
AsTuple(AsTuple(2), "bar")
@@ -37,6 +38,7 @@ SELECT
DictContains($d, AsTuple(1)),
DictContains($d, AsTuple(3))
;
+
$d = AsDict(
AsTuple(AsTuple(1, 2), "foo"),
AsTuple(AsTuple(1, 3), "bar")
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
index 2e5e2b3acf..c91940e206 100644
--- 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
@@ -3,6 +3,7 @@
$lambda = ($x) -> {
RETURN CAST($x AS String)
};
+
$callables = AsTuple(
CALLABLE (Callable<(Int32) -> String>, $lambda),
CALLABLE (Callable<(Bool) -> String>, $lambda),
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-cast_variant_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-cast_variant_/formatted.sql
index dace70b1db..431457b194 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-cast_variant_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-cast_variant_/formatted.sql
@@ -9,6 +9,7 @@ $t = TypeOf([Just($a), Just($b), just($c)]);
SELECT
CAST([just($a), just($b), just($d)] AS $t)
;
+
$t0 = TypeOf([Just($a), Just($b)]);
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-constraints_of_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-constraints_of_/formatted.sql
index bade1d98d5..8fb0484ca0 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-constraints_of_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-constraints_of_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* postgres can not */
PRAGMA warning("disable", "4510");
+
USE plato;
$foo =
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-convert_to_lambda_optional_args_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-convert_to_lambda_optional_args_/formatted.sql
index 05313ae5c5..01c87f3dff 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-convert_to_lambda_optional_args_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-convert_to_lambda_optional_args_/formatted.sql
@@ -5,6 +5,7 @@ $f = ($x, $y?) -> ($x + ($y ?? 0));
SELECT
ListMap([1, 2, 3], $f)
;
+
$g = ($x, $y, $z?) -> (($x + $y + $z) ?? 100);
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-dict_common_type_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-dict_common_type_/formatted.sql
index ae2e371323..f250c31bcb 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-dict_common_type_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-dict_common_type_/formatted.sql
@@ -2,6 +2,7 @@
/* postgres can not */
/* yt can not */
PRAGMA warning("disable", "4510");
+
$d1 = ToDict([(1, 1u)]);
$d2 = AsDict((2, 2u));
$d3 = YQL::Dict(Dict<Int32, Uint32>);
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-empty_iterator2_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-empty_iterator2_/formatted.sql
index 25c6f44630..d66b68579a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-empty_iterator2_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-empty_iterator2_/formatted.sql
@@ -14,6 +14,7 @@ $train =
HAVING
key > "900"
;
+
$method = ($stream) -> {
$func = CALLABLE (
CallableType(0, TypeOf($stream), TypeOf($stream)),
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-empty_iterator_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-empty_iterator_/formatted.sql
index b53b829468..1810109124 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-empty_iterator_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-empty_iterator_/formatted.sql
@@ -12,6 +12,7 @@ $train =
GROUP BY
value
;
+
$method = ($stream) -> {
$func = CALLABLE (
CallableType(0, TypeOf($stream), TypeOf($stream)),
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
index b19e0c9fde..6a44100ae4 100644
--- 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
@@ -1,6 +1,7 @@
/* postgres can not */
$null_t = TypeOf(NULL);
$struct_t = Struct<a: String, b: Int32?, c: $null_t, d: pgtext>;
+
$callable = CALLABLE (
Callable<($struct_t) -> $struct_t>, ($x) -> {
RETURN $x;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-fallback_filternullelements_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-fallback_filternullelements_/formatted.sql
index e4d7bedd92..f996e5ee8a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-fallback_filternullelements_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-fallback_filternullelements_/formatted.sql
@@ -1,8 +1,10 @@
/* syntax version 1 */
$lists = AsList(AsList("one", "two", "three"), AsList("head", NULL), AsList(NULL, "tail"), ListCreate(String?));
+
$map = ($l) -> {
RETURN AsTuple(ListHead($l), ListLast($l))
};
+
$structs = ListMap($lists, $map);
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-fallback_filternullmembers_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-fallback_filternullmembers_/formatted.sql
index 4226582ca3..9e6380b9f7 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-fallback_filternullmembers_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-fallback_filternullmembers_/formatted.sql
@@ -1,8 +1,10 @@
/* syntax version 1 */
$lists = AsList(AsList("one", "two", "three"), AsList("head", NULL), AsList(NULL, "tail"), ListCreate(String?));
+
$map = ($l) -> {
RETURN AsStruct(ListHead($l) AS head, ListLast($l) AS tail)
};
+
$structs = ListMap($lists, $map);
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-inline_call_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-inline_call_/formatted.sql
index 959e28d8b0..d47253299a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-inline_call_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-inline_call_/formatted.sql
@@ -1,11 +1,13 @@
/* postgres can not */
/* syntax version 1 */
USE plato;
+
$x = AsStruct(1 AS a);
SELECT
$x.a
;
+
$y = AsTuple(2, 3);
SELECT
@@ -19,6 +21,7 @@ SELECT
SELECT
Math::Pi()
;
+
$f = () -> {
RETURN () -> {
RETURN AsDict(AsTuple("foo", AsList(AsStruct(AsTuple(1) AS bar))));
@@ -34,7 +37,9 @@ SELECT
RETURN 1
}()
;
+
$type = Callable<() -> List<Int32>>;
+
$g = AsStruct(
Yql::Callable(
$type, () -> {
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-iterable_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-iterable_/formatted.sql
index be2adeeb7b..55397a9b6d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-iterable_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-iterable_/formatted.sql
@@ -7,6 +7,7 @@ SELECT
ListHasItems($a),
ListLength($a)
;
+
$b = Yql::ToList(() -> (Yql::EmptyIterator(Stream<Int32>)));
SELECT
@@ -14,6 +15,7 @@ SELECT
ListHasItems($b),
ListLength($b)
;
+
$c = Yql::ToList(() -> (Yql::EmptyIterator(Stream<Int32>)));
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_builtins_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_builtins_/formatted.sql
index 593c42ca5e..1c2a9ea3ad 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_builtins_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_builtins_/formatted.sql
@@ -3,27 +3,34 @@
$list = AsList(3, 1, 2, 3);
$other_list = AsList(4);
$bool_list = AsList(TRUE, FALSE, TRUE);
+
$struct_list = AsList(
AsStruct(1 AS one, 2 AS two),
AsStruct(-1 AS one, -2 AS two)
);
+
$script = @@
def formula(a, b, c, d):
return a * b + c // d
@@;
+
$udf = Python3::formula(
Callable<(Int64, Int64, Int64, Int64) -> Int64>,
$script
);
+
$lambdaSum = ($x, $y) -> {
RETURN $x + $y;
};
+
$lambdaMult = ($x) -> {
RETURN 4 * $x;
};
+
$lambdaTuple = ($i, $s) -> {
RETURN ($i * $s, $i + $s);
};
+
$lambdaInc = ($i) -> {
RETURN ($i + 1, $i + 2);
};
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_sample_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_sample_/formatted.sql
index 3c8072ce2c..e931d3ad55 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_sample_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_sample_/formatted.sql
@@ -1,5 +1,6 @@
/* yt can not */
$list = ListFromRange(1, 101);
+
$test = ($probability, $dependsOn) -> {
$sample = ListCollect(ListSample($list, $probability, $dependsOn));
RETURN (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_sample_n_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_sample_n_/formatted.sql
index cd64b06256..f9058637a8 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_sample_n_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_sample_n_/formatted.sql
@@ -1,5 +1,6 @@
/* yt can not */
$list = ListFromRange(1, 40);
+
$test = ($n, $dependsOn) -> {
$sample = ListCollect(ListSampleN($list, $n, $dependsOn));
RETURN (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_shuffle_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_shuffle_/formatted.sql
index 888de405cb..73d04fe202 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_shuffle_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_shuffle_/formatted.sql
@@ -1,5 +1,6 @@
/* yt can not */
$list = ListFromRange(1, 40);
+
$test = ($c) -> {
$shuffle = ListCollect(ListShuffle($list, $c));
RETURN ListSort($shuffle) == ListSort($list);
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_top_sort_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_top_sort_/formatted.sql
index ac0ef8169a..658b104c9d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_top_sort_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-list_top_sort_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
$list = [45, 20, 34, 16];
$empty = [];
+
$digit = ($x) -> {
RETURN $x % 10;
};
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-non_persistable_group_by_column_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-non_persistable_group_by_column_fail_/formatted.sql
index f5b16ac8eb..7a4f2ba870 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-non_persistable_group_by_column_fail_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-non_persistable_group_by_column_fail_/formatted.sql
@@ -1,5 +1,6 @@
/* custom error:Expected hashable and equatable type for key column: key, but got: Resource<'MTRand'>*/
PRAGMA Warning("error", '1104');
+
USE plato;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-non_persistable_group_by_having_some_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-non_persistable_group_by_having_some_fail_/formatted.sql
index 3f6789e25f..2e19c29c4b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-non_persistable_group_by_having_some_fail_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-non_persistable_group_by_having_some_fail_/formatted.sql
@@ -1,5 +1,6 @@
/* custom error:Persistable required*/
PRAGMA Warning("error", '1104');
+
USE plato;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-non_persistable_group_by_some_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-non_persistable_group_by_some_fail_/formatted.sql
index 2e68db17c1..0d4ceec444 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-non_persistable_group_by_some_fail_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-non_persistable_group_by_some_fail_/formatted.sql
@@ -1,5 +1,6 @@
/* custom error:Persistable required*/
PRAGMA Warning("error", '1104');
+
USE plato;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-non_persistable_inner_select_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-non_persistable_inner_select_fail_/formatted.sql
index f5d8c71330..9ea3c81d60 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-non_persistable_inner_select_fail_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-non_persistable_inner_select_fail_/formatted.sql
@@ -1,5 +1,6 @@
/* custom error:Persistable required*/
PRAGMA Warning("error", '1104');
+
USE plato;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-non_persistable_insert_into_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-non_persistable_insert_into_fail_/formatted.sql
index 7f3f97ffca..210fc7da9a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-non_persistable_insert_into_fail_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-non_persistable_insert_into_fail_/formatted.sql
@@ -1,5 +1,6 @@
/* custom error:Persistable required*/
PRAGMA Warning("error", '1104');
+
USE plato;
INSERT INTO Output (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-non_persistable_order_by_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-non_persistable_order_by_fail_/formatted.sql
index a86a7a0038..1d015a2d41 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-non_persistable_order_by_fail_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-non_persistable_order_by_fail_/formatted.sql
@@ -1,5 +1,6 @@
/* custom error:Persistable required*/
PRAGMA Warning("error", '1104');
+
USE plato;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-opt_list_map_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-opt_list_map_/formatted.sql
index 598e929fa8..18fe0052cf 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-opt_list_map_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-opt_list_map_/formatted.sql
@@ -9,6 +9,7 @@ SELECT
$l2,
$l3
;
+
$p = ($x) -> {
RETURN $x < 3
};
@@ -18,6 +19,7 @@ SELECT
ListFilter($l2, $p),
ListFilter($l3, $p)
;
+
$m = ($x) -> {
RETURN $x * 2
};
@@ -27,6 +29,7 @@ SELECT
ListMap($l2, $m),
ListMap($l3, $m)
;
+
$f = ($x) -> {
RETURN AsList($x, $x * 2)
};
@@ -55,6 +58,7 @@ SELECT
ListExtend($l2, $l3),
ListExtend($l3, $l3)
;
+
$ls1 = AsList(AsStruct(1 AS a), AsStruct(2 AS a));
$ls2 = Just($ls1);
$ls3 = Nothing(TypeOf($ls2));
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-replace_member_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-replace_member_/formatted.sql
index 39baaecd79..11b8baafdc 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-replace_member_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-replace_member_/formatted.sql
@@ -1,12 +1,14 @@
/* postgres can not */
/* syntax version 1 */
$data = <|x: [<|y: 2|>], z: 5|>;
+
-- set field function
$F = ($field, $function) -> (
($struct) -> (
ReplaceMember($struct, $field, $function($struct.$field))
)
);
+
-- set list element function
$E = ($index, $function) -> (
($list) -> (
@@ -17,6 +19,7 @@ $E = ($index, $function) -> (
)
)
);
+
-- set value function
$V = ($value) -> (
($_item) -> ($value)
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-sets_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-sets_/formatted.sql
index 4d085274d4..d9bf6a9e2c 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-sets_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-sets_/formatted.sql
@@ -2,6 +2,7 @@
$ns = ($set) -> {
RETURN ListSort(DictKeys($set))
};
+
$nd = ($dict) -> {
RETURN ListSort(
DictItems($dict), ($z) -> {
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-static_fold_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-static_fold_/formatted.sql
index 76159013a1..edc564c1f5 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-static_fold_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-static_fold_/formatted.sql
@@ -3,9 +3,11 @@ $st_many = <|a: "one", b: "two", c: "three", d: "four"|>;
$st_single = <|a: "zero"|>;
$st_empty = <||>;
$tup = AsTuple("first", "second");
+
$concat = ($item, $state) -> {
RETURN $state || $item;
};
+
$start = ($value) -> {
RETURN "(" || $value || ")";
};
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-struct_merge_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-struct_merge_/formatted.sql
index 9e5d5da467..dacc54af3f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-struct_merge_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-struct_merge_/formatted.sql
@@ -2,6 +2,7 @@
$merge = ($_name, $l, $r) -> {
RETURN Coalesce($l, 0) + Coalesce($r, 0);
};
+
$left = <|a: 1, b: 2, c: 3|>;
$right = <|c: 1, d: 2, e: 3|>;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-tagged_runtime_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-tagged_runtime_/formatted.sql
index 76b2988d9a..8884415b18 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-tagged_runtime_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-tagged_runtime_/formatted.sql
@@ -13,6 +13,7 @@ SELECT
)
) AS x
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_dict_dict_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_dict_dict_key_/formatted.sql
index 64b0ccc343..a38bea2385 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_dict_dict_key_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_dict_dict_key_/formatted.sql
@@ -2,17 +2,21 @@
$first = ($x) -> {
RETURN $x.0
};
+
$second = ($x) -> {
RETURN $x.1
};
+
$i = AsDict(AsTuple(1, "A"), AsTuple(2, "B"));
$j = AsDict(AsTuple(1, "A"), AsTuple(2, "C"));
$k = AsDict(AsTuple(1, "A"), AsTuple(2, "D"));
+
$l = AsList(
AsTuple($i, "foo"),
AsTuple($i, "bar"),
AsTuple($j, "baz")
);
+
$d = ToDict($l);
SELECT
@@ -50,6 +54,7 @@ SELECT
DictContains($d, $i),
DictContains($d, $k)
;
+
$d = ToMultiDict($l);
SELECT
@@ -87,6 +92,7 @@ SELECT
DictContains($d, $i),
DictContains($d, $k)
;
+
$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom("Compact"), AsAtom("Hashed"), AsAtom("One")));
SELECT
@@ -124,6 +130,7 @@ SELECT
DictContains($d, $i),
DictContains($d, $k)
;
+
$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom("Compact"), AsAtom("Hashed"), AsAtom("Many")));
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_dict_list_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_dict_list_key_/formatted.sql
index 1c6693f882..beb8abd85d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_dict_list_key_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_dict_list_key_/formatted.sql
@@ -2,14 +2,17 @@
$first = ($x) -> {
RETURN $x.0
};
+
$second = ($x) -> {
RETURN $x.1
};
+
$l = AsList(
AsTuple(AsList(1, 2, 3), "foo"),
AsTuple(AsList(1, 2), "bar"),
AsTuple(AsList(1, 2), "baz")
);
+
$d = ToDict($l);
SELECT
@@ -27,6 +30,7 @@ SELECT
DictContains($d, AsList(1, 2)),
DictContains($d, AsList(1, 3))
;
+
$d = ToMultiDict($l);
SELECT
@@ -44,6 +48,7 @@ SELECT
DictContains($d, AsList(1, 2)),
DictContains($d, AsList(1, 3))
;
+
$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom("Compact"), AsAtom("Hashed"), AsAtom("One")));
SELECT
@@ -61,6 +66,7 @@ SELECT
DictContains($d, AsList(1, 2)),
DictContains($d, AsList(1, 3))
;
+
$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom("Compact"), AsAtom("Hashed"), AsAtom("Many")));
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_dict_tuple_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_dict_tuple_key_/formatted.sql
index 309ecba9be..ca76aed43a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_dict_tuple_key_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_dict_tuple_key_/formatted.sql
@@ -2,14 +2,17 @@
$first = ($x) -> {
RETURN $x.0
};
+
$second = ($x) -> {
RETURN $x.1
};
+
$l = AsList(
AsTuple(AsTuple(), "foo"),
AsTuple(AsTuple(), "bar"),
AsTuple(AsTuple(), "baz")
);
+
$d = ToDict($l);
SELECT
@@ -25,6 +28,7 @@ SELECT
SELECT
DictContains($d, AsTuple())
;
+
$d = ToMultiDict($l);
SELECT
@@ -40,6 +44,7 @@ SELECT
SELECT
DictContains($d, AsTuple())
;
+
$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom("Compact"), AsAtom("Hashed"), AsAtom("One")));
SELECT
@@ -55,6 +60,7 @@ SELECT
SELECT
DictContains($d, AsTuple())
;
+
$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom("Compact"), AsAtom("Hashed"), AsAtom("Many")));
SELECT
@@ -70,11 +76,13 @@ SELECT
SELECT
DictContains($d, AsTuple())
;
+
$l = AsList(
AsTuple(AsTuple(1), "foo"),
AsTuple(AsTuple(2), "bar"),
AsTuple(AsTuple(2), "baz")
);
+
$d = ToDict($l);
SELECT
@@ -92,6 +100,7 @@ SELECT
DictContains($d, AsTuple(2)),
DictContains($d, AsTuple(3))
;
+
$d = ToMultiDict($l);
SELECT
@@ -109,6 +118,7 @@ SELECT
DictContains($d, AsTuple(2)),
DictContains($d, AsTuple(3))
;
+
$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom("Compact"), AsAtom("Hashed"), AsAtom("One")));
SELECT
@@ -126,6 +136,7 @@ SELECT
DictContains($d, AsTuple(2)),
DictContains($d, AsTuple(3))
;
+
$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom("Compact"), AsAtom("Hashed"), AsAtom("Many")));
SELECT
@@ -143,11 +154,13 @@ SELECT
DictContains($d, AsTuple(2)),
DictContains($d, AsTuple(3))
;
+
$l = AsList(
AsTuple(AsTuple(1, 2), "foo"),
AsTuple(AsTuple(1, 3), "bar"),
AsTuple(AsTuple(1, 3), "baz")
);
+
$d = ToDict($l);
SELECT
@@ -165,6 +178,7 @@ SELECT
DictContains($d, AsTuple(1, 2)),
DictContains($d, AsTuple(1, 4))
;
+
$d = ToMultiDict($l);
SELECT
@@ -182,6 +196,7 @@ SELECT
DictContains($d, AsTuple(1, 2)),
DictContains($d, AsTuple(1, 4))
;
+
$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom("Compact"), AsAtom("Hashed"), AsAtom("One")));
SELECT
@@ -199,6 +214,7 @@ SELECT
DictContains($d, AsTuple(1, 2)),
DictContains($d, AsTuple(1, 4))
;
+
$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom("Compact"), AsAtom("Hashed"), AsAtom("Many")));
SELECT
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
index 2562e8b9cd..3c9d1e291e 100644
--- 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
@@ -2,18 +2,22 @@
$first = ($x) -> {
RETURN $x.0
};
+
$second = ($x) -> {
RETURN $x.1
};
+
$vt = ParseType("Variant<a:Int32,b:Uint32>");
$v1 = VARIANT (1, "a", $vt);
$v2 = VARIANT (2u, "b", $vt);
$v3 = VARIANT (2, "a", $vt);
+
$l = AsList(
AsTuple($v1, "foo"),
AsTuple($v2, "bar"),
AsTuple($v2, "baz")
);
+
$d = ToDict($l);
SELECT
@@ -31,6 +35,7 @@ SELECT
DictContains($d, $v1),
DictContains($d, $v3)
;
+
$d = ToMultiDict($l);
SELECT
@@ -48,6 +53,7 @@ SELECT
DictContains($d, $v1),
DictContains($d, $v3)
;
+
$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom("Compact"), AsAtom("Hashed"), AsAtom("One")));
SELECT
@@ -65,6 +71,7 @@ SELECT
DictContains($d, $v1),
DictContains($d, $v3)
;
+
$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom("Compact"), AsAtom("Hashed"), AsAtom("Many")));
SELECT
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
index 63f00e3210..df7ee551ff 100644
--- 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
@@ -2,18 +2,22 @@
$first = ($x) -> {
RETURN $x.0
};
+
$second = ($x) -> {
RETURN $x.1
};
+
$vt = ParseType("Variant<Int32,Uint32>");
$v1 = VARIANT (1, "0", $vt);
$v2 = VARIANT (2u, "1", $vt);
$v3 = VARIANT (2, "0", $vt);
+
$l = AsList(
AsTuple($v1, "foo"),
AsTuple($v2, "bar"),
AsTuple($v2, "baz")
);
+
$d = ToDict($l);
SELECT
@@ -31,6 +35,7 @@ SELECT
DictContains($d, $v1),
DictContains($d, $v3)
;
+
$d = ToMultiDict($l);
SELECT
@@ -48,6 +53,7 @@ SELECT
DictContains($d, $v1),
DictContains($d, $v3)
;
+
$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom("Compact"), AsAtom("Hashed"), AsAtom("One")));
SELECT
@@ -65,6 +71,7 @@ SELECT
DictContains($d, $v1),
DictContains($d, $v3)
;
+
$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom("Compact"), AsAtom("Hashed"), AsAtom("Many")));
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_set_dict_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_set_dict_key_/formatted.sql
index cd235a2cbb..85fed3ee53 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_set_dict_key_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_set_dict_key_/formatted.sql
@@ -2,17 +2,21 @@
$first = ($x) -> {
RETURN $x.0
};
+
$second = ($x) -> {
RETURN $x.1
};
+
$i = AsDict(AsTuple(1, "A"), AsTuple(2, "B"));
$j = AsDict(AsTuple(1, "A"), AsTuple(2, "C"));
$k = AsDict(AsTuple(1, "A"), AsTuple(2, "D"));
+
$l = AsList(
AsTuple($i, Void()),
AsTuple($i, Void()),
AsTuple($j, Void())
);
+
$d = ToDict($l);
SELECT
@@ -46,6 +50,7 @@ SELECT
DictContains($d, $i),
DictContains($d, $k)
;
+
$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom("Compact"), AsAtom("Hashed"), AsAtom("One")));
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_set_list_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_set_list_key_/formatted.sql
index d19eb57008..6f975c890d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_set_list_key_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_set_list_key_/formatted.sql
@@ -2,14 +2,17 @@
$first = ($x) -> {
RETURN $x.0
};
+
$second = ($x) -> {
RETURN $x.1
};
+
$l = AsList(
AsTuple(AsList(1, 2, 3), Void()),
AsTuple(AsList(1, 2), Void()),
AsTuple(AsList(1, 2), Void())
);
+
$d = ToDict($l);
SELECT
@@ -27,6 +30,7 @@ SELECT
DictContains($d, AsList(1, 2)),
DictContains($d, AsList(1, 3))
;
+
$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom("Compact"), AsAtom("Hashed"), AsAtom("One")));
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_set_tuple_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_set_tuple_key_/formatted.sql
index 6c1a89b573..b3ede64b29 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_set_tuple_key_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_hashed_set_tuple_key_/formatted.sql
@@ -2,14 +2,17 @@
$first = ($x) -> {
RETURN $x.0
};
+
$second = ($x) -> {
RETURN $x.1
};
+
$l = AsList(
AsTuple(AsTuple(), Void()),
AsTuple(AsTuple(), Void()),
AsTuple(AsTuple(), Void())
);
+
$d = ToDict($l);
SELECT
@@ -25,6 +28,7 @@ SELECT
SELECT
DictContains($d, AsTuple())
;
+
$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom("Compact"), AsAtom("Hashed"), AsAtom("One")));
SELECT
@@ -40,11 +44,13 @@ SELECT
SELECT
DictContains($d, AsTuple())
;
+
$l = AsList(
AsTuple(AsTuple(1), Void()),
AsTuple(AsTuple(2), Void()),
AsTuple(AsTuple(2), Void())
);
+
$d = ToDict($l);
SELECT
@@ -62,6 +68,7 @@ SELECT
DictContains($d, AsTuple(2)),
DictContains($d, AsTuple(3))
;
+
$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom("Compact"), AsAtom("Hashed"), AsAtom("One")));
SELECT
@@ -79,11 +86,13 @@ SELECT
DictContains($d, AsTuple(2)),
DictContains($d, AsTuple(3))
;
+
$l = AsList(
AsTuple(AsTuple(1, 2), Void()),
AsTuple(AsTuple(1, 3), Void()),
AsTuple(AsTuple(1, 3), Void())
);
+
$d = ToDict($l);
SELECT
@@ -101,6 +110,7 @@ SELECT
DictContains($d, AsTuple(1, 2)),
DictContains($d, AsTuple(1, 4))
;
+
$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom("Compact"), AsAtom("Hashed"), AsAtom("One")));
SELECT
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
index d10e8c4bb8..ea764beaec 100644
--- 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
@@ -2,18 +2,22 @@
$first = ($x) -> {
RETURN $x.0
};
+
$second = ($x) -> {
RETURN $x.1
};
+
$vt = ParseType("Variant<a:Int32,b:Uint32>");
$v1 = VARIANT (1, "a", $vt);
$v2 = VARIANT (2u, "b", $vt);
$v3 = VARIANT (2, "a", $vt);
+
$l = AsList(
AsTuple($v1, Void()),
AsTuple($v2, Void()),
AsTuple($v2, Void())
);
+
$d = ToDict($l);
SELECT
@@ -31,6 +35,7 @@ SELECT
DictContains($d, $v1),
DictContains($d, $v3)
;
+
$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom("Compact"), AsAtom("Hashed"), AsAtom("One")));
SELECT
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
index 4b0a6d3c62..7601390d26 100644
--- 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
@@ -2,18 +2,22 @@
$first = ($x) -> {
RETURN $x.0
};
+
$second = ($x) -> {
RETURN $x.1
};
+
$vt = ParseType("Variant<Int32,Uint32>");
$v1 = VARIANT (1, "0", $vt);
$v2 = VARIANT (2u, "1", $vt);
$v3 = VARIANT (2, "0", $vt);
+
$l = AsList(
AsTuple($v1, Void()),
AsTuple($v2, Void()),
AsTuple($v2, Void())
);
+
$d = ToDict($l);
SELECT
@@ -31,6 +35,7 @@ SELECT
DictContains($d, $v1),
DictContains($d, $v3)
;
+
$d = Yql::ToDict($l, $first, $second, AsTuple(AsAtom("Compact"), AsAtom("Hashed"), AsAtom("One")));
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_sorted_dict_list_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_sorted_dict_list_key_/formatted.sql
index 3edd0364b9..ef802f53ab 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_sorted_dict_list_key_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_sorted_dict_list_key_/formatted.sql
@@ -4,6 +4,7 @@ $l = AsList(
AsTuple(AsList(1, 2), "bar"),
AsTuple(AsList(1, 2), "baz")
);
+
$d = ToSortedDict($l);
SELECT
@@ -21,6 +22,7 @@ SELECT
DictContains($d, AsList(1, 2)),
DictContains($d, AsList(1, 3))
;
+
$d = ToSortedMultiDict($l);
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_sorted_dict_tuple_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_sorted_dict_tuple_key_/formatted.sql
index aac53549e4..24aa9b2208 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_sorted_dict_tuple_key_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_sorted_dict_tuple_key_/formatted.sql
@@ -4,6 +4,7 @@ $l = AsList(
AsTuple(AsTuple(), "bar"),
AsTuple(AsTuple(), "baz")
);
+
$d = ToSortedDict($l);
SELECT
@@ -19,6 +20,7 @@ SELECT
SELECT
DictContains($d, AsTuple())
;
+
$d = ToSortedMultiDict($l);
SELECT
@@ -34,11 +36,13 @@ SELECT
SELECT
DictContains($d, AsTuple())
;
+
$l = AsList(
AsTuple(AsTuple(1), "foo"),
AsTuple(AsTuple(2), "bar"),
AsTuple(AsTuple(2), "baz")
);
+
$d = ToSortedDict($l);
SELECT
@@ -56,6 +60,7 @@ SELECT
DictContains($d, AsTuple(2)),
DictContains($d, AsTuple(3))
;
+
$d = ToSortedMultiDict($l);
SELECT
@@ -73,11 +78,13 @@ SELECT
DictContains($d, AsTuple(2)),
DictContains($d, AsTuple(3))
;
+
$l = AsList(
AsTuple(AsTuple(1, 2), "foo"),
AsTuple(AsTuple(1, 3), "bar"),
AsTuple(AsTuple(1, 3), "baz")
);
+
$d = ToSortedDict($l);
SELECT
@@ -95,6 +102,7 @@ SELECT
DictContains($d, AsTuple(1, 2)),
DictContains($d, AsTuple(1, 4))
;
+
$d = ToSortedMultiDict($l);
SELECT
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
index 9cfd3f2ff8..8994b675db 100644
--- 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
@@ -3,10 +3,12 @@ $vt = ParseType("Variant<Int32,Uint32>");
$v1 = VARIANT (1, "0", $vt);
$v2 = VARIANT (2u, "1", $vt);
$v3 = VARIANT (2, "0", $vt);
+
$l = AsList(
AsTuple($v1, "foo"),
AsTuple($v2, "bar"),
);
+
$d = ToSortedDict($l);
SELECT
@@ -24,6 +26,7 @@ SELECT
DictContains($d, $v1),
DictContains($d, $v3)
;
+
$d = ToSortedMultiDict($l);
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_sorted_set_list_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_sorted_set_list_key_/formatted.sql
index 8d46e8b28e..c41d451217 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_sorted_set_list_key_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_sorted_set_list_key_/formatted.sql
@@ -4,6 +4,7 @@ $l = AsList(
AsTuple(AsList(1, 2), Void()),
AsTuple(AsList(1, 2), Void())
);
+
$d = ToSortedDict($l);
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_sorted_set_tuple_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_sorted_set_tuple_key_/formatted.sql
index a8720dd487..eec6698ca9 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_sorted_set_tuple_key_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-to_sorted_set_tuple_key_/formatted.sql
@@ -4,6 +4,7 @@ $l = AsList(
AsTuple(AsTuple(), Void()),
AsTuple(AsTuple(), Void())
);
+
$d = ToSortedDict($l);
SELECT
@@ -19,11 +20,13 @@ SELECT
SELECT
DictContains($d, AsTuple())
;
+
$l = AsList(
AsTuple(AsTuple(1), Void()),
AsTuple(AsTuple(2), Void()),
AsTuple(AsTuple(2), Void())
);
+
$d = ToSortedDict($l);
SELECT
@@ -41,11 +44,13 @@ SELECT
DictContains($d, AsTuple(2)),
DictContains($d, AsTuple(3))
;
+
$l = AsList(
AsTuple(AsTuple(1, 2), Void()),
AsTuple(AsTuple(1, 3), Void()),
AsTuple(AsTuple(1, 3), Void())
);
+
$d = ToSortedDict($l);
SELECT
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
index a094f1ef05..83f5f79977 100644
--- 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
@@ -3,10 +3,12 @@ $vt = ParseType("Variant<Int32,Uint32>");
$v1 = VARIANT (1, "0", $vt);
$v2 = VARIANT (2u, "1", $vt);
$v3 = VARIANT (2, "0", $vt);
+
$l = AsList(
AsTuple($v1, Void()),
AsTuple($v2, Void()),
);
+
$d = ToSortedDict($l);
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-tzdate_result_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-tzdate_result_/formatted.sql
index 8887b14bed..1d25da6789 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-tzdate_result_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-tzdate_result_/formatted.sql
@@ -12,6 +12,7 @@ SELECT
SELECT
EvaluateExpr(DateTime::MakeTzDate($date))
;
+
$parse = DateTime::Parse("%Y-%m-%d,%Z");
$date_string = '2020-05-30,America/Los_Angeles';
$date = $parse($date_string);
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-udaf_with_list_zip_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-udaf_with_list_zip_/formatted.sql
index 2219bdd413..3e4afc0e97 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-udaf_with_list_zip_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-udaf_with_list_zip_/formatted.sql
@@ -3,6 +3,7 @@
$lists_2sum = ($l1, $l2) -> (
ListMap(ListZip($l1, $l2), ($x) -> ($x.0 + $x.1))
);
+
$perelement_sum = AGGREGATION_FACTORY(
"UDAF",
($item, $_parent) -> ($item),
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-unicode_literals_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-unicode_literals_/formatted.sql
index ac1238d7de..6b2874f1eb 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-unicode_literals_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-unicode_literals_/formatted.sql
@@ -1,5 +1,6 @@
PRAGMA WarnUntypedStringLiterals;
PRAGMA UnicodeLiterals;
+
$f = () -> {
RETURN (
"a"s,
@@ -11,8 +12,10 @@ $f = () -> {
SELECT
$f()
;
+
PRAGMA DisableWarnUntypedStringLiterals;
PRAGMA DisableUnicodeLiterals;
+
$g = () -> {
RETURN (
"a"s,
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
index 696f7491c9..bc5443de7f 100644
--- 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
@@ -7,6 +7,7 @@ $id = ($x) -> {
);
RETURN $f();
};
+
$vt1 = ParseType("Variant<a:Int32,b:Uint32?>");
$vt2 = ParseType("Variant<b:Int64,c:Uint32>");
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
index 6879b8d1a2..9e7b15c71b 100644
--- 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
@@ -7,6 +7,7 @@ $id = ($x) -> {
);
RETURN $f();
};
+
$vt1 = ParseType("Variant<Int32,Uint32?>");
$vt2 = ParseType("Variant<Int64,Uint32>");
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-yql-10180_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-yql-10180_/formatted.sql
index 5999b61042..b8fc897262 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-yql-10180_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-yql-10180_/formatted.sql
@@ -1,5 +1,6 @@
/* syntax version 1 */
USE plato;
+
$logs_path = "//logs/antirobot-daemon-log2/1d";
$results_path = "//home/antispam/antirobot/sharding_daily";
$logs_per_run = 10;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-yql-15485_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-yql-15485_/formatted.sql
index bc62362de7..f52292de33 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-yql-15485_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_expr-yql-15485_/formatted.sql
@@ -12,6 +12,7 @@ $ages = [
<|suffix: "14-16"u, begin: 14.f, end: 16.f|>,
<|suffix: "16+"u, begin: 16.f, end: 18.f|>,
];
+
$interval_fits_in = ($interval, $other) -> {
$length = $interval.end - $interval.begin;
RETURN IF(
@@ -32,6 +33,7 @@ $interval_fits_in = ($interval, $other) -> {
)
);
};
+
$age_suffixes = ($interval, $age_segments) -> {
RETURN IF(
$interval.end - $interval.begin > 10.f OR $interval.end - $interval.begin < 1e-4f,
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 95b2778eaa..71b43d50cd 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
@@ -9,6 +9,7 @@ FROM (
)
FLATTEN OPTIONAL BY x
;
+
$lst = AsList(1, 2, 3);
SELECT
@@ -43,6 +44,7 @@ FROM (
ORDER BY
x
;
+
$dct = AsDict(AsTuple(1, "foo"), AsTuple(2, "bar"), AsTuple(3, "baz"));
SELECT
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 5b909b9cbb..4d93836793 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
@@ -8,6 +8,7 @@ def save(item):
def load(item):
return item
@@;
+
$save = Python3::save(Callable<(String) -> Resource<Python3>>, $script);
$load = Python3::load(Callable<(Resource<Python3>) -> String>, $script);
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 4523465463..facb8b1675 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
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* postgres can not */
PRAGMA sampleselect;
+
USE plato;
$data_dict = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-basic_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-basic_/formatted.sql
index 21157963b2..33d5e8c838 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-basic_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-basic_/formatted.sql
@@ -4,6 +4,7 @@
/* dqfile can not */
/* yt can not */
PRAGMA FlexibleTypes;
+
$format = ($x) -> (FormatType($x));
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-functions_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-functions_/formatted.sql
index bc32fd343e..ff951c23a0 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-functions_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-functions_/formatted.sql
@@ -5,19 +5,24 @@
/* yt can not */
PRAGMA FlexibleTypes;
PRAGMA warning("disable", "4510");
+
$x1 = () -> (Int32);
$x2 = () -> (Tuple<Int32>);
+
$y1 = () -> {
$a = String;
RETURN $a
};
+
$y2 = () -> {
$a = Tuple<String>;
RETURN $a
};
+
$z1 = () -> {
RETURN Double
};
+
$z2 = () -> {
RETURN Tuple<Double>
};
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-group_by2_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-group_by2_/formatted.sql
index 303dee03e6..3e45fde8f8 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-group_by2_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-group_by2_/formatted.sql
@@ -14,6 +14,7 @@ $groupsrc =
"1" AS key,
"3" AS String
;
+
$foo = ($k, $t) -> (FormatType($t) || '_' || $k);
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-inside_evaluate_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-inside_evaluate_/formatted.sql
index 86656d5466..cb656aa60f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-inside_evaluate_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-inside_evaluate_/formatted.sql
@@ -9,6 +9,7 @@ $do_safe_cast = ($x, $type) -> {
);
RETURN $cast_code($x);
};
+
$do_safe_cast_2 = ($x, $type) -> ($do_safe_cast($x, FormatType($type)));
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-unused_types_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-unused_types_/formatted.sql
index b49725e77d..36ed30f309 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-unused_types_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_flexible_types-unused_types_/formatted.sql
@@ -4,6 +4,7 @@
/* dqfile can not */
/* yt can not */
PRAGMA FlexibleTypes;
+
$format = ($x) -> (FormatType($x));
$src =
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-fuse_multi_outs1_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-fuse_multi_outs1_/formatted.sql
index 2ea5c0bc8b..ce7d14605b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-fuse_multi_outs1_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-fuse_multi_outs1_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
$udf = YQL::@@(lambda '(flow)
(Map flow
(lambda '(item) (block '(
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-fuse_multi_outs2_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-fuse_multi_outs2_/formatted.sql
index 2b0d286842..8db6ccc75d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-fuse_multi_outs2_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-fuse_multi_outs2_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
$udf = YQL::@@(lambda '(flow)
(Map flow
(lambda '(item) (block '(
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-less_outs_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-less_outs_/formatted.sql
index 33e8b57f45..966b76da32 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-less_outs_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-less_outs_/formatted.sql
@@ -35,6 +35,7 @@ $i3 = (
FROM
plato.Input5
);
+
$udf = ($x) -> {
RETURN Yql::VariantItem($x)
};
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-max_outtables_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-max_outtables_/formatted.sql
index 97d99bd7d2..3de7c58227 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-max_outtables_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-max_outtables_/formatted.sql
@@ -42,6 +42,7 @@ $i5 = (
FROM
plato.Input5
);
+
$udf = ($x) -> {
RETURN Yql::VariantItem($x)
};
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-merge_multiouts_all_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-merge_multiouts_all_/formatted.sql
index 49043024a0..a741783591 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-merge_multiouts_all_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-merge_multiouts_all_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
/* syntax version 1 */
/* postgres can not */
$udfScript = @@
@@ -12,7 +13,9 @@ $record = (
FROM
Input
);
+
$recordType = TypeOf(Unwrap($record));
+
$udf = Python::MyFunc(
CallableType(
0,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-merge_multiouts_part_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-merge_multiouts_part_/formatted.sql
index d0e4887a4e..c8cda6f1a2 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-merge_multiouts_part_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-merge_multiouts_part_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
/* syntax version 1 */
/* postgres can not */
$udfScript = @@
@@ -12,7 +13,9 @@ $record = (
FROM
plato.Input
);
+
$recordType = TypeOf(Unwrap($record));
+
$udf = Python::MyFunc(
CallableType(
0,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-merge_multiouts_reuse_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-merge_multiouts_reuse_/formatted.sql
index d2cbd48ba9..75142c65ca 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-merge_multiouts_reuse_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-merge_multiouts_reuse_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
/* syntax version 1 */
/* postgres can not */
$udfScript = @@
@@ -12,7 +13,9 @@ $record = (
FROM
Input
);
+
$recordType = TypeOf(Unwrap($record));
+
$udf = Python::MyFunc(
CallableType(
0,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-out_mem_limit_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-out_mem_limit_/formatted.sql
index 2551cd93ed..d25cbdffdd 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-out_mem_limit_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-out_mem_limit_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* kikimr can not - yt pragma */
USE plato;
+
PRAGMA yt.MaxExtraJobMemoryToFuseOperations = "550m";
PRAGMA yt.CombineCoreLimit = "128m";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-out_table_record_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-out_table_record_/formatted.sql
index 56004da6b9..db78d9d7e4 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-out_table_record_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-out_table_record_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
PRAGMA yt.DisableOptimizers = "HorizontalJoin,MultiHorizontalJoin";
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-runtime_dep_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-runtime_dep_/formatted.sql
index 8014221954..2377e09644 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-runtime_dep_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-runtime_dep_/formatted.sql
@@ -9,6 +9,7 @@ SELECT
FROM
Input
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-sorted_out_mix_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-sorted_out_mix_/formatted.sql
index 671c8351da..3527c96f95 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-sorted_out_mix_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-sorted_out_mix_/formatted.sql
@@ -26,6 +26,7 @@ $i3 = (
FROM
plato.Input3
);
+
$udf = ($x) -> {
RETURN AsStruct(
Yql::Visit(
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-yield_off_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-yield_off_/formatted.sql
index 0359ea626a..c238103f66 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-yield_off_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-yield_off_/formatted.sql
@@ -1,7 +1,9 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
PRAGMA config.flags("UdfSupportsYield", "false");
+
$s = @@
import yql
@@ -9,6 +11,7 @@ def f(input, a):
for x in input:
yield x
@@;
+
$f = Python::f(Callable<(Stream<Struct<key: String, subkey: String, value: String>>, Int32) -> Stream<Struct<key: String, subkey: String, value: String>>>, $s);
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-yield_on_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-yield_on_/formatted.sql
index 4d04f4ee93..2e04478597 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-yield_on_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-yield_on_/formatted.sql
@@ -1,12 +1,15 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
PRAGMA config.flags("UdfSupportsYield", "true");
+
$s = @@
def f(input, a):
for x in input:
yield x
@@;
+
$f = Python::f(Callable<(Stream<Struct<key: String, subkey: String, value: String>>, Int32) -> Stream<Struct<key: String, subkey: String, value: String>>>, $s);
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-yql-12610_old_table_props_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-yql-12610_old_table_props_/formatted.sql
index 171827bb7c..55721a663a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-yql-12610_old_table_props_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-yql-12610_old_table_props_/formatted.sql
@@ -2,6 +2,7 @@
/* syntax version 1 */
/* kikimr can not - yt pragma */
USE plato;
+
PRAGMA yt.UseSystemColumns = "0";
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-yql-6477_table_path_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-yql-6477_table_path_/formatted.sql
index c26c487608..0961f6f190 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-yql-6477_table_path_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-yql-6477_table_path_/formatted.sql
@@ -2,11 +2,14 @@
/* syntax version 1 */
/* kikimr can not - yt pragma */
USE plato;
+
PRAGMA yt.MaxExtraJobMemoryToFuseOperations = "512M";
+
$udfScript = @@
def AsIs(s):
return s
@@;
+
$udf = Python::AsIs(Callable<(String) -> String>, $udfScript);
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-yql19332_aux_cols_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-yql19332_aux_cols_/formatted.sql
index 6744404fa1..fdbef9e7a4 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-yql19332_aux_cols_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_hor_join-yql19332_aux_cols_/formatted.sql
@@ -1,5 +1,6 @@
-- ignore runonopt plan diff
USE plato;
+
PRAGMA DisableSimpleColumns;
PRAGMA yt.JoinMergeTablesLimit = "10";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_ansi_join_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_ansi_join_/formatted.sql
index ee8aee8e6e..3dec26b8c0 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_ansi_join_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_ansi_join_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* postgres can not */
PRAGMA AnsiInForEmptyOrNullableItemsCollections;
+
USE plato;
-- Input: optkeys are 1-10,null
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_noansi_join_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_noansi_join_/formatted.sql
index c71f9219ca..9fbe514124 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_noansi_join_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_noansi_join_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* postgres can not */
PRAGMA DisableAnsiInForEmptyOrNullableItemsCollections;
+
USE plato;
-- Input: optkeys are 1-10,null
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_tablesource_on_raw_list_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_tablesource_on_raw_list_/formatted.sql
index 9975f8e9d8..a2f9221807 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_tablesource_on_raw_list_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_tablesource_on_raw_list_/formatted.sql
@@ -1,5 +1,6 @@
/* syntax version 1 */
USE plato;
+
PRAGMA AnsiInForEmptyOrNullableItemsCollections;
$src = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_with_table_of_tuples_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_with_table_of_tuples_/formatted.sql
index 2f63b436c2..06eb64b2f1 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_with_table_of_tuples_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-in_with_table_of_tuples_/formatted.sql
@@ -1,5 +1,6 @@
/* postgres can not */
USE plato;
+
$t1 = AsList(
AsStruct(75 AS key, 1 AS subkey),
AsStruct(800 AS key, 2 AS subkey)
@@ -11,6 +12,7 @@ SELECT
FROM
AS_TABLE($t1)
;
+
COMMIT;
$tuples = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-yql-10038_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-yql-10038_/formatted.sql
index fada497299..7662ea7674 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-yql-10038_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-yql-10038_/formatted.sql
@@ -7,6 +7,7 @@ SELECT
"touch" AS ui,
AsList(1, 2, 236273) AS test_ids
;
+
COMMIT;
$dict = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-yql-14677_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-yql-14677_/formatted.sql
index a44b1ab621..1bbbd516c5 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-yql-14677_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_in-yql-14677_/formatted.sql
@@ -1,5 +1,6 @@
/* postgres can not */
USE plato;
+
PRAGMA yt.MapJoinLimit = "1m";
$l1 =
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-anonymous_tables_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-anonymous_tables_/formatted.sql
index d1acaeb487..80565b0edd 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-anonymous_tables_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-anonymous_tables_/formatted.sql
@@ -1,5 +1,6 @@
/* postgres can not */
USE plato;
+
PRAGMA yt.MapJoinLimit = "1M";
INSERT INTO @a
@@ -8,6 +9,7 @@ SELECT
FROM
Input
;
+
COMMIT;
SELECT
@@ -29,4 +31,5 @@ FROM
CROSS JOIN
@a AS b
;
+
COMMIT;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-append_after_replace_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-append_after_replace_/formatted.sql
index a60c7972dd..c77e722366 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-append_after_replace_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-append_after_replace_/formatted.sql
@@ -13,6 +13,7 @@ SELECT
FROM
plato.Input
;
+
COMMIT;
INSERT INTO plato.Output (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-append_missing_null_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-append_missing_null_/formatted.sql
index f105a76523..a86617562d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-append_missing_null_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-append_missing_null_/formatted.sql
@@ -6,12 +6,14 @@ SELECT
NULL AS x,
1 AS y
;
+
COMMIT;
INSERT INTO @foo
SELECT
2 AS y
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-double_append_to_anonymous_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-double_append_to_anonymous_/formatted.sql
index 16b4c5b40b..2e92956f45 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-double_append_to_anonymous_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-double_append_to_anonymous_/formatted.sql
@@ -6,6 +6,7 @@ SELECT
1 AS id,
"qwer" AS val
;
+
COMMIT;
INSERT INTO @tmp
@@ -13,6 +14,7 @@ SELECT
2 AS id,
"asdf" AS val
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-fail_read_view_after_modify_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-fail_read_view_after_modify_/formatted.sql
index 7913ccdcaa..790eb9a558 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-fail_read_view_after_modify_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-fail_read_view_after_modify_/formatted.sql
@@ -7,6 +7,7 @@ SELECT
FROM
plato.Input
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-from_two_sorted_by_calc_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-from_two_sorted_by_calc_/formatted.sql
index 983ca3ee55..2319c67291 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-from_two_sorted_by_calc_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-from_two_sorted_by_calc_/formatted.sql
@@ -18,6 +18,7 @@ FROM
ORDER BY
key || "2"
;
+
COMMIT;
INSERT INTO Output
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-merge_publish_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-merge_publish_/formatted.sql
index 784a5b53a6..eda9f13211 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-merge_publish_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-merge_publish_/formatted.sql
@@ -2,6 +2,7 @@
/* kikimr can not */
/* ignore plan diff */
USE plato;
+
PRAGMA yt.ScriptCpu = "1.0";
INSERT INTO Output1
@@ -39,6 +40,7 @@ SELECT
FROM
Input
;
+
PRAGMA yt.ScriptCpu = "2.0";
INSERT INTO Output1
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-multiappend_sorted_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-multiappend_sorted_/formatted.sql
index 554b8f3107..7830fdaaf7 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-multiappend_sorted_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-multiappend_sorted_/formatted.sql
@@ -15,6 +15,7 @@ SELECT
FROM
plato.Input
;
+
COMMIT;
----------------------------------------
@@ -33,6 +34,7 @@ FROM
ORDER BY
key
;
+
COMMIT;
----------------------------------------
@@ -55,6 +57,7 @@ ORDER BY
key,
subkey
;
+
COMMIT;
----------------------------------------
@@ -75,6 +78,7 @@ FROM
ORDER BY
key DESC
;
+
COMMIT;
----------------------------------------
@@ -95,6 +99,7 @@ FROM
ORDER BY
key || subkey
;
+
COMMIT;
----------------------------------------
@@ -115,6 +120,7 @@ FROM
ORDER BY
key DESC
;
+
COMMIT;
----------------------------------------
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-replace_inferred_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-replace_inferred_/formatted.sql
index e15609ebba..2f66f4e84c 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-replace_inferred_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-replace_inferred_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* kikimr can not */
USE plato;
+
PRAGMA yt.InferSchema;
PRAGMA yt.InferSchemaTableCountThreshold = "100000";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-replace_inferred_op_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-replace_inferred_op_/formatted.sql
index 3e5911f3e2..6f17c70ac6 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-replace_inferred_op_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-replace_inferred_op_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* kikimr can not */
USE plato;
+
PRAGMA yt.InferSchema;
PRAGMA yt.InferSchemaTableCountThreshold = "0";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-select_after_insert_relabeled_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-select_after_insert_relabeled_/formatted.sql
index 93af75a0eb..2888e0e326 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-select_after_insert_relabeled_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-select_after_insert_relabeled_/formatted.sql
@@ -15,6 +15,7 @@ SELECT
FROM
plato.Input
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-select_after_replace_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-select_after_replace_/formatted.sql
index ef6bc0709d..7c52ef850c 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-select_after_replace_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-select_after_replace_/formatted.sql
@@ -13,6 +13,7 @@ SELECT
FROM
plato.Input
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-select_after_replace_unwrap_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-select_after_replace_unwrap_/formatted.sql
index 993c5c2661..1c226fe452 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-select_after_replace_unwrap_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_insert-select_after_replace_unwrap_/formatted.sql
@@ -13,6 +13,7 @@ SELECT
FROM
plato.Input
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-aggr_diff_order_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-aggr_diff_order_/formatted.sql
index b9e8b09a05..c9e46caf35 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-aggr_diff_order_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-aggr_diff_order_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA yt.JoinMergeForce = "1";
PRAGMA yt.JoinMergeTablesLimit = "10";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-alias_where_group_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-alias_where_group_/formatted.sql
index 6e18e0e0f5..a725f6ae98 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-alias_where_group_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-alias_where_group_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA DisableSimpleColumns;
+
/* postgres can not */
USE plato;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-anyjoin_common_dup_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-anyjoin_common_dup_/formatted.sql
index ea10bc8209..1586f14a59 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-anyjoin_common_dup_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-anyjoin_common_dup_/formatted.sql
@@ -1,5 +1,6 @@
/* syntax version 1 */
PRAGMA DisableSimpleColumns;
+
USE plato;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-anyjoin_common_nodata_keys_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-anyjoin_common_nodata_keys_/formatted.sql
index 7e6cb7f551..cd5afcfaa7 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-anyjoin_common_nodata_keys_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-anyjoin_common_nodata_keys_/formatted.sql
@@ -34,6 +34,7 @@ SELECT
FROM
$b
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-anyjoin_common_nodup_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-anyjoin_common_nodup_/formatted.sql
index ea10bc8209..1586f14a59 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-anyjoin_common_nodup_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-anyjoin_common_nodup_/formatted.sql
@@ -1,5 +1,6 @@
/* syntax version 1 */
PRAGMA DisableSimpleColumns;
+
USE plato;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-anyjoin_merge_nodup_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-anyjoin_merge_nodup_/formatted.sql
index 21bbf39606..9f90112ec3 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-anyjoin_merge_nodup_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-anyjoin_merge_nodup_/formatted.sql
@@ -1,6 +1,8 @@
/* syntax version 1 */
PRAGMA DisableSimpleColumns;
+
USE plato;
+
PRAGMA yt.JoinMergeTablesLimit = "10";
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-bush_dis_in_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-bush_dis_in_/formatted.sql
index 57a06b6c23..e67cac6de2 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-bush_dis_in_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-bush_dis_in_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA DisableSimpleColumns;
+
USE plato;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-bush_dis_in_in_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-bush_dis_in_in_/formatted.sql
index 1dc2ed1a56..5a34a344b8 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-bush_dis_in_in_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-bush_dis_in_in_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA DisableSimpleColumns;
+
USE plato;
SELECT DISTINCT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-bush_dis_in_in_in_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-bush_dis_in_in_in_/formatted.sql
index 251253d7da..86af01e590 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-bush_dis_in_in_in_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-bush_dis_in_in_in_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA DisableSimpleColumns;
+
USE plato;
SELECT DISTINCT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-bush_in_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-bush_in_/formatted.sql
index 79f6cead86..3213221b36 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-bush_in_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-bush_in_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA DisableSimpleColumns;
+
USE plato;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-bush_in_in_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-bush_in_in_/formatted.sql
index 3db8f97bcd..e466765c1f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-bush_in_in_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-bush_in_in_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA DisableSimpleColumns;
+
USE plato;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-bush_in_in_in_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-bush_in_in_in_/formatted.sql
index 8efa3bafda..9251fe3ad6 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-bush_in_in_in_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-bush_in_in_in_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA DisableSimpleColumns;
+
USE plato;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-cbo_4tables_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-cbo_4tables_/formatted.sql
index 6e5a4b9bda..79e2d29e8d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-cbo_4tables_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-cbo_4tables_/formatted.sql
@@ -1,6 +1,8 @@
/* ytfile can not */
USE plato;
+
PRAGMA warning("disable", "8001");
+
-- CBO_MISSING_TABLE_STATS
PRAGMA CostBasedOptimizer = "native";
PRAGMA yt.MapJoinLimit = "1000";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-cbo_4tables_only_sorted_merge_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-cbo_4tables_only_sorted_merge_/formatted.sql
index 5f849bd0cb..5f6c388ecb 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-cbo_4tables_only_sorted_merge_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-cbo_4tables_only_sorted_merge_/formatted.sql
@@ -1,6 +1,8 @@
/* ytfile can not */
USE plato;
+
PRAGMA warning("disable", "8001");
+
-- CBO_MISSING_TABLE_STATS
PRAGMA CostBasedOptimizer = "native";
PRAGMA yt.MapJoinLimit = "1000";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-convert_check_key_mem2_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-convert_check_key_mem2_/formatted.sql
index c2e81ac147..1662d325d5 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-convert_check_key_mem2_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-convert_check_key_mem2_/formatted.sql
@@ -1,10 +1,12 @@
/* postgres can not */
PRAGMA DisableSimpleColumns;
+
$a = AsList(
AsStruct(255ut AS K, 1 AS V),
AsStruct(127ut AS K, 2 AS V),
AsStruct(0ut AS K, 3 AS V)
);
+
$b = AsList(
AsStruct(Int8("-1") AS K, 1 AS V),
AsStruct(Int8("127") AS K, 2 AS V),
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-convert_check_key_mem_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-convert_check_key_mem_/formatted.sql
index 31d31c6344..3a8c0df775 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-convert_check_key_mem_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-convert_check_key_mem_/formatted.sql
@@ -1,21 +1,25 @@
PRAGMA DisableSimpleColumns;
+
/* postgres can not */
$a = AsList(
AsStruct(255ut AS K, 1 AS V),
AsStruct(127ut AS K, 2 AS V),
AsStruct(0ut AS K, 3 AS V)
);
+
$b = AsList(
AsStruct(Int8("-1") AS K, 1u AS V),
AsStruct(Int8("127") AS K, 2u AS V),
AsStruct(Int8("0") AS K, 3u AS V)
);
+
$aopt = AsList(
AsStruct(Just(255ut) AS K, 1 AS V),
AsStruct(Just(127ut) AS K, 2 AS V),
AsStruct(Just(0ut) AS K, 3 AS V),
AsStruct(Nothing(ParseType("Uint8?")) AS K, 2 AS V)
);
+
$bopt = AsList(
AsStruct(Just(Int8("-1")) AS K, 1u AS V),
AsStruct(Just(Int8("127")) AS K, 2u AS V),
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-convert_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-convert_key_/formatted.sql
index b72672fe03..7f016b0a25 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-convert_key_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-convert_key_/formatted.sql
@@ -1,5 +1,6 @@
/* postgres can not */
USE plato;
+
PRAGMA SimpleColumns;
PRAGMA yt.MapJoinLimit = "1m";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-count_bans_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-count_bans_/formatted.sql
index f3f8594e1a..7bd2ea6375 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-count_bans_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-count_bans_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA DisableSimpleColumns;
+
/* postgres can not */
USE plato;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-cross_join_with_lazy_list_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-cross_join_with_lazy_list_/formatted.sql
index 9ca2ceeff1..344e5f9fd2 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-cross_join_with_lazy_list_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-cross_join_with_lazy_list_/formatted.sql
@@ -1,4 +1,5 @@
$list = AsList(AsStruct('one' AS x), AsStruct('two' AS x));
+
$lazy = ListMap(
ListFromRange(1s, 3s), ($i) -> {
RETURN AsStruct($i AS y)
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-do_not_suppres_equijoin_input_sorts_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-do_not_suppres_equijoin_input_sorts_/formatted.sql
index e0434f6d7e..ecfb6a38ec 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-do_not_suppres_equijoin_input_sorts_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-do_not_suppres_equijoin_input_sorts_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA yt.JoinMergeTablesLimit = "10";
PRAGMA DisableSimpleColumns;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-emptyjoin_unused_keys_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-emptyjoin_unused_keys_/formatted.sql
index 8da1ee69ed..1055744553 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-emptyjoin_unused_keys_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-emptyjoin_unused_keys_/formatted.sql
@@ -7,6 +7,7 @@ SELECT
'' AS v1,
'' AS u1
LIMIT 0;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-filter_joined_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-filter_joined_/formatted.sql
index 392f41f304..9b309ecd57 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-filter_joined_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-filter_joined_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA DisableSimpleColumns;
+
USE plato;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-flatten_columns1_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-flatten_columns1_/formatted.sql
index 4744d2a4be..08ceeecd00 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-flatten_columns1_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-flatten_columns1_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA DisableSimpleColumns;
+
/* postgres can not */
USE plato;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-flatten_columns2_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-flatten_columns2_/formatted.sql
index d5de96bb7e..f91c358e22 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-flatten_columns2_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-flatten_columns2_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA DisableSimpleColumns;
+
/* postgres can not */
USE plato;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-force_merge_join_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-force_merge_join_/formatted.sql
index 6f759e997a..bf7f755535 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-force_merge_join_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-force_merge_join_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA yt.JoinMergeForce = "1";
PRAGMA yt.JoinMergeTablesLimit = "10";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-full_join_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-full_join_/formatted.sql
index 30b0ee79be..d439d3a7f0 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-full_join_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-full_join_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA DisableSimpleColumns;
+
/* postgres can not */
USE plato;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-grace_join1_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-grace_join1_/formatted.sql
index 7cc0cf34b2..b1192a9d83 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-grace_join1_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-grace_join1_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA DisableSimpleColumns;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-grace_join2_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-grace_join2_/formatted.sql
index 717fa6b95d..5e0b18db33 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-grace_join2_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-grace_join2_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA DisableSimpleColumns;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-group_compact_by_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-group_compact_by_/formatted.sql
index 87ea0df91b..286293f75e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-group_compact_by_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-group_compact_by_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA yt.JoinMergeForce = "1";
PRAGMA yt.JoinMergeTablesLimit = "10";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-inmem_by_uncomparable_structs_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-inmem_by_uncomparable_structs_/formatted.sql
index d779d40aec..34eb8d2033 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-inmem_by_uncomparable_structs_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-inmem_by_uncomparable_structs_/formatted.sql
@@ -3,6 +3,7 @@ $l = [
<|Key: <|a: 1, b: 2, c: NULL|>, Lhs: "1,2,#"|>,
<|Key: <|a: 2, b: 3, c: NULL|>, Lhs: "4,5,#"|>,
];
+
$r = [
<|Key: <|a: 1, b: 2, c: 3|>, Rhs: "1,2,3"|>,
<|Key: <|a: 4, b: 5, c: 6|>, Rhs: "4,5,6"|>,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-inmem_by_uncomparable_tuples_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-inmem_by_uncomparable_tuples_/formatted.sql
index d7537c88d7..76ede21529 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-inmem_by_uncomparable_tuples_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-inmem_by_uncomparable_tuples_/formatted.sql
@@ -3,6 +3,7 @@ $l = AsList(
AsStruct(AsTuple(1, 2, 3) AS Key, "1,2,3" AS Lhs),
AsStruct(AsTuple(1, 2, 4) AS Key, "1,2,4" AS Lhs)
);
+
$r = AsList(
AsStruct(AsTuple(1, 2) AS Key, "1,2" AS Rhs),
AsStruct(AsTuple(2, 3) AS Key, "2,3" AS Rhs)
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-inmem_with_set_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-inmem_with_set_key_/formatted.sql
index 7157c1554b..a1c5746556 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-inmem_with_set_key_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-inmem_with_set_key_/formatted.sql
@@ -1,5 +1,6 @@
/* syntax version 1 */
PRAGMA DisableSimpleColumns;
+
$one = [<|'a': {"1"}, 'b': 2|>, <|'a': {"2"}, 'b': 3|>, <|'a': {"3"}, 'b': 4|>, <|'a': {"1"}, 'b': 8|>];
$two = [<|'c': {Just("1")}, 'd': 2|>, <|'c': {}, 'd': 3|>, <|'c': NULL, 'd': 4|>, <|'c': {Just("1")}, 'd': 9|>];
$foo = [<|'e': {"1"u}, 'f': -2|>, <|'e': {"1"u, "2"u}, 'f': -3|>, <|'e': NULL, 'f': -4|>, <|'e': {"1"u}, 'f': -9|>];
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-inmem_with_set_key_any_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-inmem_with_set_key_any_/formatted.sql
index 9802c3d2f3..6a39b53592 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-inmem_with_set_key_any_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-inmem_with_set_key_any_/formatted.sql
@@ -1,5 +1,6 @@
/* syntax version 1 */
PRAGMA DisableSimpleColumns;
+
$one = [<|'a': {"1"}, 'b': 2|>, <|'a': {"2"}, 'b': 3|>, <|'a': {"3"}, 'b': 4|>, <|'a': {"1"}, 'b': 8|>];
$two = [<|'c': {Just("1")}, 'd': 2|>, <|'c': {}, 'd': 3|>, <|'c': NULL, 'd': 4|>, <|'c': {Just("1")}, 'd': 9|>];
$foo = [<|'e': {"1"u}, 'f': -2|>, <|'e': {"1"u, "2"u}, 'f': -3|>, <|'e': NULL, 'f': -4|>, <|'e': {"1"u}, 'f': -9|>];
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-inner_all_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-inner_all_/formatted.sql
index 8090875bb6..1887eaefa8 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-inner_all_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-inner_all_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA DisableSimpleColumns;
+
USE plato;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-inner_all_right_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-inner_all_right_/formatted.sql
index b707d2b803..b631926585 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-inner_all_right_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-inner_all_right_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA DisableSimpleColumns;
+
USE plato;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_cbo_3_tables_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_cbo_3_tables_/formatted.sql
index 6401878be3..29ca503a07 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_cbo_3_tables_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_cbo_3_tables_/formatted.sql
@@ -1,5 +1,7 @@
USE plato;
+
PRAGMA warning("disable", "8001");
+
-- CBO_MISSING_TABLE_STATS
PRAGMA CostBasedOptimizer = "pg";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_comp_common_table_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_comp_common_table_/formatted.sql
index 8fdd587176..d56bafe9cd 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_comp_common_table_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_comp_common_table_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA DisableSimpleColumns;
+
/* postgres can not */
USE plato;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_comp_map_table_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_comp_map_table_/formatted.sql
index ffe30c27b4..554ed34ef6 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_comp_map_table_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_comp_map_table_/formatted.sql
@@ -1,6 +1,8 @@
PRAGMA DisableSimpleColumns;
+
/* postgres can not */
PRAGMA yt.MapJoinLimit = "1m";
+
USE plato;
$i = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_key_cmp_udf_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_key_cmp_udf_/formatted.sql
index f86758163c..35ce707ccc 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_key_cmp_udf_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_key_cmp_udf_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA DisableSimpleColumns;
+
/* postgres can not */
USE plato;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_left_cbo_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_left_cbo_/formatted.sql
index 4c64fb6a46..db413031ed 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_left_cbo_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_left_cbo_/formatted.sql
@@ -1,5 +1,7 @@
USE plato;
+
PRAGMA warning("disable", "8001");
+
-- CBO_MISSING_TABLE_STATS
PRAGMA CostBasedOptimizer = "PG";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_no_correlation_in_order_by_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_no_correlation_in_order_by_/formatted.sql
index 43d0eb3955..9f5d8284a4 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_no_correlation_in_order_by_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_no_correlation_in_order_by_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA DisableSimpleColumns;
+
/* postgres can not */
USE plato;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_right_cbo_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_right_cbo_/formatted.sql
index 8104aef510..51987f23bf 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_right_cbo_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_right_cbo_/formatted.sql
@@ -1,5 +1,7 @@
USE plato;
+
PRAGMA warning("disable", "8001");
+
-- CBO_MISSING_TABLE_STATS
PRAGMA CostBasedOptimizer = "PG";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_semi_correlation_in_order_by_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_semi_correlation_in_order_by_/formatted.sql
index 2f99595771..89058b5443 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_semi_correlation_in_order_by_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_semi_correlation_in_order_by_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA DisableSimpleColumns;
+
/* postgres can not */
USE plato;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_table_conflict_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_table_conflict_fail_/formatted.sql
index dd617a33e8..1776cecfaa 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_table_conflict_fail_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_table_conflict_fail_/formatted.sql
@@ -1,5 +1,6 @@
/* custom error:column name: value conflicted without correlation name it may be one of: Input.value, d.value*/
PRAGMA DisableSimpleColumns;
+
USE plato;
$data = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_with_duplicate_keys_on_sorted_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_with_duplicate_keys_on_sorted_/formatted.sql
index fc745377c9..63b94cc356 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_with_duplicate_keys_on_sorted_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_with_duplicate_keys_on_sorted_/formatted.sql
@@ -1,5 +1,7 @@
PRAGMA DisableSimpleColumns;
+
USE plato;
+
PRAGMA yt.JoinMergeTablesLimit = "10";
PRAGMA yt.JoinMergeUnsortedFactor = "3.0";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_without_column_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_without_column_/formatted.sql
index f282b6728d..245a48c748 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_without_column_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_without_column_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA DisableSimpleColumns;
+
/* postgres can not */
USE plato;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_without_correlation_and_dict_access_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_without_correlation_and_dict_access_/formatted.sql
index 804dfb4419..859e5b9e87 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_without_correlation_and_dict_access_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_without_correlation_and_dict_access_/formatted.sql
@@ -1,5 +1,6 @@
/* syntax version 1 */
PRAGMA DisableSimpleColumns;
+
/* postgres can not */
USE plato;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_without_correlation_and_struct_access_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_without_correlation_and_struct_access_/formatted.sql
index a4f6de7251..1b1e9fbd4a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_without_correlation_and_struct_access_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_without_correlation_and_struct_access_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA DisableSimpleColumns;
+
/* postgres can not */
USE plato;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_without_correlation_names_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_without_correlation_names_/formatted.sql
index a6b34b6ee1..731d392779 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_without_correlation_names_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-join_without_correlation_names_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA DisableSimpleColumns;
+
/* postgres can not */
USE plato;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-late_mergejoin_on_empty_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-late_mergejoin_on_empty_/formatted.sql
index bf0942669d..88b441524b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-late_mergejoin_on_empty_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-late_mergejoin_on_empty_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA DisableSimpleColumns;
PRAGMA yt.JoinMergeTablesLimit = "100";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_all_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_all_/formatted.sql
index 0d1a4d9a8d..968dceb50b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_all_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_all_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA DisableSimpleColumns;
+
USE plato;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_join_null_column_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_join_null_column_/formatted.sql
index e30cc3fa5d..2fce2e7420 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_join_null_column_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_join_null_column_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
$t = [<|"x": "150", "y": 1, "z": NULL|>, <|"x": "150", "y": 2, "z": NULL|>];
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_join_right_pushdown_simple_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_join_right_pushdown_simple_/formatted.sql
index 38055bb3f0..d070fd82bc 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_join_right_pushdown_simple_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_join_right_pushdown_simple_/formatted.sql
@@ -1,5 +1,6 @@
PRAGMA DisableSimpleColumns;
PRAGMA FilterPushdownOverJoinOptionalSide;
+
USE plato;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_null_literal_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_null_literal_/formatted.sql
index 4b0e9da8ae..ee0410e0c1 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_null_literal_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_null_literal_/formatted.sql
@@ -1,5 +1,6 @@
/* syntax version 1 */
USE plato;
+
$foo = [<|"x": 1|>];
$bar = [<|"x": 1, "y": NULL|>];
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_only_semi_and_other_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_only_semi_and_other_/formatted.sql
index 8ac7bbbeb0..9fe8aba8e9 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_only_semi_and_other_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_only_semi_and_other_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA DisableSimpleColumns;
+
/* postgres can not */
USE plato;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_only_with_other_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_only_with_other_/formatted.sql
index 93fa3dc5f5..01a3d0e69a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_only_with_other_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_only_with_other_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA DisableSimpleColumns;
+
/* postgres can not */
USE plato;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_semi_with_other_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_semi_with_other_/formatted.sql
index 020c854b1d..b30e35271b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_semi_with_other_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-left_semi_with_other_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA DisableSimpleColumns;
+
/* postgres can not */
USE plato;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_bug7646_csee_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_bug7646_csee_/formatted.sql
index 0f4354c6e2..779f51f46a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_bug7646_csee_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_bug7646_csee_/formatted.sql
@@ -1,16 +1,20 @@
/* ignore runonopt plan diff */
USE plato;
+
PRAGMA DisableSimpleColumns;
PRAGMA yt.LookupJoinLimit = "64k";
PRAGMA yt.LookupJoinMaxRows = "100";
+
$campaigns_data = AsList(
AsStruct(Just(1) AS id),
AsStruct(Just(2) AS id)
);
+
$strategies_data = AsList(
AsStruct(Just(1) AS id),
AsStruct(Just(2) AS id)
);
+
$lottery_data = AsList(
AsStruct(Just(1) AS id, Just(2) AS campaign_id, Just(3) AS strategy_id)
);
@@ -41,6 +45,7 @@ FROM
ORDER BY
id
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_bug7646_subst_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_bug7646_subst_/formatted.sql
index 180c4553fe..921e1afc3a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_bug7646_subst_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_bug7646_subst_/formatted.sql
@@ -1,15 +1,19 @@
USE plato;
+
PRAGMA DisableSimpleColumns;
PRAGMA yt.LookupJoinLimit = "64k";
PRAGMA yt.LookupJoinMaxRows = "100";
+
$campaigns_data = AsList(
AsStruct(Just(1) AS id),
AsStruct(Just(2) AS id)
);
+
$strategies_data = AsList(
AsStruct(Just(1) AS id),
AsStruct(Just(2) AS id)
);
+
$lottery_data = AsList(
AsStruct(Just(1) AS id, Just(2) AS campaign_id, Just(3) AS strategy_id)
);
@@ -40,6 +44,7 @@ FROM
ORDER BY
id
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_bug8533_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_bug8533_/formatted.sql
index 662d7e7893..db0bc4ba83 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_bug8533_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_bug8533_/formatted.sql
@@ -1,6 +1,8 @@
/* syntax version 1 */
PRAGMA DisableSimpleColumns;
+
USE plato;
+
PRAGMA yt.LookupJoinLimit = "64k";
PRAGMA yt.LookupJoinMaxRows = "100";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_inner_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_inner_/formatted.sql
index 8b53ecc6d5..ca2f4862ca 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_inner_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_inner_/formatted.sql
@@ -1,5 +1,7 @@
PRAGMA DisableSimpleColumns;
+
USE plato;
+
PRAGMA yt.LookupJoinLimit = "64k";
PRAGMA yt.LookupJoinMaxRows = "100";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_inner_1o2o_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_inner_1o2o_/formatted.sql
index 8b53ecc6d5..ca2f4862ca 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_inner_1o2o_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_inner_1o2o_/formatted.sql
@@ -1,5 +1,7 @@
PRAGMA DisableSimpleColumns;
+
USE plato;
+
PRAGMA yt.LookupJoinLimit = "64k";
PRAGMA yt.LookupJoinMaxRows = "100";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_inner_1o_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_inner_1o_/formatted.sql
index 8b53ecc6d5..ca2f4862ca 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_inner_1o_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_inner_1o_/formatted.sql
@@ -1,5 +1,7 @@
PRAGMA DisableSimpleColumns;
+
USE plato;
+
PRAGMA yt.LookupJoinLimit = "64k";
PRAGMA yt.LookupJoinMaxRows = "100";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_inner_2o_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_inner_2o_/formatted.sql
index 8b53ecc6d5..ca2f4862ca 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_inner_2o_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_inner_2o_/formatted.sql
@@ -1,5 +1,7 @@
PRAGMA DisableSimpleColumns;
+
USE plato;
+
PRAGMA yt.LookupJoinLimit = "64k";
PRAGMA yt.LookupJoinMaxRows = "100";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_inner_empty_subq_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_inner_empty_subq_/formatted.sql
index 56a3026489..42dc20fde9 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_inner_empty_subq_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_inner_empty_subq_/formatted.sql
@@ -1,5 +1,7 @@
PRAGMA DisableSimpleColumns;
+
USE plato;
+
PRAGMA yt.LookupJoinLimit = "64k";
PRAGMA yt.LookupJoinMaxRows = "100";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_not_selected_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_not_selected_/formatted.sql
index 1c8155fdd5..181cf26661 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_not_selected_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_not_selected_/formatted.sql
@@ -1,5 +1,7 @@
PRAGMA DisableSimpleColumns;
+
USE plato;
+
PRAGMA yt.LookupJoinLimit = "64k";
PRAGMA yt.LookupJoinMaxRows = "100";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_semi_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_semi_/formatted.sql
index 03a3bb20c8..9f1b8b92b7 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_semi_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_semi_/formatted.sql
@@ -1,5 +1,7 @@
PRAGMA DisableSimpleColumns;
+
USE plato;
+
PRAGMA yt.LookupJoinLimit = "64k";
PRAGMA yt.LookupJoinMaxRows = "100";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_semi_1o2o_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_semi_1o2o_/formatted.sql
index 03a3bb20c8..9f1b8b92b7 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_semi_1o2o_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_semi_1o2o_/formatted.sql
@@ -1,5 +1,7 @@
PRAGMA DisableSimpleColumns;
+
USE plato;
+
PRAGMA yt.LookupJoinLimit = "64k";
PRAGMA yt.LookupJoinMaxRows = "100";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_semi_1o_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_semi_1o_/formatted.sql
index 03a3bb20c8..9f1b8b92b7 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_semi_1o_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_semi_1o_/formatted.sql
@@ -1,5 +1,7 @@
PRAGMA DisableSimpleColumns;
+
USE plato;
+
PRAGMA yt.LookupJoinLimit = "64k";
PRAGMA yt.LookupJoinMaxRows = "100";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_semi_2o_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_semi_2o_/formatted.sql
index 03a3bb20c8..9f1b8b92b7 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_semi_2o_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_semi_2o_/formatted.sql
@@ -1,5 +1,7 @@
PRAGMA DisableSimpleColumns;
+
USE plato;
+
PRAGMA yt.LookupJoinLimit = "64k";
PRAGMA yt.LookupJoinMaxRows = "100";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_semi_empty_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_semi_empty_/formatted.sql
index 03a3bb20c8..9f1b8b92b7 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_semi_empty_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_semi_empty_/formatted.sql
@@ -1,5 +1,7 @@
PRAGMA DisableSimpleColumns;
+
USE plato;
+
PRAGMA yt.LookupJoinLimit = "64k";
PRAGMA yt.LookupJoinMaxRows = "100";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_semi_subq_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_semi_subq_/formatted.sql
index 1ecd96516d..ea7daa1384 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_semi_subq_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_semi_subq_/formatted.sql
@@ -1,5 +1,7 @@
PRAGMA DisableSimpleColumns;
+
USE plato;
+
PRAGMA yt.LookupJoinLimit = "64k";
PRAGMA yt.LookupJoinMaxRows = "100";
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 7c716ee7ed..3cb4d77436 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
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA yt.LookupJoinMaxRows = "3";
PRAGMA yt.LookupJoinLimit = '10M';
@@ -13,6 +14,7 @@ FROM (
ORDER BY
key
;
+
COMMIT;
$small =
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_unused_keys_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_unused_keys_/formatted.sql
index 37100655b8..fa98f9394f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_unused_keys_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_unused_keys_/formatted.sql
@@ -1,5 +1,6 @@
/* syntax version 1 */
USE plato;
+
PRAGMA yt.LookupJoinLimit = "64k";
PRAGMA yt.LookupJoinMaxRows = "100";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_with_cache_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_with_cache_/formatted.sql
index 35eec96b19..b3bf40b7ca 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_with_cache_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-lookupjoin_with_cache_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* kikimr can not */
USE plato;
+
PRAGMA DisableSimpleColumns;
PRAGMA yt.LookupJoinLimit = "64k";
PRAGMA yt.LookupJoinMaxRows = "100";
@@ -17,6 +18,7 @@ WHERE
ORDER BY
key
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_dup_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_dup_key_/formatted.sql
index ca1241d318..0f68e20bbd 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_dup_key_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_dup_key_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
/* postgres can not */
/* kikimr can not */
PRAGMA DisableSimpleColumns;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_early_rewrite_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_early_rewrite_/formatted.sql
index 4d0a7ee2a1..1d001f769b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_early_rewrite_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_early_rewrite_/formatted.sql
@@ -1,5 +1,6 @@
/* postgres can not */
USE plato;
+
PRAGMA DisableSimpleColumns;
PRAGMA yt.MapJoinLimit = "1m";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_early_rewrite_sequence_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_early_rewrite_sequence_/formatted.sql
index 1335f64860..374ad0da19 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_early_rewrite_sequence_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_early_rewrite_sequence_/formatted.sql
@@ -1,5 +1,6 @@
/* postgres can not */
USE plato;
+
PRAGMA DisableSimpleColumns;
PRAGMA yt.MapJoinLimit = "1m";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_early_rewrite_star_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_early_rewrite_star_/formatted.sql
index c4dba0370d..f98fdfd2ac 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_early_rewrite_star_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_early_rewrite_star_/formatted.sql
@@ -1,5 +1,6 @@
/* postgres can not */
USE plato;
+
PRAGMA DisableSimpleColumns;
PRAGMA yt.MapJoinLimit = "1m";
PRAGMA yt.JoinEnableStarJoin = "true";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_left_null_column_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_left_null_column_/formatted.sql
index 9cc1a8cd94..599d5a9bae 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_left_null_column_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_left_null_column_/formatted.sql
@@ -1,7 +1,9 @@
/* syntax version 1 */
/* postgres can not */
PRAGMA yt.MapJoinLimit = "1m";
+
USE plato;
+
$t = [<|"x": "150", "y": 1, "z": NULL|>, <|"x": "150", "y": 2, "z": NULL|>];
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_on_complex_type_non_optional_left_only_single_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_on_complex_type_non_optional_left_only_single_/formatted.sql
index df37cb3370..2451e73c92 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_on_complex_type_non_optional_left_only_single_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_on_complex_type_non_optional_left_only_single_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
$t = [<|"key1": "1", "subkey1": "a", "key": "1", "subkey": "a", "value": "value2_1"|>, <|"key1": "4", "subkey1": "d", "key": "4", "subkey": "d", "value": "value2_4"|>, <|"key1": "-5", "subkey1": "e", "key": "-5", "subkey": "e", "value": "value2_5"|>];
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_on_complex_type_optional_left_only_single_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_on_complex_type_optional_left_only_single_/formatted.sql
index 0d69adfc4f..36ab687215 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_on_complex_type_optional_left_only_single_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_on_complex_type_optional_left_only_single_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
$t = [<|"key": "1", "subkey": "a", "value": "value2_1"|>, <|"key": "4", "subkey": "d", "value": "value2_4"|>, <|"key": "-5", "subkey": "e", "value": "value2_5"|>];
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_on_complex_type_optional_left_semi_many_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_on_complex_type_optional_left_semi_many_/formatted.sql
index 5cb3542d0b..de2d5fe588 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_on_complex_type_optional_left_semi_many_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_on_complex_type_optional_left_semi_many_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
$t = [<|"key1": "1", "subkey1": "a", "key": "1", "subkey": "a", "value": "value2_1"|>, <|"key1": "4", "subkey1": "d", "key": "4", "subkey": "d", "value": "value2_4"|>, <|"key1": "-5", "subkey1": "e", "key": "-5", "subkey": "e", "value": "value2_5"|>];
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_on_complex_type_optional_left_semi_single_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_on_complex_type_optional_left_semi_single_/formatted.sql
index 0ea4465f03..109adb6bf6 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_on_complex_type_optional_left_semi_single_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_on_complex_type_optional_left_semi_single_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
$t = [<|"key": "1", "subkey": "a", "value": "value2_1"|>, <|"key": "4", "subkey": "d", "value": "value2_4"|>, <|"key": "-5", "subkey": "e", "value": "value2_5"|>];
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_on_tablerecord_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_on_tablerecord_/formatted.sql
index 171d6ea4ef..ea64deaa0b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_on_tablerecord_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_on_tablerecord_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA yt.MapJoinLimit = "1M";
$i =
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_on_very_complex_type_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_on_very_complex_type_/formatted.sql
index 8ff624f92f..eba52c133e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_on_very_complex_type_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_on_very_complex_type_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
$t = [<|"key1": "1", "subkey1": "a", "key": "1", "subkey": "a", "value": "value2_1"|>, <|"key1": "4", "subkey1": "d", "key": "4", "subkey": "d", "value": "value2_4"|>, <|"key1": "-5", "subkey1": "e", "key": "-5", "subkey": "e", "value": "value2_5"|>];
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_opt_vs_2xopt_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_opt_vs_2xopt_/formatted.sql
index 86e4c63158..92791b73c2 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_opt_vs_2xopt_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_opt_vs_2xopt_/formatted.sql
@@ -1,10 +1,13 @@
USE plato;
+
PRAGMA yt.MapJoinLimit = "1m";
+
$t1 = AsList(
AsStruct(Just(1) AS Key),
AsStruct(Just(2) AS Key),
AsStruct(Just(3) AS Key)
);
+
$t2 = AsList(
AsStruct(Just(Just(2)) AS Key),
AsStruct(Just(Just(3)) AS Key),
@@ -26,6 +29,7 @@ SELECT
FROM
as_table($t2)
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_partial_uniq_keys_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_partial_uniq_keys_/formatted.sql
index 8940162c06..9c71e0b2b7 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_partial_uniq_keys_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_partial_uniq_keys_/formatted.sql
@@ -1,8 +1,10 @@
PRAGMA DisableSimpleColumns;
+
/* postgres can not */
/* kikimr can not */
/* ignore runonopt plan diff */
USE plato;
+
PRAGMA yt.MapJoinLimit = "1m";
-- YQL-5582
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_sharded_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_sharded_/formatted.sql
index 7ab7e05d25..bd7fb80214 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_sharded_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_sharded_/formatted.sql
@@ -1,7 +1,9 @@
USE plato;
+
/* postgres can not */
/* kikimr can not */
PRAGMA DisableSimpleColumns;
+
/* yt_local_var: MAP_JOIN_LIMIT = 30 */
/* yqlrun_var: MAP_JOIN_LIMIT = 1000 */
PRAGMA yt.MapJoinLimit = "MAP_JOIN_LIMIT";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_unused_keys_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_unused_keys_/formatted.sql
index 56edac470a..2dfbf792ca 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_unused_keys_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_unused_keys_/formatted.sql
@@ -1,5 +1,6 @@
/* syntax version 1 */
USE plato;
+
PRAGMA yt.MapJoinLimit = "1m";
PRAGMA yt.DisableOptimizers = "PhysicalOptimizer-FuseInnerMap";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_with_anonymous_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_with_anonymous_/formatted.sql
index e74e825f7d..009bdb679b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_with_anonymous_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_with_anonymous_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* kikimr can not */
USE plato;
+
PRAGMA DisableSimpleColumns;
PRAGMA yt.MapJoinLimit = "1m";
@@ -12,6 +13,7 @@ FROM
WHERE
key > "100"
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_with_empty_read_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_with_empty_read_/formatted.sql
index 662fab9ad6..9285c76511 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_with_empty_read_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_with_empty_read_/formatted.sql
@@ -1,7 +1,9 @@
PRAGMA DisableSimpleColumns;
+
/* postgres can not */
/* kikimr can not */
USE plato;
+
PRAGMA yt.mapjoinlimit = "1m";
$cnt = (
@@ -10,6 +12,7 @@ $cnt = (
FROM
Input
);
+
$offset = ($cnt + 10) ?? 0;
$in1 = (
@@ -33,6 +36,7 @@ LEFT JOIN
ON
a.key == b.key
;
+
$limit = ($cnt / 100) ?? 0;
$in2 = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_with_empty_struct_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_with_empty_struct_/formatted.sql
index 04d41b128c..427d62108a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_with_empty_struct_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mapjoin_with_empty_struct_/formatted.sql
@@ -1,8 +1,10 @@
PRAGMA DisableSimpleColumns;
+
/* postgres can not */
/* kikimr can not */
/* ignore yt detailed plan diff */
USE plato;
+
PRAGMA yt.MapJoinLimit = "10M";
$sizes = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_any_no_join_reduce_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_any_no_join_reduce_/formatted.sql
index 7936a545f1..1f8415de30 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_any_no_join_reduce_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_any_no_join_reduce_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA yt.JoinMergeTablesLimit = "10";
PRAGMA yt.JoinMergeUnsortedFactor = "2";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_big_primary_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_big_primary_/formatted.sql
index fcb19095b0..e22e85e809 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_big_primary_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_big_primary_/formatted.sql
@@ -1,5 +1,7 @@
PRAGMA DisableSimpleColumns;
+
USE plato;
+
PRAGMA yt.JoinMergeTablesLimit = "10";
PRAGMA yt.JoinAllowColumnRenames = "true";
PRAGMA yt.JoinMergeUseSmallAsPrimary = "false";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_big_primary_unique_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_big_primary_unique_/formatted.sql
index a764784d92..bef94f53c6 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_big_primary_unique_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_big_primary_unique_/formatted.sql
@@ -1,5 +1,7 @@
PRAGMA DisableSimpleColumns;
+
USE plato;
+
PRAGMA yt.JoinMergeTablesLimit = "10";
PRAGMA yt.JoinAllowColumnRenames = "true";
PRAGMA yt.JoinMergeUseSmallAsPrimary = "false";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_choose_primary_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_choose_primary_/formatted.sql
index f3bb81d452..1e5ceea0e8 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_choose_primary_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_choose_primary_/formatted.sql
@@ -1,5 +1,7 @@
PRAGMA DisableSimpleColumns;
+
USE plato;
+
PRAGMA yt.JoinMergeTablesLimit = "10";
PRAGMA yt.JoinAllowColumnRenames = "true";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_choose_primary_with_retry_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_choose_primary_with_retry_/formatted.sql
index cf637c0d15..8e2ebdbc82 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_choose_primary_with_retry_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_choose_primary_with_retry_/formatted.sql
@@ -1,7 +1,10 @@
PRAGMA DisableSimpleColumns;
+
USE plato;
+
PRAGMA yt.JoinMergeTablesLimit = "10";
PRAGMA yt.JoinAllowColumnRenames = "true";
+
-- emulate monsters in big table
PRAGMA yt.JoinMergeReduceJobMaxSize = "1";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_force_align1_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_force_align1_/formatted.sql
index 376fb59ffc..2a8e3a0548 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_force_align1_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_force_align1_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
PRAGMA yt.JoinMergeTablesLimit = "100";
PRAGMA yt.JoinMergeForce;
@@ -27,6 +28,7 @@ SELECT
1s AS k4,
10000 AS v4
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_force_align2_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_force_align2_/formatted.sql
index acb5b4c2be..688aa3e138 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_force_align2_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_force_align2_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
PRAGMA yt.JoinMergeTablesLimit = "100";
INSERT INTO @t1
@@ -20,6 +21,7 @@ SELECT
1us AS k3,
1000 AS v3
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_force_align3_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_force_align3_/formatted.sql
index c2ad7cc568..9b1ca577b4 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_force_align3_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_force_align3_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
PRAGMA yt.JoinMergeTablesLimit = "100";
PRAGMA yt.JoinMergeForce;
@@ -15,6 +16,7 @@ SELECT
(1u, 1) AS k2,
100 AS v2
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_force_no_sorted_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_force_no_sorted_/formatted.sql
index 1d3219f384..aa0557dda2 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_force_no_sorted_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_force_no_sorted_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA yt.JoinMergeTablesLimit = "10";
PRAGMA yt.JoinMergeForce = "true";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_force_one_sorted_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_force_one_sorted_/formatted.sql
index e92f5c094a..2bff64278d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_force_one_sorted_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_force_one_sorted_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA yt.JoinMergeTablesLimit = "10";
PRAGMA yt.JoinMergeForce = "true";
PRAGMA yt.JoinMergeUnsortedFactor = "0";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_force_per_link_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_force_per_link_/formatted.sql
index 89d57145b0..a7d005cfff 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_force_per_link_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_force_per_link_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
PRAGMA yt.JoinMergeTablesLimit = "10";
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_left_null_column_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_left_null_column_/formatted.sql
index 6f444d85e2..1c1b0df9d7 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_left_null_column_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_left_null_column_/formatted.sql
@@ -3,7 +3,9 @@
PRAGMA yt.JoinMergeTablesLimit = "10";
PRAGMA yt.JoinAllowColumnRenames = "true";
PRAGMA yt.JoinMergeUnsortedFactor = "5.0";
+
USE plato;
+
$t = [<|"x": "bbb", "y": 1, "z": NULL|>, <|"x": "bbb", "y": 2, "z": NULL|>];
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_narrows_output_sort_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_narrows_output_sort_/formatted.sql
index a2fdd2df9b..b9b9d706b4 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_narrows_output_sort_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_narrows_output_sort_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA yt.JoinMergeTablesLimit = "10";
PRAGMA yt.JoinMergeUnsortedFactor = "3";
PRAGMA yt.JoinAllowColumnRenames = "true";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_saves_output_sort_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_saves_output_sort_/formatted.sql
index 5e76f23370..1b639c3e80 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_saves_output_sort_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_saves_output_sort_/formatted.sql
@@ -1,5 +1,7 @@
PRAGMA DisableSimpleColumns;
+
USE plato;
+
PRAGMA yt.JoinMergeTablesLimit = "10";
PRAGMA yt.JoinMergeUnsortedFactor = "0";
PRAGMA yt.JoinAllowColumnRenames = "true";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_saves_output_sort_cross_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_saves_output_sort_cross_/formatted.sql
index 015185b471..1a3e0ff406 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_saves_output_sort_cross_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_saves_output_sort_cross_/formatted.sql
@@ -1,5 +1,7 @@
PRAGMA DisableSimpleColumns;
+
USE plato;
+
PRAGMA yt.JoinMergeTablesLimit = "10";
PRAGMA yt.JoinMergeUnsortedFactor = "0";
PRAGMA yt.JoinAllowColumnRenames = "true";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_saves_output_sort_nested_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_saves_output_sort_nested_/formatted.sql
index 9d38c89baa..0022581d55 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_saves_output_sort_nested_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_saves_output_sort_nested_/formatted.sql
@@ -1,6 +1,8 @@
/* ignore yt detailed plan diff */
PRAGMA DisableSimpleColumns;
+
USE plato;
+
PRAGMA yt.JoinMergeTablesLimit = "10";
PRAGMA yt.JoinMergeUnsortedFactor = "0";
PRAGMA yt.JoinAllowColumnRenames = "true";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_saves_output_sort_unmatched_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_saves_output_sort_unmatched_/formatted.sql
index da3698c049..254d1a1880 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_saves_output_sort_unmatched_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_saves_output_sort_unmatched_/formatted.sql
@@ -1,6 +1,8 @@
/* ignore yt detailed plan diff */
PRAGMA DisableSimpleColumns;
+
USE plato;
+
PRAGMA yt.JoinMergeTablesLimit = "10";
PRAGMA yt.JoinMergeUnsortedFactor = "0";
PRAGMA yt.JoinAllowColumnRenames = "true";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_semi_composite_to_inner_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_semi_composite_to_inner_/formatted.sql
index 49f7f98506..f966b81faa 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_semi_composite_to_inner_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_semi_composite_to_inner_/formatted.sql
@@ -1,5 +1,6 @@
/* syntax version 1 */
USE plato;
+
PRAGMA yt.JoinMergeTablesLimit = "10";
PRAGMA yt.JoinMergeUnsortedFactor = "3";
PRAGMA yt.JoinAllowColumnRenames = "true";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_semi_to_inner_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_semi_to_inner_/formatted.sql
index f3d05cb8f8..f61f8f6189 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_semi_to_inner_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_semi_to_inner_/formatted.sql
@@ -1,5 +1,6 @@
/* syntax version 1 */
USE plato;
+
PRAGMA yt.JoinMergeTablesLimit = "10";
PRAGMA yt.JoinMergeUnsortedFactor = "0";
PRAGMA yt.JoinAllowColumnRenames = "true";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_small_primary_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_small_primary_/formatted.sql
index 10b0e0abf8..71ee5f5981 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_small_primary_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_small_primary_/formatted.sql
@@ -1,5 +1,7 @@
PRAGMA DisableSimpleColumns;
+
USE plato;
+
PRAGMA yt.JoinMergeTablesLimit = "10";
PRAGMA yt.JoinAllowColumnRenames = "true";
PRAGMA yt.JoinMergeUseSmallAsPrimary = "true";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_sorts_output_for_sort_inner_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_sorts_output_for_sort_inner_/formatted.sql
index 16db0f0bc3..a5e8b2e705 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_sorts_output_for_sort_inner_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_sorts_output_for_sort_inner_/formatted.sql
@@ -1,6 +1,8 @@
/* ignore yt detailed plan diff */
PRAGMA DisableSimpleColumns;
+
USE plato;
+
PRAGMA yt.JoinMergeTablesLimit = "10";
PRAGMA yt.JoinAllowColumnRenames = "true";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_sorts_output_for_sort_left_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_sorts_output_for_sort_left_/formatted.sql
index 76afe5301e..33965836b8 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_sorts_output_for_sort_left_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_sorts_output_for_sort_left_/formatted.sql
@@ -1,5 +1,7 @@
PRAGMA DisableSimpleColumns;
+
USE plato;
+
PRAGMA yt.JoinMergeTablesLimit = "10";
PRAGMA yt.JoinAllowColumnRenames = "true";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_sorts_output_for_sort_nomatch_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_sorts_output_for_sort_nomatch_/formatted.sql
index e67d0c1bf5..34eedc619f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_sorts_output_for_sort_nomatch_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_sorts_output_for_sort_nomatch_/formatted.sql
@@ -1,6 +1,8 @@
/* ignore yt detailed plan diff */
PRAGMA DisableSimpleColumns;
+
USE plato;
+
PRAGMA yt.JoinMergeTablesLimit = "10";
PRAGMA yt.JoinAllowColumnRenames = "true";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_sorts_output_for_sort_right_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_sorts_output_for_sort_right_/formatted.sql
index b974f9de80..22dbeaa348 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_sorts_output_for_sort_right_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_sorts_output_for_sort_right_/formatted.sql
@@ -1,5 +1,7 @@
PRAGMA DisableSimpleColumns;
+
USE plato;
+
PRAGMA yt.JoinMergeTablesLimit = "10";
PRAGMA yt.JoinAllowColumnRenames = "true";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_unused_keys_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_unused_keys_/formatted.sql
index b74a253f5d..b5f176336b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_unused_keys_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_unused_keys_/formatted.sql
@@ -1,5 +1,6 @@
/* syntax version 1 */
USE plato;
+
PRAGMA yt.JoinMergeTablesLimit = "10";
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_with_different_key_names_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_with_different_key_names_/formatted.sql
index daaafaba88..e45ce41607 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_with_different_key_names_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_with_different_key_names_/formatted.sql
@@ -1,5 +1,7 @@
PRAGMA DisableSimpleColumns;
+
USE plato;
+
PRAGMA yt.JoinMergeTablesLimit = "10";
PRAGMA yt.JoinMergeUnsortedFactor = "3.0";
PRAGMA yt.JoinAllowColumnRenames = "true";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_with_different_key_names_nested_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_with_different_key_names_nested_/formatted.sql
index c67492a0b9..a927f11148 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_with_different_key_names_nested_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_with_different_key_names_nested_/formatted.sql
@@ -1,6 +1,8 @@
/* ignore yt detailed plan diff */
PRAGMA DisableSimpleColumns;
+
USE plato;
+
PRAGMA yt.JoinMergeTablesLimit = "10";
PRAGMA yt.JoinMergeUnsortedFactor = "3.0";
PRAGMA yt.JoinAllowColumnRenames = "true";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_with_different_key_names_nonsorted_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_with_different_key_names_nonsorted_/formatted.sql
index c3be5300fc..f28374edd2 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_with_different_key_names_nonsorted_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_with_different_key_names_nonsorted_/formatted.sql
@@ -1,5 +1,7 @@
PRAGMA DisableSimpleColumns;
+
USE plato;
+
PRAGMA yt.JoinMergeTablesLimit = "10";
PRAGMA yt.JoinMergeUnsortedFactor = "100.0";
PRAGMA yt.JoinAllowColumnRenames = "true";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_with_different_key_names_norename_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_with_different_key_names_norename_/formatted.sql
index 698a72e9ae..d331d59dfe 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_with_different_key_names_norename_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_with_different_key_names_norename_/formatted.sql
@@ -1,5 +1,7 @@
PRAGMA DisableSimpleColumns;
+
USE plato;
+
PRAGMA yt.JoinMergeTablesLimit = "10";
PRAGMA yt.JoinMergeUnsortedFactor = "3.0";
PRAGMA yt.JoinAllowColumnRenames = "false";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_with_reverse_key_order_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_with_reverse_key_order_/formatted.sql
index ceec19b749..1a15c5297e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_with_reverse_key_order_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_with_reverse_key_order_/formatted.sql
@@ -1,5 +1,7 @@
PRAGMA DisableSimpleColumns;
+
USE plato;
+
PRAGMA yt.JoinMergeTablesLimit = "10";
PRAGMA yt.JoinMergeUnsortedFactor = "3.0";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_with_table_range_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_with_table_range_/formatted.sql
index 15959fb38e..31e0d0ad2b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_with_table_range_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-mergejoin_with_table_range_/formatted.sql
@@ -1,5 +1,7 @@
PRAGMA DisableSimpleColumns;
+
USE plato;
+
PRAGMA yt.JoinMergeTablesLimit = "10";
PRAGMA yt.JoinMergeUnsortedFactor = "3.0";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-nested_semi_join_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-nested_semi_join_/formatted.sql
index 8ba9f711f7..0d27aa5511 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-nested_semi_join_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-nested_semi_join_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA DisableSimpleColumns;
+
/* postgres can not */
USE plato;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-nopushdown_filter_over_inner_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-nopushdown_filter_over_inner_/formatted.sql
index d419d0e2bd..1e5db77d82 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-nopushdown_filter_over_inner_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-nopushdown_filter_over_inner_/formatted.sql
@@ -1,5 +1,6 @@
/* postgres can not */
PRAGMA DisableSimpleColumns;
+
USE plato;
-- should not pushdown
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-opt_on_opt_side_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-opt_on_opt_side_/formatted.sql
index b6bf1b7bf0..8538c01565 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-opt_on_opt_side_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-opt_on_opt_side_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA DisableSimpleColumns;
+
USE plato;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-opt_on_opt_side_with_group_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-opt_on_opt_side_with_group_/formatted.sql
index 32a209a820..a0d7656e8a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-opt_on_opt_side_with_group_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-opt_on_opt_side_with_group_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA DisableSimpleColumns;
+
USE plato;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-order_of_qualified_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-order_of_qualified_/formatted.sql
index 12d1495af0..cfead56744 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-order_of_qualified_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-order_of_qualified_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA DisableSimpleColumns;
+
USE plato;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_common_cross_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_common_cross_/formatted.sql
index 7651a3c76f..daef93d38e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_common_cross_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_common_cross_/formatted.sql
@@ -1,5 +1,6 @@
PRAGMA DisableSimpleColumns;
PRAGMA DisablePullUpFlatMapOverJoin;
+
USE plato;
FROM (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_common_inner_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_common_inner_/formatted.sql
index fc3f07ccec..98c13788d5 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_common_inner_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_common_inner_/formatted.sql
@@ -1,5 +1,6 @@
PRAGMA DisableSimpleColumns;
PRAGMA DisablePullUpFlatMapOverJoin;
+
USE plato;
FROM (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_common_inner_both_sides_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_common_inner_both_sides_/formatted.sql
index e083860196..dd11aca751 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_common_inner_both_sides_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_common_inner_both_sides_/formatted.sql
@@ -1,5 +1,6 @@
PRAGMA DisableSimpleColumns;
PRAGMA DisablePullUpFlatMapOverJoin;
+
USE plato;
FROM (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_common_inner_filter_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_common_inner_filter_/formatted.sql
index da02a1af84..c74beca2d7 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_common_inner_filter_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_common_inner_filter_/formatted.sql
@@ -1,5 +1,6 @@
PRAGMA DisableSimpleColumns;
PRAGMA DisablePullUpFlatMapOverJoin;
+
USE plato;
FROM (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_common_left_cross_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_common_left_cross_/formatted.sql
index d6ea69d6e6..0d0549ef74 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_common_left_cross_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_common_left_cross_/formatted.sql
@@ -1,5 +1,6 @@
PRAGMA DisableSimpleColumns;
PRAGMA DisablePullUpFlatMapOverJoin;
+
USE plato;
$one = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_common_multiparents_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_common_multiparents_/formatted.sql
index b703243d2a..fdd79f0101 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_common_multiparents_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_common_multiparents_/formatted.sql
@@ -1,5 +1,6 @@
PRAGMA DisableSimpleColumns;
PRAGMA DisablePullUpFlatMapOverJoin;
+
USE plato;
$map = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_common_multiparents_no_premap_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_common_multiparents_no_premap_/formatted.sql
index 6e1506798d..2bb4f638a8 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_common_multiparents_no_premap_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_common_multiparents_no_premap_/formatted.sql
@@ -1,5 +1,6 @@
PRAGMA DisableSimpleColumns;
PRAGMA DisablePullUpFlatMapOverJoin;
+
USE plato;
$map = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_common_right_tablecontent_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_common_right_tablecontent_/formatted.sql
index a793d4eaf5..6a690047f6 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_common_right_tablecontent_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_common_right_tablecontent_/formatted.sql
@@ -1,5 +1,6 @@
PRAGMA DisableSimpleColumns;
PRAGMA DisablePullUpFlatMapOverJoin;
+
USE plato;
$keys = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_common_semi_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_common_semi_/formatted.sql
index 6119af6607..47ba1f192c 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_common_semi_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_common_semi_/formatted.sql
@@ -1,5 +1,6 @@
PRAGMA DisableSimpleColumns;
PRAGMA DisablePullUpFlatMapOverJoin;
+
USE plato;
FROM (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_context_dep_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_context_dep_/formatted.sql
index 3b58e3df0e..6005defbc4 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_context_dep_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_context_dep_/formatted.sql
@@ -1,5 +1,6 @@
PRAGMA DisableSimpleColumns;
PRAGMA DisablePullUpFlatMapOverJoin;
+
USE plato;
FROM (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_map_cross_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_map_cross_/formatted.sql
index cc98206c15..385d63b881 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_map_cross_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_map_cross_/formatted.sql
@@ -1,6 +1,8 @@
PRAGMA DisableSimpleColumns;
PRAGMA DisablePullUpFlatMapOverJoin;
+
USE plato;
+
PRAGMA yt.MapJoinLimit = "1m";
FROM (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_map_inner_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_map_inner_/formatted.sql
index f6ee76ebdb..bc038ff8e1 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_map_inner_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_map_inner_/formatted.sql
@@ -1,6 +1,8 @@
PRAGMA DisableSimpleColumns;
PRAGMA DisablePullUpFlatMapOverJoin;
+
USE plato;
+
PRAGMA yt.MapJoinLimit = "1m";
FROM (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_map_semi_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_map_semi_/formatted.sql
index 5b4c1d77cf..e7e79dc378 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_map_semi_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_map_semi_/formatted.sql
@@ -1,6 +1,8 @@
PRAGMA DisableSimpleColumns;
PRAGMA DisablePullUpFlatMapOverJoin;
+
USE plato;
+
PRAGMA yt.MapJoinLimit = "1m";
FROM (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_merge_extrasort1_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_merge_extrasort1_/formatted.sql
index 56ebb192ce..d19cf69325 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_merge_extrasort1_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_merge_extrasort1_/formatted.sql
@@ -1,6 +1,8 @@
PRAGMA DisableSimpleColumns;
PRAGMA DisablePullUpFlatMapOverJoin;
+
USE plato;
+
PRAGMA yt.JoinMergeTablesLimit = "10";
PRAGMA yt.JoinMergeUnsortedFactor = "3.0";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_merge_extrasort2_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_merge_extrasort2_/formatted.sql
index 3cbc71495f..1e1bc620db 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_merge_extrasort2_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_merge_extrasort2_/formatted.sql
@@ -1,6 +1,8 @@
PRAGMA DisableSimpleColumns;
PRAGMA DisablePullUpFlatMapOverJoin;
+
USE plato;
+
PRAGMA yt.JoinMergeTablesLimit = "10";
PRAGMA yt.JoinMergeUnsortedFactor = "3.0";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_merge_inner_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_merge_inner_/formatted.sql
index 0dd57a7e37..c1146bdafd 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_merge_inner_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_merge_inner_/formatted.sql
@@ -1,6 +1,8 @@
PRAGMA DisableSimpleColumns;
PRAGMA DisablePullUpFlatMapOverJoin;
+
USE plato;
+
PRAGMA yt.JoinMergeTablesLimit = "10";
FROM (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_merge_with_remap_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_merge_with_remap_/formatted.sql
index b4c47a6fb3..eb001c98f9 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_merge_with_remap_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_merge_with_remap_/formatted.sql
@@ -1,6 +1,8 @@
PRAGMA DisableSimpleColumns;
PRAGMA DisablePullUpFlatMapOverJoin;
+
USE plato;
+
PRAGMA yt.JoinMergeTablesLimit = "10";
PRAGMA yt.JoinMergeUnsortedFactor = "3.0";
@@ -12,6 +14,7 @@ FROM
ORDER BY
BaseNo DESC
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_no_premap_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_no_premap_/formatted.sql
index 228a5795b4..5095ec4eb3 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_no_premap_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-premap_no_premap_/formatted.sql
@@ -1,5 +1,6 @@
PRAGMA DisableSimpleColumns;
PRAGMA DisablePullUpFlatMapOverJoin;
+
USE plato;
-- not renaming
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 f0f74eafb1..ef0679ec59 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
@@ -1,4 +1,5 @@
PRAGMA DisableSimpleColumns;
+
USE plato;
$hashes = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_context_dep_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_context_dep_/formatted.sql
index 7fd88990a5..97c5b5cd49 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_context_dep_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_context_dep_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA DisableSimpleColumns;
+
USE plato;
FROM (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_cross_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_cross_/formatted.sql
index d0f1134d1f..b8eb3b8f42 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_cross_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_cross_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA DisableSimpleColumns;
+
USE plato;
FROM (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_exclusion_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_exclusion_/formatted.sql
index f4f6287d13..3112565c5d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_exclusion_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_exclusion_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA DisableSimpleColumns;
+
USE plato;
FROM (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_inner_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_inner_/formatted.sql
index c46ef82813..8d13cea078 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_inner_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_inner_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA DisableSimpleColumns;
+
USE plato;
FROM (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_left_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_left_/formatted.sql
index f42c2d3b0b..ece0b05bcb 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_left_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_left_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA DisableSimpleColumns;
+
USE plato;
FROM (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_left_semi_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_left_semi_/formatted.sql
index 0bd96ebc66..584a85a954 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_left_semi_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_left_semi_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA DisableSimpleColumns;
+
USE plato;
FROM (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_null_column_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_null_column_/formatted.sql
index 23ff2b588d..c81c006e74 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_null_column_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_null_column_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA DisableSimpleColumns;
+
USE plato;
FROM
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_random_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_random_/formatted.sql
index dcf7f7e4f7..af2203a903 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_random_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_random_/formatted.sql
@@ -1,5 +1,6 @@
/* kikimr can not - due to random */
PRAGMA DisableSimpleColumns;
+
USE plato;
FROM (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_renaming_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_renaming_/formatted.sql
index 4099b4b348..b8b24bad88 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_renaming_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_renaming_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA DisableSimpleColumns;
+
USE plato;
FROM (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_rownumber_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_rownumber_/formatted.sql
index 312cfa0285..2c7a168f9f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_rownumber_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pullup_rownumber_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA DisableSimpleColumns;
+
USE plato;
FROM (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pushdown_filter_over_inner_with_assume_strict_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pushdown_filter_over_inner_with_assume_strict_/formatted.sql
index 2e9a9c17c3..5a3737af62 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pushdown_filter_over_inner_with_assume_strict_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pushdown_filter_over_inner_with_assume_strict_/formatted.sql
@@ -1,5 +1,6 @@
/* postgres can not */
PRAGMA DisableSimpleColumns;
+
USE plato;
-- should pushdown
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pushdown_filter_over_inner_with_strict_udf_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pushdown_filter_over_inner_with_strict_udf_/formatted.sql
index 490defa7d0..5f9ea58060 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pushdown_filter_over_inner_with_strict_udf_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pushdown_filter_over_inner_with_strict_udf_/formatted.sql
@@ -1,5 +1,6 @@
/* postgres can not */
PRAGMA DisableSimpleColumns;
+
USE plato;
-- should pushdown
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pushdown_filter_over_left_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pushdown_filter_over_left_/formatted.sql
index 131f39a68a..2385c55935 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pushdown_filter_over_left_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-pushdown_filter_over_left_/formatted.sql
@@ -1,5 +1,6 @@
/* postgres can not */
PRAGMA DisableSimpleColumns;
+
USE plato;
-- should pushdown
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-simple_columns_partial_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-simple_columns_partial_/formatted.sql
index d6d10f1c63..5988d77d44 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-simple_columns_partial_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-simple_columns_partial_/formatted.sql
@@ -1,5 +1,6 @@
/* postgres can not */
USE plato;
+
PRAGMA SimpleColumns;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-split_to_list_as_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-split_to_list_as_key_/formatted.sql
index bb0e4bff57..9332166f01 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-split_to_list_as_key_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-split_to_list_as_key_/formatted.sql
@@ -1,5 +1,6 @@
/* syntax version 1 */
PRAGMA DisableSimpleColumns;
+
USE plato;
FROM
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_/formatted.sql
index 1e6770dd8d..a3909fc0b8 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_/formatted.sql
@@ -1,5 +1,6 @@
/* syntax version 1 */
USE plato;
+
PRAGMA yt.JoinEnableStarJoin = "true";
$rightSemi =
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_inners_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_inners_/formatted.sql
index 2a11b8894d..d3a2bec669 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_inners_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_inners_/formatted.sql
@@ -1,5 +1,6 @@
/* syntax version 1 */
USE plato;
+
PRAGMA yt.JoinEnableStarJoin = "true";
FROM ANY
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_inners_premap_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_inners_premap_/formatted.sql
index 5ab11814d1..f673178b8e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_inners_premap_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_inners_premap_/formatted.sql
@@ -1,5 +1,6 @@
/* syntax version 1 */
USE plato;
+
PRAGMA yt.JoinEnableStarJoin = "true";
PRAGMA DisablePullUpFlatMapOverJoin;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_inners_vk_sorted_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_inners_vk_sorted_/formatted.sql
index 2a11b8894d..d3a2bec669 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_inners_vk_sorted_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_inners_vk_sorted_/formatted.sql
@@ -1,5 +1,6 @@
/* syntax version 1 */
USE plato;
+
PRAGMA yt.JoinEnableStarJoin = "true";
FROM ANY
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_mirror_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_mirror_/formatted.sql
index 4c1d21c0ca..549bb194c2 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_mirror_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_mirror_/formatted.sql
@@ -1,5 +1,6 @@
/* syntax version 1 */
USE plato;
+
PRAGMA yt.JoinEnableStarJoin = "true";
$leftSemi =
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_multi_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_multi_/formatted.sql
index dc8de0ea5f..9372b0c74c 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_multi_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_multi_/formatted.sql
@@ -1,5 +1,6 @@
/* syntax version 1 */
USE plato;
+
PRAGMA yt.JoinEnableStarJoin = "true";
-- first Star JOIN chain
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_semionly_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_semionly_/formatted.sql
index ab64b42b39..0ffa2aef09 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_semionly_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_semionly_/formatted.sql
@@ -1,5 +1,6 @@
/* syntax version 1 */
USE plato;
+
PRAGMA yt.JoinEnableStarJoin = "true";
FROM
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_semionly_premap_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_semionly_premap_/formatted.sql
index fff8cb7ad9..839f627994 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_semionly_premap_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_semionly_premap_/formatted.sql
@@ -1,5 +1,6 @@
/* syntax version 1 */
USE plato;
+
PRAGMA yt.JoinEnableStarJoin = "true";
PRAGMA DisablePullUpFlatMapOverJoin;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_with_diff_complex_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_with_diff_complex_key_/formatted.sql
index 61a0a0c00f..3faed88c6c 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_with_diff_complex_key_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-star_join_with_diff_complex_key_/formatted.sql
@@ -1,5 +1,6 @@
/* syntax version 1 */
USE plato;
+
PRAGMA yt.JoinEnableStarJoin = "true";
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-starjoin_unused_keys_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-starjoin_unused_keys_/formatted.sql
index 4de95a85ae..6a1065653d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-starjoin_unused_keys_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-starjoin_unused_keys_/formatted.sql
@@ -1,5 +1,6 @@
/* syntax version 1 */
USE plato;
+
PRAGMA yt.JoinEnableStarJoin = "true";
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-three_equalities_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-three_equalities_/formatted.sql
index 467d23a69f..24cb4d1825 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-three_equalities_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-three_equalities_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA DisableSimpleColumns;
+
USE plato;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-three_equalities_paren_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-three_equalities_paren_/formatted.sql
index 27b1e3d897..e2f7fc853c 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-three_equalities_paren_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-three_equalities_paren_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA DisableSimpleColumns;
+
USE plato;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-trivial_view_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-trivial_view_/formatted.sql
index b37154dea0..d57fa4c014 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-trivial_view_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-trivial_view_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA DisableSimpleColumns;
+
/* postgres can not */
/* syntax version 1 */
USE plato;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-two_aggrs_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-two_aggrs_/formatted.sql
index 2474dc2586..a793d59a3a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-two_aggrs_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-two_aggrs_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA yt.JoinMergeForce = "1";
PRAGMA yt.JoinMergeTablesLimit = "10";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-10654_pullup_with_sys_columns_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-10654_pullup_with_sys_columns_/formatted.sql
index 243c47ec50..8b3e697f1a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-10654_pullup_with_sys_columns_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-10654_pullup_with_sys_columns_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* syntax version 1 */
USE plato;
+
PRAGMA DisableSimpleColumns;
$src =
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-14829_left_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-14829_left_/formatted.sql
index 38cd7f511d..249cce7575 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-14829_left_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-14829_left_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA yt.JoinEnableStarJoin = "true";
INSERT INTO @x
@@ -21,6 +22,7 @@ SELECT
ORDER BY
id
;
+
COMMIT;
$xy_left = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-14829_leftonly_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-14829_leftonly_/formatted.sql
index 1626b2f5d2..9b2c43b641 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-14829_leftonly_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-14829_leftonly_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA yt.JoinEnableStarJoin = "true";
INSERT INTO @x
@@ -21,6 +22,7 @@ SELECT
ORDER BY
id
;
+
COMMIT;
$xy_leftonly = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-14847_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-14847_/formatted.sql
index 409bd9aca5..c87ab28ef9 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-14847_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-14847_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA yt.MapJoinLimit = "1M";
$t = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-16011_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-16011_/formatted.sql
index 5a50e87a1f..090aa7a08a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-16011_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-16011_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA AnsiInForEmptyOrNullableItemsCollections = "true";
PRAGMA yt.MapJoinLimit = "1m";
PRAGMA yt.LookupJoinLimit = "64k";
@@ -19,6 +20,7 @@ SELECT
ORDER BY
ID
;
+
COMMIT;
$lost_ids =
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-19081_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-19081_/formatted.sql
index 799449f708..e74e76a679 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-19081_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-19081_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA yt.JoinMergeTablesLimit = "100";
PRAGMA yt.MapJoinLimit = "10M";
PRAGMA yt.MaxReplicationFactorToFuseOperations = "1";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-4275_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-4275_/formatted.sql
index 7c40e934b7..ebbf6cb108 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-4275_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-4275_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA DisableSimpleColumns;
+
/* postgres can not */
USE plato;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-8125_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-8125_/formatted.sql
index f2f59e87b0..253f23e9c6 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-8125_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-8125_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA yt.JoinCollectColumnarStatistics = "async";
INSERT INTO @yang_ids
@@ -9,6 +10,7 @@ FROM
WHERE
subkey <= "3"
LIMIT 100;
+
COMMIT;
INSERT INTO @yang_ids
@@ -19,6 +21,7 @@ FROM
LEFT ONLY JOIN
@yang_ids
USING (key);
+
COMMIT;
INSERT INTO @yang_ids
@@ -29,6 +32,7 @@ FROM
LEFT ONLY JOIN
@yang_ids
USING (key);
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-8131_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-8131_/formatted.sql
index f8c7faad67..1439605d75 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-8131_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql-8131_/formatted.sql
@@ -1,5 +1,6 @@
/* kikimr can not */
USE plato;
+
PRAGMA DisableSimpleColumns;
PRAGMA yt.JoinCollectColumnarStatistics = "async";
PRAGMA yt.MinTempAvgChunkSize = "0";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql_465_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql_465_/formatted.sql
index 83afcd9b00..5eb471f39c 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql_465_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_join-yql_465_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA DisableSimpleColumns;
+
USE plato;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_exists_common_syntax_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_exists_common_syntax_/formatted.sql
index 39b9209b1f..4686525c3f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_exists_common_syntax_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_exists_common_syntax_/formatted.sql
@@ -5,6 +5,7 @@ SELECT
JSON_EXISTS (NULL, "strict $.key"),
JSON_EXISTS (Nothing(Json?), "strict $.key")
;
+
-- Casual select
$json = CAST(@@{"key": 128}@@ AS Json);
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_query_common_syntax_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_query_common_syntax_/formatted.sql
index 090568a498..0cf5b81473 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_query_common_syntax_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_query_common_syntax_/formatted.sql
@@ -5,6 +5,7 @@ SELECT
JSON_QUERY (NULL, "strict $.key"),
JSON_QUERY (Nothing(Json?), "strict $.key")
;
+
-- Casual select
$json = CAST(@@{"key": [1, 2, 3]}@@ AS Json);
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_query_example_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_query_example_/formatted.sql
index f2c8f257a0..9509c14a2a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_query_example_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_query_example_/formatted.sql
@@ -31,6 +31,7 @@ SELECT
FROM
T
;
+
-- In standard this example is demonstrated using PDF table, without any queries.
-- We represent it as set of queries, using NULL as error value.
-- Each SELECT is a row in source PDF table
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_common_syntax_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_common_syntax_/formatted.sql
index de8b72c954..fb527875eb 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_common_syntax_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_common_syntax_/formatted.sql
@@ -5,6 +5,7 @@ SELECT
JSON_VALUE (NULL, "strict $.key"),
JSON_VALUE (Nothing(Json?), "strict $.key")
;
+
-- Casual select
$json = CAST(@@{"key": 128}@@ AS Json);
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_on_error_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_on_error_/formatted.sql
index bfd521476d..c0880717e4 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_on_error_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_on_error_/formatted.sql
@@ -19,6 +19,7 @@ SELECT
JSON_VALUE ($json, "strict $.key" RETURNING Int16 DEFAULT "123" ON ERROR),
JSON_VALUE ($json, "strict $.key" RETURNING Int16 DEFAULT 123.456 ON ERROR)
;
+
-- Here values retrieved from JSON cannot be casted to the target type Int16.
-- ON ERROR default value must be used instead
$invalid_types_json = CAST(
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_returning_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_returning_/formatted.sql
index 3fd0f2e0a5..105d50eb3a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_returning_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-json_value_returning_/formatted.sql
@@ -11,6 +11,7 @@ SELECT
JSON_VALUE ($bool_json, "strict $.key"), -- defaults to RETURNING Utf8 with cast to string value
JSON_VALUE ($bool_json, "strict $.key" RETURNING Bool)
;
+
$string_json = CAST(
@@{
"key": "string"
@@ -21,6 +22,7 @@ SELECT
JSON_VALUE ($string_json, "strict $.key"), -- defaults to RETURNING Utf8 with cast to string value
JSON_VALUE ($string_json, "strict $.key" RETURNING Utf8)
;
+
$int64_json = CAST(
@@{
"key": 123
@@ -31,6 +33,7 @@ SELECT
JSON_VALUE ($int64_json, "strict $.key"), -- defaults to RETURNING Utf8 with cast to string value
JSON_VALUE ($int64_json, "strict $.key" RETURNING Int64)
;
+
$double_json = CAST(
@@{
"key": 123.456
@@ -68,6 +71,7 @@ SELECT
JSON_VALUE ($string_json, "strict $.key" RETURNING Utf8),
JSON_VALUE ($string_json, "strict $.key" RETURNING String)
;
+
-- From timestamp to Datetime, Timestamp and Date
$date_json = CAST(
@@{
@@ -82,6 +86,7 @@ SELECT
JSON_VALUE ($date_json, "strict $.datetime" RETURNING Datetime),
JSON_VALUE ($date_json, "strict $.timestamp" RETURNING Timestamp)
;
+
-- Null result form jsonpath
$_null_json = CAST(
@@{
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-jsonpath_unicode_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-jsonpath_unicode_/formatted.sql
index 320926636a..a57fcf281b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-jsonpath_unicode_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_json-jsonpath_unicode_/formatted.sql
@@ -11,6 +11,7 @@ SELECT
JSON_EXISTS ($json, @@strict $."привет"@@),
JSON_VALUE ($json, @@strict $."привет"@@)
;
+
$nested_json = CAST(
@@{
"привет": [1, 2, 3]
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-calc_dependent_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-calc_dependent_/formatted.sql
index 63b79bec59..8b3d842724 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-calc_dependent_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-calc_dependent_/formatted.sql
@@ -1,5 +1,6 @@
/* postgres can not */
USE plato;
+
$k1 = "3" || "23";
$k2 = "0" || SUBSTRING($k1, 1);
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-calc_dependent_with_tmp_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-calc_dependent_with_tmp_/formatted.sql
index 339dd65d94..b1a285732d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-calc_dependent_with_tmp_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-calc_dependent_with_tmp_/formatted.sql
@@ -9,6 +9,7 @@ FROM
ORDER BY
key DESC
LIMIT 1;
+
COMMIT;
$last_key =
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-datetime_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-datetime_/formatted.sql
index 2a4308c830..895dc66696 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-datetime_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-datetime_/formatted.sql
@@ -28,6 +28,7 @@ FROM
ASSUME ORDER BY
key
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-decimal_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-decimal_/formatted.sql
index 0ce95d6d56..a9287b671b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-decimal_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-decimal_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* syntax version 1 */
USE plato;
+
$asIs = Python::asIs(
Callable<(String) -> String>,
@@
@@ -17,6 +18,7 @@ FROM
ORDER BY
value
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-key_double_opt_suffix_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-key_double_opt_suffix_/formatted.sql
index 0ffb1a50f7..32810fb79b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-key_double_opt_suffix_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-key_double_opt_suffix_/formatted.sql
@@ -16,6 +16,7 @@ ORDER BY
key,
subkey
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-no_bypass_merge_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-no_bypass_merge_/formatted.sql
index 83f7bfd2c0..859e1b8df3 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-no_bypass_merge_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-no_bypass_merge_/formatted.sql
@@ -1,5 +1,6 @@
/* ignore runonopt plan diff - extra LogicalOptimizer-PushdownOpColumns */
PRAGMA yt.PruneKeyFilterLambda = 'true';
+
USE plato;
$src =
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-split_input_with_key_filter1_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-split_input_with_key_filter1_/formatted.sql
index e96f00facd..7a07b59d11 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-split_input_with_key_filter1_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-split_input_with_key_filter1_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA yt.MaxInputTables = "2";
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-split_input_with_key_filter2_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-split_input_with_key_filter2_/formatted.sql
index 6808b15523..9213fe5279 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-split_input_with_key_filter2_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-split_input_with_key_filter2_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA yt.MaxInputTables = "2";
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-string_with_ff_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-string_with_ff_/formatted.sql
index 1d6b68d9fe..500f646a6e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-string_with_ff_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-string_with_ff_/formatted.sql
@@ -10,6 +10,7 @@ FROM
ORDER BY
key
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-tzdate_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-tzdate_/formatted.sql
index 0ca5b9a68e..d8acea3be6 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-tzdate_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-tzdate_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* syntax version 1 */
USE plato;
+
$asIs = Python::asIs(
Callable<(String) -> String>,
@@
@@ -17,6 +18,7 @@ FROM
ORDER BY
value
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-uuid_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-uuid_/formatted.sql
index 1ab9c1884f..4a7107ba36 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-uuid_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_key_filter-uuid_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* syntax version 1 */
USE plato;
+
$asIs = Python::asIs(
Callable<(String) -> String>,
@@
@@ -17,6 +18,7 @@ FROM
ORDER BY
value
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_no_arg_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_no_arg_/formatted.sql
index eac3310bf8..b28eb8827c 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_no_arg_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_no_arg_/formatted.sql
@@ -2,6 +2,7 @@
$modVal = () -> {
RETURN 2
};
+
$filter = ($item) -> {
RETURN NOT ($item % $modVal() == 0)
};
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_simple_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_simple_/formatted.sql
index a77033b952..d80a330908 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_simple_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_simple_/formatted.sql
@@ -1,7 +1,10 @@
/* postgres can not */
USE plato;
+
PRAGMA DisableSimpleColumns;
+
$shiftSteps = 1;
+
$linear = ($x, $z) -> {
$v = 10 * $z + $x;
$shift = ($item) -> {
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_udf_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_udf_/formatted.sql
index 0c9631d18f..efb7b14670 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_udf_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_udf_/formatted.sql
@@ -1,7 +1,9 @@
/* postgres can not */
/* syntax version 1 */
USE plato;
+
$shiftSteps = 1;
+
$linear = ($x, $z) -> {
$v = 10 * $z + $x;
$shift = ($item) -> {
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_use_labmda_as_arg_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_use_labmda_as_arg_/formatted.sql
index 97a9a93100..cd690d460e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_use_labmda_as_arg_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_use_labmda_as_arg_/formatted.sql
@@ -1,9 +1,12 @@
/* postgres can not */
USE plato;
+
PRAGMA DisableSimpleColumns;
+
$shiftSteps = ($item) -> {
RETURN CAST($item % 4 AS Uint8) ?? 0
};
+
$linear = ($x, $z, $func) -> {
$v = 10 * $z + $x;
$shift = ($item, $sk) -> {
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_with_tie_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_with_tie_/formatted.sql
index 29ee017d82..eadd99b5f6 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_with_tie_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_with_tie_/formatted.sql
@@ -1,5 +1,6 @@
/* postgres can not */
USE plato;
+
$func = ($x, $y) -> {
$y, $x = AsTuple($x, $y);
RETURN $x || "_" || $y;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_with_tie_bad_count_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_with_tie_bad_count_fail_/formatted.sql
index ed9c88ef40..add3f0feb0 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_with_tie_bad_count_fail_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lambda-lambda_with_tie_bad_count_fail_/formatted.sql
@@ -1,5 +1,6 @@
/* custom error:Expected tuple type of size: 2, but got: 3*/
USE plato;
+
$func = ($x, $y) -> {
$y, $x = AsTuple($x, $y, $x);
RETURN $x || "_" || $y;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-forward_import_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-forward_import_/formatted.sql
index c24dfefbe6..a76e69c0a7 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-forward_import_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-forward_import_/formatted.sql
@@ -2,6 +2,7 @@
/* syntax version 1 */
PRAGMA Library("agg.sql");
PRAGMA Library("lib.sql");
+
IMPORT lib SYMBOLS $Square, $Agg_sum, $Agg_max;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-library_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-library_/formatted.sql
index 634b8e049e..7faf17fa73 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-library_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-library_/formatted.sql
@@ -2,6 +2,7 @@
/* kikimr can not - range not supported */
PRAGMA library("lib1.sql");
PRAGMA library("lib2.sql");
+
IMPORT lib1 SYMBOLS $sqr;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-library_alias_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-library_alias_/formatted.sql
index 8fe43c43b1..cb5bd876ed 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-library_alias_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-library_alias_/formatted.sql
@@ -1,5 +1,6 @@
/* postgres can not */
PRAGMA library("lib2.sql");
+
IMPORT lib2 SYMBOLS $mul AS $multiply;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-library_udf_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-library_udf_/formatted.sql
index 942a193172..26551822c8 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-library_udf_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-library_udf_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* kikimr can not - range not supported */
PRAGMA Library("udf.sql");
+
IMPORT udf SYMBOLS $f;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-library_via_http_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-library_via_http_/formatted.sql
index 634b8e049e..7faf17fa73 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-library_via_http_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-library_via_http_/formatted.sql
@@ -2,6 +2,7 @@
/* kikimr can not - range not supported */
PRAGMA library("lib1.sql");
PRAGMA library("lib2.sql");
+
IMPORT lib1 SYMBOLS $sqr;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-package_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-package_/formatted.sql
index f5a2b62995..b3dee1d057 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-package_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-package_/formatted.sql
@@ -1,6 +1,8 @@
/* ytfile can not */
DECLARE $cluster AS String;
+
PRAGMA package("project.package", "yt://{$cluster}/package");
+
IMPORT pkg.project.package.total SYMBOLS $do_total;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-package_override_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-package_override_/formatted.sql
index 6f65e12ce3..0ba347415e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-package_override_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_library-package_override_/formatted.sql
@@ -1,6 +1,7 @@
/* ytfile can not */
PRAGMA package("project.package", "yt://plato/package");
PRAGMA override_library("project/package/detail/bar.sql");
+
IMPORT pkg.project.package.total SYMBOLS $do_total;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_limit-dynamic_sort_limit_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_limit-dynamic_sort_limit_/formatted.sql
index 2765d46587..6338fb1312 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_limit-dynamic_sort_limit_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_limit-dynamic_sort_limit_/formatted.sql
@@ -1,10 +1,12 @@
/* postgres can not */
/* syntax version 1 */
USE plato;
+
$script = @@
def f(s):
return int(s)
@@;
+
$callable = Python::f(Callable<(String) -> Uint64?>, $script);
$i = unwrap($callable("2"));
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_limit-yql-7900_empty_sorted_without_keys_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_limit-yql-7900_empty_sorted_without_keys_/formatted.sql
index c04f75ecad..f52f50d789 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_limit-yql-7900_empty_sorted_without_keys_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_limit-yql-7900_empty_sorted_without_keys_/formatted.sql
@@ -7,6 +7,7 @@ $cnt = (
FROM
Input
);
+
$offset = ($cnt + 10) ?? 0;
$data_limited = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_limit-yql-8611_calc_peephole_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_limit-yql-8611_calc_peephole_/formatted.sql
index 94dab570a4..4a9412f109 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_limit-yql-8611_calc_peephole_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_limit-yql-8611_calc_peephole_/formatted.sql
@@ -1,8 +1,10 @@
USE plato;
+
$tableList = AsList(
AsStruct(Yson('{"row_count"=9}') AS Attributes, "Input1" AS Path, "table" AS Type),
AsStruct(Yson('{"row_count"=19}') AS Attributes, "Input2" AS Path, "table" AS Type)
);
+
-- $bucket_size = 1000000;
$buckets = ASLIST(0, 1, 2, 3);
@@ -14,6 +16,7 @@ $row_count = (
WHERE
Type == "table"
);
+
$bucket_size = unwrap(CAST($row_count / ListLength($buckets) AS Uint64));
DEFINE ACTION $make_bucket($bucket_number) AS
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-nested_lambda_fields_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-nested_lambda_fields_/formatted.sql
index 2c488f0c7e..3730b7bf4d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-nested_lambda_fields_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-nested_lambda_fields_/formatted.sql
@@ -1,7 +1,9 @@
USE plato;
+
$v = ($x) -> {
RETURN ListFilter(["a", "b"], ($y) -> ($y == $x));
};
+
$k = ($x) -> {
RETURN $x;
};
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-process_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-process_/formatted.sql
index 0969064845..625cc21d75 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-process_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-process_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
$p = ($s) -> ($s);
INSERT INTO Output
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-reduce_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-reduce_/formatted.sql
index 70cac8dca6..f01b5d0061 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-reduce_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-reduce_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
$r = ($_key, $s) -> ($s);
INSERT INTO Output
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-reduce_all_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-reduce_all_/formatted.sql
index 6d7d3462c8..e484c18dbd 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-reduce_all_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-reduce_all_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
$r = ($s) -> ($s);
INSERT INTO Output
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-reduce_all_row_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-reduce_all_row_/formatted.sql
index cc3f5f7d6b..c40ebcf653 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-reduce_all_row_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_lineage-reduce_all_row_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
$r = ($s) -> (Yql::FlatMap($s, ($x) -> ($x.1)));
INSERT INTO Output
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-alerts-streaming_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-alerts-streaming_/formatted.sql
index 45226a8e73..83016a70ac 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-alerts-streaming_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-alerts-streaming_/formatted.sql
@@ -13,6 +13,7 @@ $osquery_data = [
<|dt: 1688911000, host: "fqdn2", ev_type: "login", ev_status: "success", user: "user1", vpn: FALSE,|>,
<|dt: 1688911001, host: "fqdn2", ev_type: "login", ev_status: "success", user: "user1", vpn: FALSE,|>,
];
+
PRAGMA FeatureR010 = "prototype";
PRAGMA config.flags("MatchRecognizeStream", "force");
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-alerts_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-alerts_/formatted.sql
index ce52c97426..72116a0d53 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-alerts_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-alerts_/formatted.sql
@@ -13,6 +13,7 @@ $osquery_data = [
<|dt: 1688911000, host: "fqdn2", ev_type: "login", ev_status: "success", user: "user1", vpn: FALSE,|>,
<|dt: 1688911001, host: "fqdn2", ev_type: "login", ev_status: "success", user: "user1", vpn: FALSE,|>,
];
+
PRAGMA FeatureR010 = "prototype";
PRAGMA config.flags("MatchRecognizeStream", "disable");
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-alerts_without_order_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-alerts_without_order_/formatted.sql
index 3f1a7e784c..a2edb8a2b4 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-alerts_without_order_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-alerts_without_order_/formatted.sql
@@ -13,6 +13,7 @@ $osquery_data = [
<|dt: 1688911000, host: "fqdn2", ev_type: "login", ev_status: "success", user: "user1", vpn: FALSE,|>,
<|dt: 1688911001, host: "fqdn2", ev_type: "login", ev_status: "success", user: "user1", vpn: FALSE,|>,
];
+
PRAGMA FeatureR010 = "prototype";
PRAGMA config.flags("MatchRecognizeStream", "disable");
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-permute_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-permute_/formatted.sql
index 6f1d21fd87..4f086f25c1 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-permute_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-permute_/formatted.sql
@@ -11,6 +11,7 @@ $data = [
<|dt: 1688910900, event: "C"|>,
<|dt: 1688911000, event: "B"|>,
];
+
PRAGMA FeatureR010 = "prototype";
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-simple_paritioning-streaming_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-simple_paritioning-streaming_/formatted.sql
index 2972e8c2aa..faf24666fa 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-simple_paritioning-streaming_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-simple_paritioning-streaming_/formatted.sql
@@ -1,6 +1,8 @@
PRAGMA FeatureR010 = "prototype";
PRAGMA config.flags("MatchRecognizeStream", "force");
+
USE plato;
+
$data = [
<|dt: 15, host: "fqdn1", key: 0|>,
<|dt: 16, host: "fqdn1", key: 1|>,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-simple_paritioning_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-simple_paritioning_/formatted.sql
index 4f49ae7216..a880b9812d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-simple_paritioning_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-simple_paritioning_/formatted.sql
@@ -1,6 +1,8 @@
PRAGMA FeatureR010 = "prototype";
PRAGMA config.flags("MatchRecognizeStream", "disable");
+
USE plato;
+
$data = [
<|dt: 15, host: "fqdn1", key: 0|>,
<|dt: 16, host: "fqdn1", key: 1|>,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-test_type-streaming_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-test_type-streaming_/formatted.sql
index 9937c9a1ce..ce3129b33f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-test_type-streaming_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-test_type-streaming_/formatted.sql
@@ -1,6 +1,8 @@
PRAGMA FeatureR010 = "prototype";
PRAGMA config.flags("MatchRecognizeStream", "force");
+
USE plato;
+
$data = [<|dt: 4, host: "fqdn1", key: 14|>];
-- NoPartitionNoMeasure
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-test_type_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-test_type_/formatted.sql
index c691e6e2f6..08f88d458a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-test_type_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-test_type_/formatted.sql
@@ -1,6 +1,8 @@
PRAGMA FeatureR010 = "prototype";
PRAGMA config.flags("MatchRecognizeStream", "disable");
+
USE plato;
+
$data = [<|dt: 4, host: "fqdn1", key: 14|>];
-- NoPartitionNoMeasure
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-test_type_predicate_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-test_type_predicate_/formatted.sql
index b32b4463b5..005599e4b7 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-test_type_predicate_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_match_recognize-test_type_predicate_/formatted.sql
@@ -1,7 +1,9 @@
/* custom error:DEFINE expression must be a predicate*/
PRAGMA FeatureR010 = "prototype";
PRAGMA config.flags("MatchRecognizeStream", "disable");
+
USE plato;
+
$data = [<||>];
$BadPredicate =
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-and_absorption_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-and_absorption_/formatted.sql
index 239013f8f1..437cb88b2d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-and_absorption_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-and_absorption_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA config.flags("OptimizerFlags", "ExtractCommonPredicatesFromLogicalOps");
+
$a = 1 > 2;
$b = 3 < 4;
$c = 5 < 6;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-flatmap_with_non_struct_out_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-flatmap_with_non_struct_out_/formatted.sql
index 86bc3eeda2..a86f91dbd7 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-flatmap_with_non_struct_out_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-flatmap_with_non_struct_out_/formatted.sql
@@ -2,6 +2,7 @@ USE plato;
$lst =
PROCESS Input;
+
$dict = ToDict(ListMap($lst, ($x) -> (($x.key, $x.subkey))));
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-length_over_merge_fs_multiusage_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-length_over_merge_fs_multiusage_/formatted.sql
index 6e2b62c375..dc28cca2ae 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-length_over_merge_fs_multiusage_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-length_over_merge_fs_multiusage_/formatted.sql
@@ -1,5 +1,6 @@
/* postgres can not */
PRAGMA config.flags("OptimizerFlags", "FieldSubsetEnableMultiusage");
+
USE plato;
$input = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-or_absorption_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-or_absorption_/formatted.sql
index 876bba2961..f465946d48 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-or_absorption_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-or_absorption_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA config.flags("OptimizerFlags", "ExtractCommonPredicatesFromLogicalOps");
+
$a = 1 > 2;
$b = 3 < 4;
$c = 5 < 6;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-or_distributive_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-or_distributive_/formatted.sql
index 8e874585f3..12b0bc62ff 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-or_distributive_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-or_distributive_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA config.flags("OptimizerFlags", "ExtractCommonPredicatesFromLogicalOps");
+
$a = 1 > 2;
$b = 3 < 4;
$c = 5 < 6;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-passthrough_sortness_over_map_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-passthrough_sortness_over_map_/formatted.sql
index a04efd8dcf..a9a6afd84a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-passthrough_sortness_over_map_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-passthrough_sortness_over_map_/formatted.sql
@@ -11,6 +11,7 @@ ORDER BY
key,
subkey
;
+
COMMIT;
INSERT INTO @c
@@ -37,6 +38,7 @@ WHERE
ORDER BY
key
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-pushdown_nonsep_over_aggregate_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-pushdown_nonsep_over_aggregate_/formatted.sql
index 4786bc7c5e..4e2555289c 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-pushdown_nonsep_over_aggregate_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-pushdown_nonsep_over_aggregate_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA config.flags("OptimizerFlags", "PushdownComplexFiltersOverAggregate");
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-sort_over_sorted_prefix_keys_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-sort_over_sorted_prefix_keys_/formatted.sql
index 7f0db8ccd1..25527b73c5 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-sort_over_sorted_prefix_keys_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-sort_over_sorted_prefix_keys_/formatted.sql
@@ -11,6 +11,7 @@ ORDER BY
key ASC,
subkey ASC
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-sort_over_sorted_same_keys_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-sort_over_sorted_same_keys_/formatted.sql
index 5e062508cb..9d80a17f9a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-sort_over_sorted_same_keys_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-sort_over_sorted_same_keys_/formatted.sql
@@ -11,6 +11,7 @@ ORDER BY
key ASC,
subkey ASC
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-test_lmap_opts_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-test_lmap_opts_/formatted.sql
index 83a3d5fa88..dd55db0dd1 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-test_lmap_opts_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-test_lmap_opts_/formatted.sql
@@ -16,6 +16,7 @@ def processRows(prefix, rowList, separator):
return result;
@@;
+
$udf = Python::processRows(
Callable<(String, List<Struct<Name: String, Value: String>>, String) -> List<Struct<Result: String>>>,
$udfScript
@@ -28,6 +29,7 @@ $data = (
FROM
plato.Input0
);
+
$prefix = ">>";
$p1 = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-total_order_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-total_order_/formatted.sql
index 1d26598544..97bb36ff73 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-total_order_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-total_order_/formatted.sql
@@ -24,6 +24,7 @@ SELECT
SELECT
$x != $x
;
+
$x = AsStruct(Double("nan") AS a, 42 AS b);
SELECT
@@ -33,6 +34,7 @@ SELECT
SELECT
$x != $x
;
+
$x = AsTuple(Nothing(ParseType("Int32?")), 1);
SELECT
@@ -58,6 +60,7 @@ SELECT
SELECT
$x != $x
;
+
$x = Nothing(ParseType("Int32?"));
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-10070_extract_members_over_calcoverwindow_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-10070_extract_members_over_calcoverwindow_/formatted.sql
index 50d075f8c4..ddcf0b0528 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-10070_extract_members_over_calcoverwindow_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-10070_extract_members_over_calcoverwindow_/formatted.sql
@@ -10,6 +10,7 @@ SELECT
FALSE AS `WasHead`,
23 AS dummy1
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-10737_lost_passthrough_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-10737_lost_passthrough_/formatted.sql
index 8278193d1f..db59797b32 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-10737_lost_passthrough_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-10737_lost_passthrough_/formatted.sql
@@ -9,6 +9,7 @@ SELECT
"1" AS Text,
["a", "b"] AS Attachments
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-14581_fuseflatmaps_with_external_lambda_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-14581_fuseflatmaps_with_external_lambda_/formatted.sql
index 2d095802ac..b778d37cce 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-14581_fuseflatmaps_with_external_lambda_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-14581_fuseflatmaps_with_external_lambda_/formatted.sql
@@ -1,8 +1,10 @@
/* postgres can not */
USE plato;
+
$improve_low = ($val) -> {
RETURN CAST($val AS Utf8);
};
+
$names_intersection = ($org_names, $db_names) -> {
RETURN ListLength(
ListFlatten(
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 fe2b695b98..456063e7bc 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
@@ -1,4 +1,5 @@
USE plato;
+
$min_ts_for_stat_calculation = DateTime::ToSeconds(CurrentUtcDate() - Interval("P1D"));
INSERT INTO @a
@@ -45,6 +46,7 @@ ASSUME ORDER BY
puid,
timestamp DESC
;
+
COMMIT;
$target_events = (
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 1081738c66..ad08e53286 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
@@ -8,6 +8,7 @@ SELECT
ORDER BY
a
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-18408_filter_multiusage_pushdown_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-18408_filter_multiusage_pushdown_/formatted.sql
index f05a09705b..5e86357aa6 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-18408_filter_multiusage_pushdown_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-18408_filter_multiusage_pushdown_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA AnsiOptionalAs;
PRAGMA config.flags("OptimizerFlags", "FieldSubsetEnableMultiusage", "FilterPushdownEnableMultiusage", "EarlyExpandSkipNull");
@@ -58,6 +59,7 @@ SELECT
FROM
$store_sales
;
+
COMMIT;
$year_total = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-18733_no_filter_multiusage_pushdown_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-18733_no_filter_multiusage_pushdown_/formatted.sql
index fc26ed379f..613fffd48b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-18733_no_filter_multiusage_pushdown_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-18733_no_filter_multiusage_pushdown_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA config.flags("OptimizerFlags", "FilterPushdownEnableMultiusage");
+
USE plato;
$src =
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-6008_limit_after_map_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-6008_limit_after_map_/formatted.sql
index 7dfeb72bc2..8fb130eeef 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-6008_limit_after_map_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-6008_limit_after_map_/formatted.sql
@@ -10,6 +10,7 @@ FROM
WHERE
value != "111"
LIMIT 3;
+
COMMIT;
INSERT INTO Output
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-6133_skip_deps_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-6133_skip_deps_/formatted.sql
index 25616b0be0..5b3240b628 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-6133_skip_deps_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-6133_skip_deps_/formatted.sql
@@ -17,6 +17,7 @@ $row_count = (
FROM
$out
);
+
$needed_row = COALESCE(CAST(CAST($row_count AS float) * 0.5 AS Uint64), 1);
INSERT INTO Output WITH TRUNCATE
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 6e32f4f9cc..e2744dfc2d 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
@@ -1,9 +1,11 @@
/* postgres can not */
/* syntax version 1 */
USE plato;
+
$to_int = ($x) -> {
RETURN CAST($x AS Int32)
};
+
$to_in_list = ($col) -> {
RETURN ListMap(String::SplitToList($col, ","), $to_int)
};
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-7532_wrong_field_subset_for_calcoverwindow_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-7532_wrong_field_subset_for_calcoverwindow_/formatted.sql
index e4c40619dd..01dc8af8ab 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-7532_wrong_field_subset_for_calcoverwindow_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-7532_wrong_field_subset_for_calcoverwindow_/formatted.sql
@@ -9,6 +9,7 @@ SELECT
FALSE AS `IsHead`,
FALSE AS `WasHead`
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-8223_direct_row_and_skipnullmembers_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-8223_direct_row_and_skipnullmembers_/formatted.sql
index d6d512f0a4..dd5285fc7d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-8223_direct_row_and_skipnullmembers_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-8223_direct_row_and_skipnullmembers_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* syntax version 1 */
USE plato;
+
PRAGMA AnsiInForEmptyOrNullableItemsCollections;
$x = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-9297_publish_ytcopy_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-9297_publish_ytcopy_/formatted.sql
index f9262483ec..0552b7d171 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-9297_publish_ytcopy_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql-9297_publish_ytcopy_/formatted.sql
@@ -13,6 +13,7 @@ WHERE
ORDER BY
key DESC
;
+
COMMIT;
INSERT INTO Output
@@ -23,6 +24,7 @@ FROM
ORDER BY
key DESC
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql_6179_merge_chunks_of_outputs_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql_6179_merge_chunks_of_outputs_/formatted.sql
index 80979a8b22..7225f9c9e5 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql_6179_merge_chunks_of_outputs_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_optimizers-yql_6179_merge_chunks_of_outputs_/formatted.sql
@@ -3,6 +3,7 @@
/* kikimr can not - yt pragma */
PRAGMA yt.MinPublishedAvgChunkSize = "0";
PRAGMA yt.MinTempAvgChunkSize = "0";
+
USE plato;
$i = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_complex_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_complex_/formatted.sql
index e85716289c..b7d41e7416 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_complex_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_complex_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* hybridfile can not YQL-17743 */
USE plato;
+
$list = AsList(AsStruct(1 AS a, "2" AS b, "3" AS c), AsStruct(4 AS a, "5" AS b, "6" AS c));
INSERT INTO Output
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_empty_list_sort_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_empty_list_sort_/formatted.sql
index 801b355185..39823257bd 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_empty_list_sort_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_empty_list_sort_/formatted.sql
@@ -2,6 +2,7 @@
/* multirun can not */
/* syntax version 1 */
USE plato;
+
$list = ListCreate(Struct<key: String, subkey: String, value: String>);
INSERT INTO Output
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_single_item_sort_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_single_item_sort_/formatted.sql
index 5e32a81053..656c102322 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_single_item_sort_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_single_item_sort_/formatted.sql
@@ -2,6 +2,7 @@
/* multirun can not */
/* syntax version 1 */
USE plato;
+
$t = AsList(
AsStruct(1 AS key, 101 AS value)
);
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_take_zero_sort_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_take_zero_sort_/formatted.sql
index 47eb199127..1f98d5378e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_take_zero_sort_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_take_zero_sort_/formatted.sql
@@ -2,6 +2,7 @@
/* multirun can not */
/* syntax version 1 */
USE plato;
+
$t = AsList(
AsStruct(1 AS key, 101 AS value),
AsStruct(2 AS key, 34 AS value),
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_with_assume_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_with_assume_/formatted.sql
index d659c617ad..5c0fe182d8 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_with_assume_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-literal_with_assume_/formatted.sql
@@ -2,6 +2,7 @@
/* multirun can not */
/* syntax version 1 */
USE plato;
+
$t = AsList(
AsStruct(1 AS key, 101 AS value),
AsStruct(2 AS key, 34 AS value),
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-native_desc_assume_with_transform_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-native_desc_assume_with_transform_/formatted.sql
index 6e06d17373..95d9193dee 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-native_desc_assume_with_transform_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-native_desc_assume_with_transform_/formatted.sql
@@ -2,6 +2,7 @@
/* multirun can not */
/* syntax version 1 */
USE plato;
+
PRAGMA yt.UseNativeDescSort;
INSERT INTO Output
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-native_desc_publish_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-native_desc_publish_/formatted.sql
index db7c2d73f9..f1d26fe150 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-native_desc_publish_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-native_desc_publish_/formatted.sql
@@ -1,5 +1,6 @@
/* postgres can not */
USE plato;
+
PRAGMA yt.UseNativeDescSort;
INSERT INTO Output
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-native_desc_sort_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-native_desc_sort_/formatted.sql
index cd185bf504..4a0626abdc 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-native_desc_sort_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-native_desc_sort_/formatted.sql
@@ -1,5 +1,6 @@
/* postgres can not */
USE plato;
+
PRAGMA yt.UseNativeDescSort;
INSERT INTO Output
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-native_desc_sort_calc_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-native_desc_sort_calc_/formatted.sql
index 58827cc429..7d7df4746d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-native_desc_sort_calc_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-native_desc_sort_calc_/formatted.sql
@@ -1,5 +1,6 @@
/* postgres can not */
USE plato;
+
PRAGMA yt.UseNativeDescSort;
INSERT INTO Output
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-native_desc_sort_with_limit_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-native_desc_sort_with_limit_/formatted.sql
index 80b5d576e9..ada262fdf5 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-native_desc_sort_with_limit_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-native_desc_sort_with_limit_/formatted.sql
@@ -1,5 +1,6 @@
/* postgres can not */
USE plato;
+
PRAGMA yt.UseNativeDescSort;
INSERT INTO Output
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_missing_project_column_ignored_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_missing_project_column_ignored_/formatted.sql
index 012881630b..c4e74b76d9 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_missing_project_column_ignored_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_missing_project_column_ignored_/formatted.sql
@@ -4,6 +4,7 @@
/* dqfile can not */
/* yt can not */
PRAGMA warning("disable", "4504");
+
$t = [<|k: 1, v: 2|>];
$src =
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_missing_project_column_join2_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_missing_project_column_join2_/formatted.sql
index 34941a1d9f..0a51b21d1f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_missing_project_column_join2_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_missing_project_column_join2_/formatted.sql
@@ -10,6 +10,7 @@ $src = [
<|a: 2, b: 20, zz: 200|>,
<|a: 1, b: 10, zz: 100|>,
];
+
$src1 = [
<|e: 5, f: 50|>,
<|e: 4, f: 40|>,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_missing_project_column_join_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_missing_project_column_join_/formatted.sql
index 97182ec5a4..e36a7019d6 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_missing_project_column_join_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_missing_project_column_join_/formatted.sql
@@ -10,6 +10,7 @@ $src = [
<|a: 2, b: 20, zz: 200|>,
<|a: 1, b: 10, zz: 100|>,
];
+
$src1 = [
<|e: 5, f: 50|>,
<|e: 4, f: 40|>,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_missing_project_column_join_types_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_missing_project_column_join_types_/formatted.sql
index 60733c50f4..e5f714f9c7 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_missing_project_column_join_types_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_missing_project_column_join_types_/formatted.sql
@@ -10,6 +10,7 @@ $src = [
<|a: 2, b: 20, date: 200|>,
<|a: 1, b: 10, date: 100|>,
];
+
$src1 = [
<|e: 5, f: 50|>,
<|e: 4, f: 40|>,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_tuple_expr_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_tuple_expr_/formatted.sql
index 9e861969b6..598623fc92 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_tuple_expr_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-order_by_tuple_expr_/formatted.sql
@@ -2,6 +2,7 @@
/* multirun can not */
/* syntax version 1 */
USE plato;
+
$keys = ($key) -> {
RETURN AsTuple($key, $key);
};
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 ca139fe5a2..d966f7d0c0 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
@@ -13,6 +13,7 @@ FROM (
ORDER BY
x
;
+
COMMIT;
SELECT
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 d1f2de388e..1fa33cb0a9 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
@@ -1,5 +1,6 @@
/* postgres can not */
USE plato;
+
$list = AsList(
AsList(3, 1),
AsList(1, 1),
@@ -15,6 +16,7 @@ FROM (
)
FLATTEN BY x
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-singular_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-singular_/formatted.sql
index 7b2c8aafe4..ce4a620606 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-singular_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-singular_/formatted.sql
@@ -15,6 +15,7 @@ ORDER BY
z,
w
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-union_all_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-union_all_/formatted.sql
index 9a02dd3078..33a8d3134e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-union_all_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_order_by-union_all_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA DqEngine = "disable";
DEFINE SUBQUERY $sample($product_type) AS
@@ -12,6 +13,7 @@ DEFINE SUBQUERY $sample($product_type) AS
key
LIMIT 10;
END DEFINE;
+
$list = ["a", "b"];
$s = SubqueryUnionAllFor($list, $sample);
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_params-complex_yson_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_params-complex_yson_/formatted.sql
index b3a81848fd..332a744de1 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_params-complex_yson_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_params-complex_yson_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA yson.Strict;
+
DECLARE $x AS Yson;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_params-primitives_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_params-primitives_/formatted.sql
index 3275593ff9..f3d9b8d288 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_params-primitives_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_params-primitives_/formatted.sql
@@ -4,16 +4,20 @@ DECLARE $x2 AS Double;
DECLARE $x3 AS Bool;
DECLARE $x4 AS Float;
DECLARE $x5 AS String;
+
-- unicode
DECLARE $x6 AS Int64;
DECLARE $x7 AS Uint64;
DECLARE $x8 AS String;
+
-- binary
DECLARE $x9 AS Utf8;
DECLARE $x10 AS Uuid;
DECLARE $x11 AS String?;
+
-- null
DECLARE $x12 AS String?;
+
-- not null
DECLARE $x13 AS Yson;
DECLARE $x14 AS Json;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_params-tuple_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_params-tuple_/formatted.sql
index e3eea132a4..4c2ec78a9c 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_params-tuple_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_params-tuple_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
DECLARE $x1 AS Tuple<String, Int64?>;
DECLARE $x2 AS Tuple<String, Int64?>;
+
$a, $b = $x1;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_params-variant_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_params-variant_/formatted.sql
index ff97b28da0..789828f465 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_params-variant_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_params-variant_/formatted.sql
@@ -2,6 +2,7 @@
-- underlying type is tuple
DECLARE $x1 AS Variant<String, Int64>;
DECLARE $x2 AS Variant<String, Int64>;
+
-- underlying type is struct
DECLARE $x3 AS Variant<a: String, b: Int64>;
DECLARE $x4 AS Variant<a: String, b: Int64>;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-aggregate_factory_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-aggregate_factory_/formatted.sql
index 7d5daf4c55..63d1858772 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-aggregate_factory_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-aggregate_factory_/formatted.sql
@@ -22,6 +22,7 @@ FROM (
) AS a (
x
);
+
$agg_string_agg = AggregationFactory("Pg::string_agg");
SELECT
@@ -48,6 +49,7 @@ FROM (
) AS a (
x
);
+
$agg_max = AggregationFactory("Pg::max");
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-nulls_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-nulls_/formatted.sql
index 79eeb2f715..427a6f032a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-nulls_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-nulls_/formatted.sql
@@ -10,6 +10,7 @@ SELECT
Just(Nothing(pgcstring?)) AS k2,
Nothing(pgcstring??) AS k3
;
+
COMMIT;
INSERT INTO @bar
@@ -21,6 +22,7 @@ WITHOUT
FROM
@foo AS t
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-nulls_native_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-nulls_native_/formatted.sql
index bb12a24deb..3015885dc0 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-nulls_native_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-nulls_native_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA yt.UseNativeYtTypes;
INSERT INTO @foo
@@ -11,6 +12,7 @@ SELECT
Just(Nothing(pgcstring?)) AS k2,
Nothing(pgcstring??) AS k3
;
+
COMMIT;
INSERT INTO @bar
@@ -22,6 +24,7 @@ WITHOUT
FROM
@foo AS t
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-pg_iterate_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-pg_iterate_/formatted.sql
index 6433fe1fe3..30e4900d92 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-pg_iterate_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pg-pg_iterate_/formatted.sql
@@ -1,5 +1,7 @@
PRAGMA warning("disable", "4510");
+
$init = ListCreate(Struct<n: Int32>);
+
$transform = ($value) -> {
RETURN ListMap(ListFilter($value, ($r) -> ($r.n < 5)), ($r) -> (<|n: $r.n + 1|>));
};
@@ -11,7 +13,9 @@ FROM
ORDER BY
n
;
+
$init = [<|n: 1|>];
+
$transform = ($value) -> {
RETURN ListMap(ListFilter($value, ($r) -> ($r.n < 5)), ($r) -> (<|n: $r.n + 1|>));
};
@@ -23,7 +27,9 @@ FROM
ORDER BY
n
;
+
$init = [<|n: 1|>, <|n: 1|>, <|n: 2|>];
+
$transform = ($value) -> {
RETURN ListFlatMap($value, ($_r) -> ([<|n: 1|>, <|n: 2|>, <|n: 2|>]));
};
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-classic_division_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-classic_division_/formatted.sql
index 6e54af1982..3604b8e628 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-classic_division_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-classic_division_/formatted.sql
@@ -2,11 +2,13 @@
SELECT
1 / 2
;
+
PRAGMA ClassicDivision("false");
SELECT
3 / 4
;
+
PRAGMA ClassicDivision("true");
SELECT
@@ -20,6 +22,7 @@ DEFINE ACTION $div_8_by_value($value) AS
8 / $value
;
END DEFINE;
+
DO
$div_8_by_value(9)
;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-config_exec_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-config_exec_/formatted.sql
index 50b9744a68..77db3fae73 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-config_exec_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-config_exec_/formatted.sql
@@ -7,6 +7,7 @@ SELECT
"1" AS subkey,
"1" AS value
;
+
PRAGMA File("file", "dummy");
INSERT INTO Output
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-release_temp_data_chain_pull_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-release_temp_data_chain_pull_/formatted.sql
index 9fefcdb546..230be75982 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-release_temp_data_chain_pull_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-release_temp_data_chain_pull_/formatted.sql
@@ -1,5 +1,6 @@
/* kikimr can not */
USE plato;
+
PRAGMA yt.ReleaseTempData = "immediate";
PRAGMA yt.InflightTempTablesLimit = "6";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-release_temp_data_chain_pull_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-release_temp_data_chain_pull_fail_/formatted.sql
index ce54a115c1..ec6e5c1975 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-release_temp_data_chain_pull_fail_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-release_temp_data_chain_pull_fail_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA yt.ReleaseTempData = "finish";
PRAGMA yt.InflightTempTablesLimit = "6";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-release_temp_data_chain_pull_single_thread_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-release_temp_data_chain_pull_single_thread_/formatted.sql
index da8fc8afe7..f63d12b48d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-release_temp_data_chain_pull_single_thread_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-release_temp_data_chain_pull_single_thread_/formatted.sql
@@ -1,5 +1,6 @@
/* kikimr can not */
USE plato;
+
PRAGMA yt.ReleaseTempData = "immediate";
PRAGMA yt.InflightTempTablesLimit = "3";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-release_temp_data_chain_pull_single_thread_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-release_temp_data_chain_pull_single_thread_fail_/formatted.sql
index 3fc7c60c90..cae788b7ea 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-release_temp_data_chain_pull_single_thread_fail_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_pragma-release_temp_data_chain_pull_single_thread_fail_/formatted.sql
@@ -1,5 +1,6 @@
/* dq can not */
USE plato;
+
PRAGMA yt.ReleaseTempData = "immediate";
PRAGMA yt.InflightTempTablesLimit = "2";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-discard_reduce_lambda_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-discard_reduce_lambda_/formatted.sql
index 39ac423d17..bbb3f0c5f2 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-discard_reduce_lambda_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-discard_reduce_lambda_/formatted.sql
@@ -1,5 +1,6 @@
/* postgres can not */
USE plato;
+
$udf = YQL::@@(lambda '(key stream) (AsStruct
'('key key) '('summ (Collect (Condense stream (Uint32 '0) (lambda '(item state) (Bool 'False)) (lambda '(item state) (Add state item)))))
))@@;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-fuse_reduces_with_presort_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-fuse_reduces_with_presort_/formatted.sql
index d712db8be6..371e9e4feb 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-fuse_reduces_with_presort_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-fuse_reduces_with_presort_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
$reduce = ($_, $TableRows) -> {
RETURN Yql::Condense1(
$TableRows,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-native_desc_reduce_with_presort_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-native_desc_reduce_with_presort_/formatted.sql
index 60dcaf0299..05e241cba8 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-native_desc_reduce_with_presort_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-native_desc_reduce_with_presort_/formatted.sql
@@ -1,6 +1,8 @@
/* postgres can not */
USE plato;
+
PRAGMA yt.UseNativeDescSort;
+
$udf = YQL::@@(lambda '(key stream) (AsStruct
'('key key) '('summ (Collect (Condense stream (Nothing (OptionalType (DataType 'String))) (lambda '(item state) (Bool 'False)) (lambda '(item state) (Coalesce state (Just item))))))
))@@;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_lambda_opt_args_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_lambda_opt_args_/formatted.sql
index 6765230e91..c15a34156b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_lambda_opt_args_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_lambda_opt_args_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
$f = ($x, $optArg?) -> {
RETURN Ensure($x, $optArg IS NULL OR len($optArg) > 0);
};
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_multi_in_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_multi_in_/formatted.sql
index 575e42af46..ee2fbdad2d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_multi_in_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_multi_in_/formatted.sql
@@ -12,6 +12,7 @@ $record = (
FROM
plato.Input
);
+
$recordType = TypeOf(Unwrap($record));
$streamType = StreamType(VariantType(TupleType($recordType, $recordType, $recordType)));
$udf = Python3::MyFunc(CallableType(0, $streamType, $streamType), $udfScript);
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_multi_in_trivial_lambda_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_multi_in_trivial_lambda_/formatted.sql
index 635d52ec2d..dc31d99c95 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_multi_in_trivial_lambda_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_multi_in_trivial_lambda_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
$lambda = ($x) -> {
RETURN $x;
};
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_multi_out_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_multi_out_/formatted.sql
index d2722c8d68..b9ee243a9f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_multi_out_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_multi_out_/formatted.sql
@@ -11,7 +11,9 @@ $record = (
FROM
plato.Input
);
+
$recordType = TypeOf(Unwrap($record));
+
$udf = Python::MyFunc(
CallableType(
0,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_multi_out_bad_count_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_multi_out_bad_count_fail_/formatted.sql
index 45e53efcd8..eadaf07da2 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_multi_out_bad_count_fail_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_multi_out_bad_count_fail_/formatted.sql
@@ -10,7 +10,9 @@ $record = (
FROM
plato.Input
);
+
$recordType = TypeOf(Unwrap($record));
+
$udf = Python::MyFunc(
CallableType(
0,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_pure_with_sort_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_pure_with_sort_/formatted.sql
index 6861f27bcd..7bf18bc65c 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_pure_with_sort_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_pure_with_sort_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
$sorted = ($world, $input, $orderByColumns, $asc) -> {
$n = ListLength($orderByColumns);
$keySelector = LambdaCode(
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_row_and_columns_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_row_and_columns_/formatted.sql
index 4de7e9883a..e724938169 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_row_and_columns_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_row_and_columns_/formatted.sql
@@ -4,6 +4,7 @@ $udfScript = @@
def processRow(row, tag, separator):
return {"value":row.Name + separator + row.Value + separator + tag};
@@;
+
$udf = Python::processRow(
Callable<(Struct<Name: String, Tag: String, Value: String>, String, String) -> Struct<value: String>>,
$udfScript
@@ -17,6 +18,7 @@ $data = (
FROM
plato.Input0
);
+
$separator = "|";
PROCESS $data
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_rows_and_filter_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_rows_and_filter_/formatted.sql
index dd7cae04cb..bcd5650b40 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_rows_and_filter_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_rows_and_filter_/formatted.sql
@@ -8,6 +8,7 @@ def processRows(prefix, rowList, separator):
return result;
@@;
+
$udf = Python::processRows(
Callable<(String, Stream<Struct<Name: String, Value: String>>, String) -> Stream<Struct<Data: String>>>,
$udfScript
@@ -20,6 +21,7 @@ $data = (
FROM
plato.Input1
);
+
$prefix = ">>";
PROCESS $data
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 7c36a10edb..6596b4f06f 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
@@ -1,4 +1,5 @@
USE plato;
+
$values = ListMap(
ListFromRange(0, 30),
($x) -> (AsStruct($x AS x))
@@ -12,7 +13,9 @@ FROM
ORDER BY
x DESC
;
+
COMMIT;
+
$splitter = ($rows) -> {
$recordType = StreamItemType(TypeOf($rows));
$varType = VariantType(TupleType($recordType, $recordType, $recordType, $recordType));
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 aa9cf43c8a..7170b6c85f 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
@@ -1,4 +1,5 @@
USE plato;
+
$values = ListMap(
ListFromRange(0, 30),
($x) -> (AsStruct($x AS x))
@@ -12,7 +13,9 @@ FROM
ORDER BY
x
;
+
COMMIT;
+
$splitter = ($rows) -> {
$recordType = StreamItemType(TypeOf($rows));
$varType = VariantType(TupleType($recordType, $recordType, $recordType, $recordType));
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 8576ce8527..dd4c29411c 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
@@ -1,4 +1,5 @@
USE plato;
+
$values = ListMap(
ListFromRange(0, 30),
($x) -> (AsStruct($x AS x))
@@ -12,7 +13,9 @@ FROM
ORDER BY
x DESC
;
+
COMMIT;
+
$splitter = ($row) -> {
$recordType = TypeOf($row);
$varType = VariantType(TupleType($recordType, $recordType, $recordType, $recordType));
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 17b176bf84..3d171c6479 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
@@ -1,4 +1,5 @@
USE plato;
+
$values = ListMap(
ListFromRange(0, 30),
($x) -> (AsStruct($x AS x))
@@ -12,7 +13,9 @@ FROM
ORDER BY
x
;
+
COMMIT;
+
$splitter = ($row) -> {
$recordType = TypeOf($row);
$varType = VariantType(TupleType($recordType, $recordType, $recordType, $recordType));
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_assume_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_assume_/formatted.sql
index 564abf5868..7e3f597e28 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_assume_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_assume_/formatted.sql
@@ -2,6 +2,7 @@
/* multirun can not */
/* syntax version 1 */
USE plato;
+
$udf = YQL::@@(lambda '(x)
(FlatMap x
(lambda '(y) (Just (AsStruct '('key (Concat (String '"0") (Member y 'key))) '('subkey (Member y 'subkey)) '('value (Member y 'value)))))
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_lambda_outstream_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_lambda_outstream_/formatted.sql
index 2cf3d1d5b6..4271308917 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_lambda_outstream_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_lambda_outstream_/formatted.sql
@@ -1,24 +1,28 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
$f1 = ($r) -> {
RETURN $r;
};
PROCESS Input0
USING $f1(TableRow());
+
$f2 = ($r) -> {
RETURN Just($r);
};
PROCESS Input0
USING $f2(TableRow());
+
$f3 = ($r) -> {
RETURN AsList($r, $r);
};
PROCESS Input0
USING $f3(TableRow());
+
$f4 = ($r) -> {
RETURN Yql::Iterator(AsList($r, $r));
};
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_python_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_python_/formatted.sql
index 48f715852d..db9ab141ff 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_python_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_python_/formatted.sql
@@ -4,6 +4,7 @@ $udfScript = @@
def Dup(s):
return [{"value":s},{"value":s}]
@@;
+
$udf = Python::Dup(Callable<(String) -> List<Struct<value: String>>>, $udfScript);
PROCESS plato.Input0
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_python_as_struct_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_python_as_struct_/formatted.sql
index 677d3f5b49..6b97599689 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_python_as_struct_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_python_as_struct_/formatted.sql
@@ -4,6 +4,7 @@ $udfScript = @@
def Dup(s):
return [s, s];
@@;
+
$udf = Python::Dup(Callable<(String) -> List<String>>, $udfScript);
PROCESS plato.Input0
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_python_stream_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_python_stream_/formatted.sql
index 42040d8c78..2379dc7f00 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_python_stream_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_python_stream_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* kikimr can not */
USE plato;
+
$udfScript = @@
def f(input,x):
for i in input:
@@ -11,6 +12,7 @@ def f(input,x):
'pass': x
}
@@;
+
$udf_stream = Python3::f(
Callable<
(Stream<Struct<key: String, subkey: String, value: String>>, Int32) -> Stream<Struct<key: String, subkey: String, value: String, pass: Int32>>
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_udf_validate_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_udf_validate_/formatted.sql
index 92292d2079..c723a18ceb 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_udf_validate_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_udf_validate_/formatted.sql
@@ -3,6 +3,7 @@ $processed = (
PROCESS plato.Input0
USING Person::New(key, subkey, coalesce(CAST(value AS Uint32), 0))
);
+
PRAGMA config.flags("ValidateUdf", "Lazy");
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_udf_validate_ignore_broken_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_udf_validate_ignore_broken_/formatted.sql
index 2fd6f0f5d5..f823ed2ce4 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_udf_validate_ignore_broken_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-process_with_udf_validate_ignore_broken_/formatted.sql
@@ -3,6 +3,7 @@ $processed = (
PROCESS plato.Input0
USING Person::New(key, subkey, Length(SimpleUdf::ReturnBrokenInt()))
);
+
PRAGMA config.flags("ValidateUdf", "None");
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_all_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_all_/formatted.sql
index be805b67fd..b250488f7d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_all_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_all_/formatted.sql
@@ -2,12 +2,14 @@
/* postgres can not */
/* dqfile can not */
USE plato;
+
$udfScript = @@
import functools
def Len(stream):
sums = [functools.reduce(lambda x,y: x + int(y.value), pair[1], 0) for pair in stream]
return {"sumByAllVal":functools.reduce(lambda x,y: x + y, sums, 0)}
@@;
+
$udf = Python::Len(Callable<(Stream<Tuple<String, Stream<Struct<key: String, subkey: String, value: String>>>>) -> Struct<sumByAllVal: Uint32>>, $udfScript);
--INSERT INTO Output
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_all_expr_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_all_expr_/formatted.sql
index a786eeb851..9bc4a586b5 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_all_expr_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_all_expr_/formatted.sql
@@ -2,12 +2,14 @@
/* syntax version 1 */
/* dqfile can not */
USE plato;
+
$udfScript = @@
import functools
def Len(stream):
sums = [functools.reduce(lambda x,y: x + y, pair[1], 0) for pair in stream]
return {"sumByAllVal":functools.reduce(lambda x,y: x + y, sums, 0)}
@@;
+
$udf = Python::Len(Callable<(Stream<Tuple<String, Stream<Uint32>>>) -> Struct<sumByAllVal: Uint32>>, $udfScript);
--INSERT INTO Output
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_all_list_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_all_list_/formatted.sql
index d715a64b90..e0f18bc74e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_all_list_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_all_list_/formatted.sql
@@ -3,6 +3,7 @@
/* dq can not */
/* dqfile can not */
USE plato;
+
$udfScript = @@
import functools
@@ -10,6 +11,7 @@ def Len(stream):
sums = [functools.reduce(lambda x,y: x + int(y.value), pair[1], 0) for pair in stream]
return [{"sumByAllVal":functools.reduce(lambda x,y: x + y, sums, 0)}]
@@;
+
$udf = Python::Len(Callable<(Stream<Tuple<String, Stream<Struct<key: String, subkey: String, value: String>>>>) -> List<Struct<sumByAllVal: Uint32>>>, $udfScript);
--INSERT INTO Output
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_all_list_stream_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_all_list_stream_/formatted.sql
index f8ff07ab2e..89397f949f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_all_list_stream_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_all_list_stream_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
$udfScript = @@
import functools
from yql import TYieldIteration
@@ -17,6 +18,7 @@ def Sum(stream):
yield {"sumByAllVal":functools.reduce(lambda x,y: x + y, sums, 0)}
return Gen(stream)
@@;
+
$udf = Python3::Sum(Callable<(Stream<Tuple<String, Stream<Struct<key: String, subkey: String, value: String>>>>) -> Stream<Struct<sumByAllVal: Uint32>>>, $udfScript);
--INSERT INTO Output
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_all_multi_in_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_all_multi_in_/formatted.sql
index f6c20d5695..091f3462e0 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_all_multi_in_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_all_multi_in_/formatted.sql
@@ -2,12 +2,14 @@
/* postgres can not */
/* dqfile can not */
USE plato;
+
$udfScript = @@
import functools
def Len(stream):
sums = [functools.reduce(lambda x,y: x + int(y[1].value), pair[1], 0) for pair in stream]
return {"sumByAllVal":functools.reduce(lambda x,y: x + y, sums, 0)}
@@;
+
$udf = Python::Len(Callable<(Stream<Tuple<String, Stream<Variant<Struct<key: String, subkey: String, value: String>, Struct<key: String, subkey: String, value: String>>>>>) -> Struct<sumByAllVal: Uint32>>, $udfScript);
REDUCE Input1, Input1
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_all_opt_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_all_opt_/formatted.sql
index 0e5daa6010..f3770e1582 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_all_opt_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_all_opt_/formatted.sql
@@ -2,12 +2,14 @@
/* postgres can not */
/* dqfile can not */
USE plato;
+
$udfScript = @@
import functools
def Len(stream):
sums = [functools.reduce(lambda x,y: x + int(y.value), pair[1], 0) for pair in stream]
return {"sumByAllVal":functools.reduce(lambda x,y: x + y, sums, 0)}
@@;
+
$udf = Python::Len(Callable<(Stream<Tuple<String, Stream<Struct<key: String, subkey: String, value: String>>>>) -> Optional<Struct<sumByAllVal: Uint32>>>, $udfScript);
--INSERT INTO Output
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_by_struct_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_by_struct_/formatted.sql
index a733c2c3f7..9ce56c1c6f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_by_struct_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_by_struct_/formatted.sql
@@ -9,7 +9,9 @@ FROM
<|key: <|field1: 1, field2: 1|>, value: 2|>,
])
;
+
COMMIT;
+
$reducer = ($_key, $stream) -> ($stream);
REDUCE @tmp
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_lambda_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_lambda_/formatted.sql
index bd8db1cec8..940881f18b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_lambda_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_lambda_/formatted.sql
@@ -1,5 +1,6 @@
/* postgres can not */
USE plato;
+
$udf = YQL::@@(lambda '(key stream) (AsStruct
'('key key) '('summ (Collect (Condense stream (Uint32 '0) (lambda '(item state) (Bool 'False)) (lambda '(item state) (Add state item)))))
))@@;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_lambda_list_mem_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_lambda_list_mem_/formatted.sql
index 3d4180d12c..cd79b45d30 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_lambda_list_mem_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_lambda_list_mem_/formatted.sql
@@ -1,5 +1,6 @@
/* postgres can not */
USE plato;
+
$udf = YQL::@@(lambda '(key stream) (AsStruct
'('key key) '('summ (Collect (Condense stream (Uint32 '0) (lambda '(item state) (Bool 'False)) (lambda '(item state) (Add state item)))))
))@@;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_lambda_list_table_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_lambda_list_table_/formatted.sql
index 80ea269970..c0b28f8df9 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_lambda_list_table_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_lambda_list_table_/formatted.sql
@@ -1,5 +1,6 @@
/* postgres can not */
USE plato;
+
$udf = YQL::@@(lambda '(key stream) (AsStruct
'('key key) '('summ (Collect (Condense stream (Uint32 '0) (lambda '(item state) (Bool 'False)) (lambda '(item state) (Add state item)))))
))@@;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_lambda_presort_twin_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_lambda_presort_twin_/formatted.sql
index 75d6f27001..8a32e579dc 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_lambda_presort_twin_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_lambda_presort_twin_/formatted.sql
@@ -1,5 +1,6 @@
/* postgres can not */
USE plato;
+
$udf = YQL::@@(lambda '(key stream) (AsStruct
'('key key) '('superstring (Collect (Condense stream (String '"") (lambda '(item state) (Bool 'False)) (lambda '(item state)
(Concat state (Concat (Member item 'char) (Member item 'num)))
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_lambda_presort_twin_list_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_lambda_presort_twin_list_/formatted.sql
index 2cb283395c..aa4483bb06 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_lambda_presort_twin_list_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_lambda_presort_twin_list_/formatted.sql
@@ -1,5 +1,6 @@
/* postgres can not */
USE plato;
+
$udf = YQL::@@(lambda '(key stream) (AsStruct
'('key key) '('superstring (Collect (Condense stream (String '"") (lambda '(item state) (Bool 'False)) (lambda '(item state)
(Concat state (Concat (Member item 'char) (Member item 'num)))
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_/formatted.sql
index 1528f95c8b..6d5a13a15c 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
$udf = YQL::@@
(lambda '(key stream)
(PartitionByKey stream
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_difftype_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_difftype_/formatted.sql
index 4f66a82e67..5071758257 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_difftype_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_difftype_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
$udf = YQL::@@
(lambda '(key stream)
(PartitionByKey stream
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_difftype_assume_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_difftype_assume_/formatted.sql
index 8c44f7d112..59c47af2a6 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_difftype_assume_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_difftype_assume_/formatted.sql
@@ -1,12 +1,14 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
$user_process = ($key, $t1, $t2, $t3) -> {
RETURN AsStruct(
$key AS key,
COALESCE(CAST($t1.subkey AS Int32), 0) + COALESCE(CAST($t2.subkey AS Int32), 0) + COALESCE(CAST($t3.subkey AS Int32), 0) AS subkey
);
};
+
$reducer = ($key, $stream) -> {
$stream = YQL::OrderedMap(
$stream, ($item) -> {
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_difftype_assume_keytuple_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_difftype_assume_keytuple_/formatted.sql
index 99b517e93a..3180442c68 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_difftype_assume_keytuple_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_difftype_assume_keytuple_/formatted.sql
@@ -1,12 +1,14 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
$user_process = ($key, $t1, $t2, $t3) -> {
RETURN AsStruct(
$key.0 AS key,
COALESCE(CAST($t1.subkey AS Int32), 0) + COALESCE(CAST($t2.subkey AS Int32), 0) + COALESCE(CAST($t3.subkey AS Int32), 0) AS subkey
);
};
+
$reducer = ($key, $stream) -> {
$stream = YQL::OrderedMap(
$stream, ($item) -> {
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_keytuple_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_keytuple_/formatted.sql
index 4537511548..56ff5510be 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_keytuple_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_keytuple_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
$udf = YQL::@@
(lambda '(key stream)
(PartitionByKey stream
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_keytuple_difftype_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_keytuple_difftype_/formatted.sql
index 2ca466b445..fa194e841a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_keytuple_difftype_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_keytuple_difftype_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
$udf = YQL::@@
(lambda '(key stream)
(PartitionByKey stream
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_presort_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_presort_/formatted.sql
index 49223bc1aa..999fec9ba9 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_presort_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_presort_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
$udf = YQL::@@
(lambda '(key stream)
(PartitionByKey stream
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_ref_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_ref_/formatted.sql
index 2469eccb65..ebefe49beb 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_ref_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_ref_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
$udf = YQL::@@
(lambda '(key stream)
(PartitionByKey stream
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_sampling_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_sampling_/formatted.sql
index 48e70f43bf..9c9d2d4872 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_sampling_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_sampling_/formatted.sql
@@ -2,6 +2,7 @@
/* postgres can not */
/* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 16 */
USE plato;
+
$udf = YQL::@@
(lambda '(key stream)
(PartitionByKey stream
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_stage_and_flatmap_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_stage_and_flatmap_/formatted.sql
index 4689e28ab3..fac60f67ed 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_stage_and_flatmap_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_in_stage_and_flatmap_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
$udf = YQL::@@
(lambda '(key stream)
(PartitionByKey stream
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_out_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_out_/formatted.sql
index c631becc9f..8565844c9a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_out_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_multi_out_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
$udfScript = @@
import functools
@@ -8,6 +9,7 @@ def Len(key, input):
sumByValue = functools.reduce(lambda x,y: x + int(y.value), input, 0)
return (sumByValue % 2, {"sumByVal": sumByValue})
@@;
+
$udf = Python::Len(Callable<(String, Stream<Struct<key: String, subkey: String, value: String>>) -> Variant<Struct<sumByVal: Uint32>, Struct<sumByVal: Uint32>>>, $udfScript);
$i, $j = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_subfields_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_subfields_/formatted.sql
index 663f8b652f..5943bfbcda 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_subfields_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_subfields_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* syntax version 1 */
USE plato;
+
$udfScript = @@
def f(key, input):
for i in input:
@@ -10,6 +11,7 @@ def f(key, input):
'pass': 10
}
@@;
+
$udf_stream = Python3::f(
Callable<
(String, Stream<Struct<key: String, value: String>>) -> Stream<Struct<key: String, value: String, pass: Int32>>
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 70ce52b33d..070d83114f 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
@@ -2,6 +2,7 @@
/* syntax version 1 */
/* ignore runonopt plan diff */
USE plato;
+
PRAGMA warning("disable", "4510");
$r1 =
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_assume_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_assume_/formatted.sql
index 1dfd38abd6..d0fbca83aa 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_assume_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_assume_/formatted.sql
@@ -2,6 +2,7 @@
/* multirun can not */
/* syntax version 1 */
USE plato;
+
$udf = YQL::@@(lambda '(key stream) (AsStruct
'('key key) '('sum (Collect (Condense stream (Uint32 '0) (lambda '(item state) (Bool 'False)) (lambda '(item state) (Add state item)))))
))@@;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_assume_in_subquery_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_assume_in_subquery_/formatted.sql
index 3b2a37f762..9c8c8bf3d1 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_assume_in_subquery_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_assume_in_subquery_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* syntax version 1 */
USE plato;
+
$udf = YQL::@@(lambda '(key stream) (AsStruct
'('key key) '('summ (Collect (Condense stream (Nothing (OptionalType (DataType 'String))) (lambda '(item state) (Bool 'False)) (lambda '(item state) (Coalesce state (Just item))))))
))@@;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_flat_lambda_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_flat_lambda_/formatted.sql
index d50650ffb4..7b430d2457 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_flat_lambda_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_flat_lambda_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* kikimr can not */
USE plato;
+
$udf_stream = ($input) -> {
RETURN $input
};
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_flat_python_stream_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_flat_python_stream_/formatted.sql
index 38be74ddd7..d0d43d384f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_flat_python_stream_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_flat_python_stream_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* kikimr can not */
USE plato;
+
$udfScript = @@
def f(input):
s = []
@@ -16,6 +17,7 @@ def f(input):
'value': b''.join(s),
}
@@;
+
$udf_stream = Python3::f(
Callable<
(Stream<Struct<key: String, subkey: String, value: String>>) -> Stream<Struct<key: String, subkey1: String, value: String>>
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_presort_diff_order_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_presort_diff_order_/formatted.sql
index f2ed33e9b9..1723765ae3 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_presort_diff_order_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_presort_diff_order_/formatted.sql
@@ -44,7 +44,9 @@ ORDER BY
value1,
value2
;
+
COMMIT;
+
$udf = YQL::@@(lambda '(key stream) (AsStruct
'('key key) '('summ (Collect (Condense stream (Nothing (OptionalType (DataType 'String))) (lambda '(item state) (Bool 'False)) (lambda '(item state) (Coalesce state (Just item))))))
))@@;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_/formatted.sql
index b3257493d4..486afd2bca 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_/formatted.sql
@@ -1,11 +1,13 @@
/* postgres can not */
/* syntax version 1 */
USE plato;
+
$udfScript = @@
import functools
def Len(key, input):
return {"value":functools.reduce(lambda x,y: x + 1, input, 0)}
@@;
+
$udf = Python::Len(Callable<(String, Stream<String>) -> Struct<value: Uint32>>, $udfScript);
--INSERT INTO Output
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_few_keys_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_few_keys_/formatted.sql
index 12863af260..8d02b07ceb 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_few_keys_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_few_keys_/formatted.sql
@@ -5,6 +5,7 @@ import functools
def Len(val_key, input):
return {"zuza": {val_key[0] + b"-" + str(val_key[1]).encode('utf-8'): functools.reduce(lambda x,y: x + 1, input, 0)}}
@@;
+
$udf = Python::Len(Callable<(Tuple<String, Uint32>, Stream<String>) -> Struct<zuza: Dict<String, Uint32>>>, $udfScript);
$data = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_few_keys_stream_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_few_keys_stream_/formatted.sql
index af7ab174e8..57820a0cf7 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_few_keys_stream_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_few_keys_stream_/formatted.sql
@@ -1,12 +1,14 @@
/* postgres can not */
/* syntax version 1 */
USE plato;
+
$udfScript = @@
import functools
def Len(val_key, input):
return {"zuza": {val_key[0] + b"-" + str(val_key[1]).encode('utf-8'): functools.reduce(lambda x, y: x + 1, input, 0)}}
@@;
+
$udf = Python3::Len(Callable<(Tuple<String, Uint32>, Stream<String>) -> Struct<zuza: Dict<String, Uint32>>>, $udfScript);
$data = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_filter_and_having_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_filter_and_having_/formatted.sql
index 3e2b56ec22..66ac4c396e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_filter_and_having_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_filter_and_having_/formatted.sql
@@ -1,11 +1,13 @@
/* postgres can not */
/* syntax version 1 */
USE plato;
+
$udfScript = @@
import functools
def Len(key, input):
return {"total":functools.reduce(lambda x,y: x + 1, input, 0)}
@@;
+
$udf = Python::Len(Callable<(String, Stream<String>) -> Struct<total: Uint32>>, $udfScript);
--INSERT INTO Output
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_having_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_having_/formatted.sql
index e6a471feae..d7282c5f19 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_having_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_having_/formatted.sql
@@ -1,11 +1,13 @@
/* postgres can not */
/* syntax version 1 */
USE plato;
+
$udfScript = @@
import functools
def Len(key, input):
return {"count":functools.reduce(lambda x,y: x + 1, input, 0)}
@@;
+
$udf = Python::Len(Callable<(String, Stream<String>) -> Struct<count: Uint32>>, $udfScript);
--INSERT INTO Output
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_presort_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_presort_/formatted.sql
index 3b3abd2de2..369ff19dc8 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_presort_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_presort_/formatted.sql
@@ -1,10 +1,12 @@
/* postgres can not */
/* syntax version 1 */
USE plato;
+
$udfScript = @@
def Len(val_key, input):
return {"joined": {val_key: b", ".join(input)}}
@@;
+
$udf = Python3::Len(Callable<(String, Stream<String>) -> Struct<joined: Dict<String, String>>>, $udfScript);
--INSERT INTO Output
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_presort_stream_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_presort_stream_/formatted.sql
index 959a9f00c8..f61cf46e84 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_presort_stream_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_presort_stream_/formatted.sql
@@ -1,10 +1,12 @@
/* postgres can not */
/* syntax version 1 */
USE plato;
+
$udfScript = @@
def Len(val_key, input):
return {"joined": {val_key: b", ".join(input)}}
@@;
+
$udf = Python::Len(Callable<(String, Stream<String>) -> Struct<joined: Dict<String, String>>>, $udfScript);
--INSERT INTO Output
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_row_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_row_/formatted.sql
index d973e904c3..a5e9eae249 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_row_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_row_/formatted.sql
@@ -1,12 +1,14 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
$udfScript = @@
import functools
def Len(key, input):
return {"sumByVal": functools.reduce(lambda x,y: x + int(y.value), input, 0)}
@@;
+
$udf = Python3::Len(Callable<(String, Stream<Struct<key: String, subkey: String, value: String>>) -> Struct<sumByVal: Uint32>>, $udfScript);
--INSERT INTO Output
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_row_repack_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_row_repack_/formatted.sql
index 1f93285339..f6f973a65c 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_row_repack_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_produce-reduce_with_python_row_repack_/formatted.sql
@@ -1,11 +1,13 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
$udfScript = @@
import functools
def Len(key, input):
return {"sumByValAndKeyLen":functools.reduce(lambda x,y: x + int(y.value) + len(y.key), input, 0)}
@@;
+
$udf = Python::Len(Callable<(String, Stream<Struct<key: String, value: String>>) -> Struct<sumByValAndKeyLen: Uint32>>, $udfScript);
--INSERT INTO Output
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-bind_expr_subquery_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-bind_expr_subquery_/formatted.sql
index e992b00af2..390ebdf784 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-bind_expr_subquery_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-bind_expr_subquery_/formatted.sql
@@ -7,6 +7,7 @@ $rc = (
FROM
Input
);
+
$sample_size = 10;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-bind_expr_udf_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-bind_expr_udf_/formatted.sql
index a296b56fa5..7a2f11fb41 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-bind_expr_udf_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-bind_expr_udf_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
$percent = Math::Ceil(0.2);
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-bind_join_left_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-bind_join_left_/formatted.sql
index 8dd2d408ff..af0da6f7e9 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-bind_join_left_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-bind_join_left_/formatted.sql
@@ -3,6 +3,7 @@
/* hybridfile can not YQL-17764 */
/* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 3 */
USE plato;
+
PRAGMA DisableSimpleColumns;
$a =
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-bind_join_right_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-bind_join_right_/formatted.sql
index 4f323b3f80..2adf0856e6 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-bind_join_right_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-bind_join_right_/formatted.sql
@@ -3,6 +3,7 @@
/* hybridfile can not YQL-17764 */
/* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 3 */
USE plato;
+
PRAGMA DisableSimpleColumns;
$a =
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-bind_multiple_sample_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-bind_multiple_sample_/formatted.sql
index 573e82bc41..3c8da954ca 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-bind_multiple_sample_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-bind_multiple_sample_/formatted.sql
@@ -25,6 +25,7 @@ FROM
$var
TABLESAMPLE BERNOULLI (50)
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-insert_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-insert_/formatted.sql
index eee96b73bd..dc0e7412e9 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-insert_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-insert_/formatted.sql
@@ -9,6 +9,7 @@ FROM
Input
TABLESAMPLE BERNOULLI (30) REPEATABLE (1)
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-join_left_sample_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-join_left_sample_/formatted.sql
index 7fe0d29fd9..0664e66832 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-join_left_sample_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-join_left_sample_/formatted.sql
@@ -2,6 +2,7 @@
/* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 10 */
/* ignore plan diff */
USE plato;
+
PRAGMA DisableSimpleColumns;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-join_right_sample_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-join_right_sample_/formatted.sql
index 7473fa7eeb..51eb037453 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-join_right_sample_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-join_right_sample_/formatted.sql
@@ -2,6 +2,7 @@
/* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 10 */
/* syntax version 1 */
USE plato;
+
PRAGMA DisableSimpleColumns;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-mapjoin_left_sample_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-mapjoin_left_sample_/formatted.sql
index 7c5f7b5ec7..38735f8efe 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-mapjoin_left_sample_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-mapjoin_left_sample_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 10 */
USE plato;
+
PRAGMA DisableSimpleColumns;
PRAGMA yt.MapJoinLimit = "1m";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-mapjoin_right_sample_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-mapjoin_right_sample_/formatted.sql
index e118584c74..bee1d03a00 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-mapjoin_right_sample_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-mapjoin_right_sample_/formatted.sql
@@ -2,6 +2,7 @@
/* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 10 */
/* syntax version 1 */
USE plato;
+
PRAGMA yt.MapJoinLimit = "1m";
PRAGMA DisableSimpleColumns;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-orderedjoin_left_sample_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-orderedjoin_left_sample_/formatted.sql
index cc66425b6c..83e1335b9f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-orderedjoin_left_sample_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-orderedjoin_left_sample_/formatted.sql
@@ -3,6 +3,7 @@
/* ignore plan diff */
/* syntax version 1 */
USE plato;
+
PRAGMA yt.JoinMergeTablesLimit = "2";
PRAGMA DisableSimpleColumns;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-orderedjoin_right_sample_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-orderedjoin_right_sample_/formatted.sql
index e7c5112f70..98f65b1d4b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-orderedjoin_right_sample_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-orderedjoin_right_sample_/formatted.sql
@@ -3,6 +3,7 @@
/* ignore plan diff */
/* syntax version 1 */
USE plato;
+
PRAGMA yt.JoinMergeTablesLimit = "2";
PRAGMA DisableSimpleColumns;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-reduce_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-reduce_/formatted.sql
index 8e30238c31..a2c59f6f5b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-reduce_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-reduce_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 8 */
USE plato;
+
$udf = YQL::@@(lambda '(key stream) (AsStruct
'('key key) '('summ (Collect (Condense stream (Uint32 '0) (lambda '(item state) (Bool 'False)) (lambda '(item state) (Add state item)))))
))@@;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-reduce_with_presort_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-reduce_with_presort_/formatted.sql
index 12a69e28fc..c6a7f9a389 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-reduce_with_presort_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-reduce_with_presort_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 8 */
USE plato;
+
$udf = YQL::@@(lambda '(key stream) (AsStruct
'('key key) '('summ (Collect (Condense stream (Uint32 '0) (lambda '(item state) (Bool 'False)) (lambda '(item state) (Add state item)))))
))@@;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-subquery_mapjoin_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-subquery_mapjoin_/formatted.sql
index bed8ffc0d0..4411bcbca2 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-subquery_mapjoin_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-subquery_mapjoin_/formatted.sql
@@ -3,6 +3,7 @@
/* hybridfile can not YQL-17764 */
/* custom check: len(yt_res_yson[0]['Write'][0]['Data']) < 10 */
USE plato;
+
PRAGMA DisableSimpleColumns;
PRAGMA yt.MapJoinLimit = "1m";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-yql-14664_deps_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-yql-14664_deps_/formatted.sql
index 5f5d752fbf..70c886b980 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-yql-14664_deps_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_sampling-yql-14664_deps_/formatted.sql
@@ -10,6 +10,7 @@ FROM
WHERE
key > "020"
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-fake_column_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-fake_column_/formatted.sql
index 82608216ea..24469083d0 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-fake_column_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-fake_column_/formatted.sql
@@ -10,6 +10,7 @@ FROM (
)
FLATTEN COLUMNS
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-insert_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-insert_/formatted.sql
index 4bfb5115c4..ea78876b39 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-insert_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-insert_/formatted.sql
@@ -7,6 +7,7 @@ FROM
WHERE
a IS NOT NULL
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-insert_sorted_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-insert_sorted_/formatted.sql
index 6c07f0f342..6f8bcbccd7 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-insert_sorted_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-insert_sorted_/formatted.sql
@@ -10,6 +10,7 @@ ORDER BY
b,
c
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-limit_directread_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-limit_directread_/formatted.sql
index d7159c5ec4..a1d9256c6d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-limit_directread_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-limit_directread_/formatted.sql
@@ -1,5 +1,6 @@
/* postgres can not */
USE plato;
+
PRAGMA directread;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-user_schema_bind_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-user_schema_bind_/formatted.sql
index 8632a34f33..a11bef4a06 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-user_schema_bind_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-user_schema_bind_/formatted.sql
@@ -1,5 +1,6 @@
/* syntax version 1 */
USE plato;
+
$table = "In" || "put";
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-user_schema_directread_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-user_schema_directread_/formatted.sql
index 04474bccff..68102bc6ff 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-user_schema_directread_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-user_schema_directread_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA directread;
$in = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-user_schema_no_infer_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-user_schema_no_infer_/formatted.sql
index 62e888b16b..a06da30803 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-user_schema_no_infer_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-user_schema_no_infer_/formatted.sql
@@ -1,5 +1,6 @@
/* syntax version 1 */
USE plato;
+
PRAGMA yt.InferSchema;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-user_schema_patch_columns_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-user_schema_patch_columns_/formatted.sql
index 0c6b53c932..be935b559d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-user_schema_patch_columns_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_schema-user_schema_patch_columns_/formatted.sql
@@ -1,5 +1,6 @@
/* syntax version 1 */
USE plato;
+
PRAGMA yt.InferSchema;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-anon_clash_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-anon_clash_/formatted.sql
index 3507736edd..bce6d4dbab 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-anon_clash_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-anon_clash_/formatted.sql
@@ -5,6 +5,7 @@ INSERT INTO @a
SELECT
1 AS t
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-discard_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-discard_/formatted.sql
index b06c429c02..67ea0a7388 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-discard_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-discard_/formatted.sql
@@ -1,5 +1,6 @@
/* postgres can not */
USE plato;
+
PRAGMA DisableSimpleColumns;
DISCARD SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-dot_in_alias_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-dot_in_alias_/formatted.sql
index 3fa0dc63a8..decdecf8f4 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-dot_in_alias_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-dot_in_alias_/formatted.sql
@@ -1,5 +1,6 @@
/* postgres can not */
USE plato;
+
PRAGMA AllowDotInAlias;
--INSERT INTO Output
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-dot_name_subrequest_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-dot_name_subrequest_/formatted.sql
index d9f9b35a32..74ae66e327 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-dot_name_subrequest_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-dot_name_subrequest_/formatted.sql
@@ -1,5 +1,6 @@
/* postgres can not */
USE plato;
+
PRAGMA DisableSimpleColumns;
$req = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-optional_as_warn_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-optional_as_warn_/formatted.sql
index 784cda0a9e..119408fd23 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-optional_as_warn_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-optional_as_warn_/formatted.sql
@@ -3,6 +3,7 @@
/* dqfile can not */
/* yt can not */
USE plato;
+
PRAGMA AnsiOptionalAs;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-optional_in_job_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-optional_in_job_/formatted.sql
index 5ca1ecce0c..385ea254aa 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-optional_in_job_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-optional_in_job_/formatted.sql
@@ -15,6 +15,7 @@ SELECT
Yql::Optional(OptionalType(OptionalType(OptionalType(DataType("String")))), Yql::Just(Yql::Just("val"))) AS level3_just_just_just_val,
"const" AS const
;
+
COMMIT;
-- Everything should be True
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-optional_pull_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-optional_pull_/formatted.sql
index 7f10e10383..ca3c2e028d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-optional_pull_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-optional_pull_/formatted.sql
@@ -15,6 +15,7 @@ SELECT
Yql::Optional(OptionalType(OptionalType(OptionalType(DataType("String")))), Yql::Just(Yql::Just("val"))) AS level3_just_just_just_val,
"const" AS const
;
+
COMMIT;
-- Check result representation
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-qualified_all_and_group_by_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-qualified_all_and_group_by_/formatted.sql
index 7d10fafe8b..9c0b9340c3 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-qualified_all_and_group_by_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-qualified_all_and_group_by_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* syntax version 1 */
USE plato;
+
PRAGMA DisableSimpleColumns;
--INSERT INTO Output
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-refselect_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-refselect_/formatted.sql
index 2578c7740c..d8e7875451 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-refselect_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-refselect_/formatted.sql
@@ -1,5 +1,6 @@
/* postgres can not */
USE plato;
+
PRAGMA refselect;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-result_rows_limit_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-result_rows_limit_/formatted.sql
index ccbe8fe90c..842fb6456e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-result_rows_limit_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-result_rows_limit_/formatted.sql
@@ -1,6 +1,7 @@
/* kikimr can not - no refs */
/* postgres can not */
USE plato;
+
PRAGMA ResultRowsLimit = "2";
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-result_size_limit_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-result_size_limit_/formatted.sql
index cd1c55a6fb..06e03b25ae 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-result_size_limit_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-result_size_limit_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* kikimr can not - no refs */
USE plato;
+
PRAGMA ResultSizeLimit = "25";
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-result_size_limit_with_fill_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-result_size_limit_with_fill_/formatted.sql
index 939ad590f2..638d372115 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-result_size_limit_with_fill_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-result_size_limit_with_fill_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* kikimr can not - no refs */
USE plato;
+
PRAGMA ResultSizeLimit = "25";
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-reuse_named_node_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-reuse_named_node_/formatted.sql
index b4d83eabbc..b20f9ad5ab 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-reuse_named_node_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-reuse_named_node_/formatted.sql
@@ -1,5 +1,6 @@
/* postgres can not */
USE plato;
+
$x = ($key) -> {
RETURN "aa" || $key
};
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-select_all_from_concat_anon_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-select_all_from_concat_anon_/formatted.sql
index 6d35927655..b436653019 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-select_all_from_concat_anon_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-select_all_from_concat_anon_/formatted.sql
@@ -5,7 +5,9 @@ INSERT INTO @foo
SELECT
1
;
+
COMMIT;
+
$name = "fo" || "o";
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-table_content_from_double_opt_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-table_content_from_double_opt_/formatted.sql
index 2c2e6b96ee..86a0b31ab7 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-table_content_from_double_opt_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-table_content_from_double_opt_/formatted.sql
@@ -8,6 +8,7 @@ SELECT
FROM
Input
;
+
COMMIT;
$key =
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-table_content_from_sort_desc_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-table_content_from_sort_desc_/formatted.sql
index fb19462a36..3c82e25fe7 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-table_content_from_sort_desc_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-table_content_from_sort_desc_/formatted.sql
@@ -10,6 +10,7 @@ FROM
ORDER BY
key DESC
;
+
COMMIT;
$key =
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-table_content_with_tmp_folder_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-table_content_with_tmp_folder_/formatted.sql
index 906fecf4d2..c6c4227d23 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-table_content_with_tmp_folder_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-table_content_with_tmp_folder_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* kikimr can not */
USE plato;
+
PRAGMA yt.MapJoinLimit = "1M";
PRAGMA yt.TmpFolder = "//custom_tmp";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-tablepathprefix_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-tablepathprefix_/formatted.sql
index bf2b8c34b1..45074a1a2c 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-tablepathprefix_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-tablepathprefix_/formatted.sql
@@ -1,7 +1,9 @@
/* postgres can not */
/* syntax version 1 */
USE plato;
+
PRAGMA TablePathPrefix = "//";
+
$input = "In" || "put";
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-where_with_lambda_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-where_with_lambda_/formatted.sql
index 74c60af798..be2e1c7f89 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-where_with_lambda_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_select-where_with_lambda_/formatted.sql
@@ -1,8 +1,10 @@
/* postgres can not */
USE plato;
+
$predicate = ($x) -> {
RETURN $x == "911"
};
+
$field = "field";
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_seq_mode-action_shared_subquery_expr_after_commit_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_seq_mode-action_shared_subquery_expr_after_commit_/formatted.sql
index f3eadc3ac6..ff3336150b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_seq_mode-action_shared_subquery_expr_after_commit_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_seq_mode-action_shared_subquery_expr_after_commit_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA SeqMode;
+
USE plato;
DEFINE ACTION $a() AS
@@ -27,6 +28,7 @@ DEFINE ACTION $a() AS
$r
;
END DEFINE;
+
DO
$a()
;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_seq_mode-shared_named_expr_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_seq_mode-shared_named_expr_/formatted.sql
index 3c6b2c1795..d53c7c38f2 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_seq_mode-shared_named_expr_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_seq_mode-shared_named_expr_/formatted.sql
@@ -1,5 +1,6 @@
PRAGMA SeqMode;
PRAGMA CompactNamedExprs;
+
$a = 1;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_seq_mode-shared_subquery_expr_after_commit_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_seq_mode-shared_subquery_expr_after_commit_/formatted.sql
index 2333737212..e99712dd5a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_seq_mode-shared_subquery_expr_after_commit_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_seq_mode-shared_subquery_expr_after_commit_/formatted.sql
@@ -1,10 +1,12 @@
USE plato;
+
PRAGMA SeqMode;
INSERT INTO @foo
SELECT
1
;
+
COMMIT;
$a =
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_seq_mode-subquery_shared_subquery_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_seq_mode-subquery_shared_subquery_/formatted.sql
index 8f2f722b85..4eea868b9f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_seq_mode-subquery_shared_subquery_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_seq_mode-subquery_shared_subquery_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA SeqMode;
+
USE plato;
DEFINE SUBQUERY $a() AS
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_base_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_base_fail_/formatted.sql
index 75d84ea3b3..ff83db6768 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_base_fail_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_base_fail_/formatted.sql
@@ -1,5 +1,6 @@
/* custom error:Duplicated member: magic*/
PRAGMA SimpleColumns;
+
USE plato;
$req = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_all_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_all_/formatted.sql
index 19d5da5dcc..d2cb0ffdb5 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_all_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_all_/formatted.sql
@@ -1,5 +1,6 @@
/* postgres can not */
PRAGMA SimpleColumns;
+
USE plato;
$data = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_all_1_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_all_1_/formatted.sql
index 03a04a4d41..4b0ace3a17 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_all_1_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_all_1_/formatted.sql
@@ -1,5 +1,6 @@
/* syntax version 1 */
USE plato;
+
PRAGMA SimpleColumns;
PRAGMA DisableCoalesceJoinKeysOnQualifiedAll;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_all_2_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_all_2_/formatted.sql
index 4e95019b59..eff84ad509 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_all_2_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_all_2_/formatted.sql
@@ -1,5 +1,6 @@
/* syntax version 1 */
USE plato;
+
PRAGMA SimpleColumns;
PRAGMA CoalesceJoinKeysOnQualifiedAll;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_bug8923_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_bug8923_/formatted.sql
index 735c752d3d..058591837a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_bug8923_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_bug8923_/formatted.sql
@@ -1,6 +1,8 @@
/* syntax version 1 */
USE plato;
+
PRAGMA SimpleColumns;
+
-- fails with CoalesceJoinKeysOnQualifiedAll
PRAGMA DisableCoalesceJoinKeysOnQualifiedAll;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_qualified_all_disable_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_qualified_all_disable_/formatted.sql
index 4e437d0fab..50327f7df9 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_qualified_all_disable_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_qualified_all_disable_/formatted.sql
@@ -1,5 +1,6 @@
/* syntax version 1 */
USE plato;
+
PRAGMA SimpleColumns;
PRAGMA DisableCoalesceJoinKeysOnQualifiedAll;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_qualified_all_enable_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_qualified_all_enable_/formatted.sql
index 3a218db080..4f8e43e627 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_qualified_all_enable_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_qualified_all_enable_/formatted.sql
@@ -1,5 +1,6 @@
/* syntax version 1 */
USE plato;
+
PRAGMA SimpleColumns;
PRAGMA CoalesceJoinKeysOnQualifiedAll;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_without_1_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_without_1_/formatted.sql
index 097c9b6a26..fa0aeab88e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_without_1_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_without_1_/formatted.sql
@@ -1,5 +1,6 @@
/* syntax version 1 */
USE plato;
+
PRAGMA SimpleColumns;
PRAGMA DisableCoalesceJoinKeysOnQualifiedAll;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_without_2_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_without_2_/formatted.sql
index 1ffd8b1cf4..8b0c9d4d0d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_without_2_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_without_2_/formatted.sql
@@ -1,5 +1,6 @@
/* syntax version 1 */
USE plato;
+
PRAGMA SimpleColumns;
PRAGMA CoalesceJoinKeysOnQualifiedAll;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_without_left_semi_1_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_without_left_semi_1_/formatted.sql
index 5b05804fb1..450a6b26d4 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_without_left_semi_1_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_without_left_semi_1_/formatted.sql
@@ -1,5 +1,6 @@
/* syntax version 1 */
USE plato;
+
PRAGMA SimpleColumns;
PRAGMA DisableCoalesceJoinKeysOnQualifiedAll;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_without_left_semi_2_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_without_left_semi_2_/formatted.sql
index f7458f3186..cba3270b32 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_without_left_semi_2_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_coalesce_without_left_semi_2_/formatted.sql
@@ -1,5 +1,6 @@
/* syntax version 1 */
USE plato;
+
PRAGMA SimpleColumns;
PRAGMA CoalesceJoinKeysOnQualifiedAll;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_fail_/formatted.sql
index 28bda23aec..8805242ddf 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_fail_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_fail_/formatted.sql
@@ -1,5 +1,6 @@
/* custom error:Duplicated member: kk*/
PRAGMA SimpleColumns;
+
USE plato;
$data = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_qualified_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_qualified_/formatted.sql
index 0161b9a8ae..bb7db6456a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_qualified_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_qualified_/formatted.sql
@@ -1,5 +1,6 @@
/* postgres can not */
PRAGMA SimpleColumns;
+
USE plato;
$data = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_subreq_all_key_without_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_subreq_all_key_without_/formatted.sql
index 5a03b5ac6e..e48853c339 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_subreq_all_key_without_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_subreq_all_key_without_/formatted.sql
@@ -1,5 +1,6 @@
/* postgres can not */
PRAGMA SimpleColumns;
+
USE plato;
$data = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_subreq_same_key_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_subreq_same_key_/formatted.sql
index bd28bf7c2c..24785f9af0 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_subreq_same_key_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_subreq_same_key_/formatted.sql
@@ -1,5 +1,6 @@
/* postgres can not */
PRAGMA SimpleColumns;
+
USE plato;
$data = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_subreq_same_key_by_all_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_subreq_same_key_by_all_/formatted.sql
index 1b02df7f8e..6f3ace3d92 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_subreq_same_key_by_all_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_subreq_same_key_by_all_/formatted.sql
@@ -1,5 +1,6 @@
/* postgres can not */
PRAGMA SimpleColumns;
+
USE plato;
$data = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_subreq_same_key_without_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_subreq_same_key_without_/formatted.sql
index b97ed3447c..343df74bf1 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_subreq_same_key_without_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_subreq_same_key_without_/formatted.sql
@@ -1,5 +1,6 @@
/* postgres can not */
PRAGMA SimpleColumns;
+
USE plato;
$data = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_without_resolve_dublicates_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_without_resolve_dublicates_/formatted.sql
index b5a40db239..a6047a0f8d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_without_resolve_dublicates_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_without_resolve_dublicates_/formatted.sql
@@ -1,5 +1,6 @@
/* postgres can not */
PRAGMA SimpleColumns;
+
USE plato;
$data = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_without_resolve_dublicates_mult_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_without_resolve_dublicates_mult_/formatted.sql
index a42a3b2281..a283aa529a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_without_resolve_dublicates_mult_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_join_without_resolve_dublicates_mult_/formatted.sql
@@ -1,5 +1,6 @@
/* postgres can not */
PRAGMA SimpleColumns;
+
USE plato;
$data = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_qualified_all_and_group_by_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_qualified_all_and_group_by_/formatted.sql
index e4ff8a77b0..d34e0a3881 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_qualified_all_and_group_by_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_qualified_all_and_group_by_/formatted.sql
@@ -1,5 +1,6 @@
/* postgres can not */
USE plato;
+
PRAGMA SimpleColumns;
--INSERT INTO Output
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_subreq_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_subreq_/formatted.sql
index 95d173d8ae..c94320a09e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_subreq_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_subreq_/formatted.sql
@@ -1,5 +1,6 @@
/* postgres can not */
PRAGMA SimpleColumns;
+
USE plato;
$req = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_subreq_all_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_subreq_all_/formatted.sql
index 8b15de1851..df340f41df 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_subreq_all_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_subreq_all_/formatted.sql
@@ -1,5 +1,6 @@
/* postgres can not */
PRAGMA SimpleColumns;
+
USE plato;
$req = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_union_all_qualified_star_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_union_all_qualified_star_/formatted.sql
index 7433585cd4..46fc7804a8 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_union_all_qualified_star_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_simple_columns-simple_columns_union_all_qualified_star_/formatted.sql
@@ -1,5 +1,6 @@
/* postgres can not */
USE plato;
+
PRAGMA simplecolumns;
INSERT INTO @A (
@@ -17,6 +18,7 @@ INSERT INTO @B (
VALUES
('y', 3),
('z', 4);
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_stream_lookup_join-lookup_join_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_stream_lookup_join-lookup_join_/formatted.sql
index a694c3e2db..b1e3bf050a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_stream_lookup_join-lookup_join_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_stream_lookup_join-lookup_join_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA dq.UseWideChannels = "true";
+
USE plato;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_stream_lookup_join-lookup_join_narrow_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_stream_lookup_join-lookup_join_narrow_/formatted.sql
index 714cf118e2..58374e8e17 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_stream_lookup_join-lookup_join_narrow_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_stream_lookup_join-lookup_join_narrow_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA dq.UseWideChannels = "false";
+
USE plato;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-concat_sorted_max_sorted_tables_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-concat_sorted_max_sorted_tables_/formatted.sql
index a64c34ee11..d862a578d1 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-concat_sorted_max_sorted_tables_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-concat_sorted_max_sorted_tables_/formatted.sql
@@ -2,6 +2,7 @@
/* kikimr can not */
/* multirun can not */
USE plato;
+
PRAGMA yt.MaxInputTables = "3";
PRAGMA yt.MaxInputTablesForSortedMerge = "2";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-concat_sorted_max_tables_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-concat_sorted_max_tables_/formatted.sql
index 0f8ce61d39..2babbf08c9 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-concat_sorted_max_tables_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-concat_sorted_max_tables_/formatted.sql
@@ -2,6 +2,7 @@
/* kikimr can not */
/* multirun can not */
USE plato;
+
PRAGMA yt.MaxInputTables = "3";
PRAGMA yt.MaxInputTablesForSortedMerge = "2";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-range_over_filter_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-range_over_filter_/formatted.sql
index 572b0b8d68..2b97a8cc94 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-range_over_filter_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-range_over_filter_/formatted.sql
@@ -6,10 +6,12 @@ SELECT
FROM
plato.filter(``, Unicode::IsUtf)
;
+
$script = @@
def f(s):
return True
@@;
+
$callable = Python3::f(Callable<(String) -> Bool?>, $script);
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-range_over_filter_udf_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-range_over_filter_udf_/formatted.sql
index ae49d23b72..2564d4cca7 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-range_over_filter_udf_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_table_range-range_over_filter_udf_/formatted.sql
@@ -9,6 +9,7 @@ def f(f):
return False
return f and ft or ff
@@;
+
$callable = Python3::f(Callable<(Bool) -> Callable<(String) -> Bool>>, $script);
$callableT = $callable(Re2::Match('test.*')('testfets'));
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 5a66ced537..97d7390336 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
@@ -15,6 +15,7 @@ $join = (
ON
o.o_orderkey == l.l_orderkey
);
+
$border = Date("1994-01-01");
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q5_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q5_/formatted.sql
index 454bb760bd..991a660686 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q5_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_tpch-q5_/formatted.sql
@@ -86,6 +86,7 @@ $join5 = (
ON
j.n_regionkey == r.r_regionkey
);
+
$border = Date("1995-01-01");
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-append_diff_flags_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-append_diff_flags_/formatted.sql
index ea32341a71..654e15026e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-append_diff_flags_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-append_diff_flags_/formatted.sql
@@ -2,6 +2,7 @@
/* multirun can not */
/* postgres can not */
USE plato;
+
PRAGMA yt.UseNativeYtTypes = "1";
PRAGMA yt.NativeYtTypeCompatibility = "date";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-append_diff_layout1_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-append_diff_layout1_/formatted.sql
index ad251bca34..b145f26337 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-append_diff_layout1_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-append_diff_layout1_/formatted.sql
@@ -1,8 +1,10 @@
/* multirun can not */
/* postgres can not */
USE plato;
+
PRAGMA yt.UseNativeYtTypes = "1";
PRAGMA yt.NativeYtTypeCompatibility = "complex";
+
$udf = YQL::@@(lambda '(x) (block '(
(let structType (StructType '('key (DataType 'String)) '('subkey (StructType '('a (DataType 'String)) '('b (OptionalType (DataType 'Int32))) '('c (DataType 'String))))))
(let varType (VariantType (TupleType structType structType structType)))
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-append_diff_layout2_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-append_diff_layout2_/formatted.sql
index 7baf406788..0b800dd2f6 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-append_diff_layout2_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-append_diff_layout2_/formatted.sql
@@ -1,8 +1,10 @@
/* multirun can not */
/* postgres can not */
USE plato;
+
PRAGMA yt.UseNativeYtTypes = "1";
PRAGMA yt.NativeYtTypeCompatibility = "complex";
+
$udf = YQL::@@(lambda '(x) (block '(
(let structType (StructType '('key (DataType 'String)) '('subkey (StructType '('a (DataType 'String)) '('b (OptionalType (DataType 'Int32))) '('c (DataType 'String))))))
(let varType (VariantType (TupleType structType structType structType)))
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-append_struct_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-append_struct_/formatted.sql
index d52d306349..f0936f6f59 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-append_struct_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-append_struct_/formatted.sql
@@ -3,6 +3,7 @@
/* postgres can not */
/* custom check: len(yt_res_yson[0]['Write'][0]['Data']) == 10 */
USE plato;
+
PRAGMA yt.UseNativeYtTypes = "1";
INSERT INTO Input
@@ -10,6 +11,7 @@ SELECT
"10" AS key,
<|a: "10", b: Just(10), c: "e"|> AS subkey
;
+
COMMIT;
INSERT INTO Input
@@ -29,6 +31,7 @@ FROM
WHERE
key <= "100"
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-decimal_yt_llvm_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-decimal_yt_llvm_/formatted.sql
index a8dd965c88..c88b9e57b9 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-decimal_yt_llvm_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-decimal_yt_llvm_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
PRAGMA yt.UseNativeYtTypes = "1";
PRAGMA config.flags("LLVM", "");
@@ -28,6 +29,7 @@ FROM (
Decimal("nan", 12, 10) AS d12,
Decimal("nan", 35, 10) AS d35
);
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-decimal_yt_nollvm_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-decimal_yt_nollvm_/formatted.sql
index e800ab7e58..6c9606d130 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-decimal_yt_nollvm_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-decimal_yt_nollvm_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
PRAGMA yt.UseNativeYtTypes = "1";
PRAGMA config.flags("LLVM", "OFF");
@@ -28,6 +29,7 @@ FROM (
Decimal("nan", 12, 10) AS d12,
Decimal("nan", 35, 10) AS d35
);
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-float_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-float_/formatted.sql
index f766c51a24..c93ef69328 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-float_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-float_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
PRAGMA yt.UseNativeYtTypes = "1";
INSERT INTO Output
@@ -13,6 +14,7 @@ FROM (
SELECT
Float("1.2") AS f
);
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-ignore_v3_pragma_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-ignore_v3_pragma_/formatted.sql
index 38ae0a6b98..c5599d4204 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-ignore_v3_pragma_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-ignore_v3_pragma_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
PRAGMA yt.IgnoreTypeV3;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-insert_struct_v3_with_native_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-insert_struct_v3_with_native_/formatted.sql
index 6ffc71c475..ab53c7012c 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-insert_struct_v3_with_native_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-insert_struct_v3_with_native_/formatted.sql
@@ -3,6 +3,7 @@
/* postgres can not */
/* kikimr can not */
USE plato;
+
PRAGMA yt.UseNativeYtTypes = "1";
INSERT INTO @a WITH truncate
@@ -11,6 +12,7 @@ SELECT
FROM
concat(Input1, Input2)
;
+
COMMIT;
INSERT INTO @a WITH truncate
@@ -19,6 +21,7 @@ SELECT
FROM
Input1
;
+
COMMIT;
INSERT INTO @a
@@ -27,6 +30,7 @@ SELECT
FROM
Input2
;
+
COMMIT;
INSERT INTO @a
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-insert_struct_v3_wo_native_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-insert_struct_v3_wo_native_/formatted.sql
index 9e2714c421..189f9660cf 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-insert_struct_v3_wo_native_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-insert_struct_v3_wo_native_/formatted.sql
@@ -3,6 +3,7 @@
/* postgres can not */
/* kikimr can not */
USE plato;
+
PRAGMA yt.UseNativeYtTypes = "0";
INSERT INTO Output WITH truncate
@@ -11,6 +12,7 @@ SELECT
FROM
concat(Input1, Input2)
;
+
COMMIT;
INSERT INTO Output WITH truncate
@@ -19,6 +21,7 @@ SELECT
FROM
Input1
;
+
COMMIT;
INSERT INTO Output
@@ -27,6 +30,7 @@ SELECT
FROM
Input2
;
+
COMMIT;
INSERT INTO Output
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-json_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-json_/formatted.sql
index 45ae4f7931..b15fbf13ed 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-json_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-json_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
PRAGMA yt.UseNativeYtTypes = "1";
INSERT INTO Output
@@ -13,6 +14,7 @@ FROM (
SELECT
Json(@@{"d": "fff"}@@) AS j
);
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-mergejoin_with_sort_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-mergejoin_with_sort_/formatted.sql
index 2fbe6f72b1..aaddbe0244 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-mergejoin_with_sort_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-mergejoin_with_sort_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
PRAGMA yt.JoinMergeTablesLimit = "100";
PRAGMA yt.JoinMergeForce = "true";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-non_strict_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-non_strict_/formatted.sql
index ae2f011a01..eca9311d8a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-non_strict_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-non_strict_/formatted.sql
@@ -2,6 +2,7 @@
/* multirun can not */
/* postgres can not */
USE plato;
+
PRAGMA yt.UseNativeYtTypes = "1";
PRAGMA yt.NativeYtTypeCompatibility = "complex";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-replace_diff_layout_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-replace_diff_layout_/formatted.sql
index 2a3326457d..7f374ab3bc 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-replace_diff_layout_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-replace_diff_layout_/formatted.sql
@@ -1,8 +1,10 @@
/* multirun can not */
/* postgres can not */
USE plato;
+
PRAGMA yt.UseNativeYtTypes = "1";
PRAGMA yt.NativeYtTypeCompatibility = "complex";
+
$udf = YQL::@@(lambda '(x) (block '(
(let structType (StructType '('key (DataType 'String)) '('subkey (StructType '('a (DataType 'String)) '('b (OptionalType (DataType 'Int32))) '('c (DataType 'String))))))
(let varType (VariantType (TupleType structType structType structType)))
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-singulars_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-singulars_/formatted.sql
index 738dd65d3c..06931eafb8 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-singulars_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-singulars_/formatted.sql
@@ -1,5 +1,6 @@
/* postgres can not */
USE plato;
+
PRAGMA yt.UseNativeYtTypes = "1";
PRAGMA yt.NativeYtTypeCompatibility = "null;void";
@@ -8,6 +9,7 @@ SELECT
NULL AS ttt,
Yql::Void AS v
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-split_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-split_/formatted.sql
index a28fcb629b..7a5fb9fbee 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-split_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-split_/formatted.sql
@@ -1,4 +1,5 @@
USE plato;
+
PRAGMA yt.MaxInputTables = "2";
INSERT INTO Output
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-type_subset_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-type_subset_/formatted.sql
index 232bbb0750..12e29c82d2 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-type_subset_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-type_subset_/formatted.sql
@@ -2,6 +2,7 @@
/* multirun can not */
/* postgres can not */
USE plato;
+
PRAGMA yt.UseNativeYtTypes = "1";
PRAGMA yt.NativeYtTypeCompatibility = "complex";
PRAGMA yt.MaxInputTables = "2";
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-uuid_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-uuid_/formatted.sql
index 4b56d958d4..e932ae3eaf 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-uuid_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_type_v3-uuid_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
PRAGMA yt.UseNativeYtTypes = "1";
PRAGMA yt.NativeYtTypeCompatibility = "uuid";
@@ -23,6 +24,7 @@ FROM (
SELECT
Uuid("3200ec12-4ded-4f6c-a981-4b0ff18bbdd5")
);
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-named_args_for_script_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-named_args_for_script_/formatted.sql
index 3836502ee9..697803708b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-named_args_for_script_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-named_args_for_script_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* syntax version 1 */
USE plato;
+
$udfScript = @@
def AppendInfo(a_name, a_age = None, a_region = None):
res = a_name.decode('utf-8')
@@ -10,6 +11,7 @@ def AppendInfo(a_name, a_age = None, a_region = None):
res += ", region: " + repr(a_region)
return res.encode('utf-8')
@@;
+
$udf = Python3::AppendInfo(Callable<(name: String, [age: Int32?, region: Int32?]) -> String>, $udfScript);
$data = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-named_args_for_script_with_posargs2_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-named_args_for_script_with_posargs2_/formatted.sql
index cbbfd55770..3ea05060c5 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-named_args_for_script_with_posargs2_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-named_args_for_script_with_posargs2_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* syntax version 1 */
USE plato;
+
$udfScript = @@
def AppendInfo(a_name, a_age = None, a_region = None):
res = a_name.decode('utf-8')
@@ -10,6 +11,7 @@ def AppendInfo(a_name, a_age = None, a_region = None):
res += ", region: " + repr(a_region)
return res.encode('utf-8')
@@;
+
$udf = Python3::AppendInfo(Callable<(name: String, [age: Int32?, region: Int32?]) -> String>, $udfScript);
$data = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-named_args_for_script_with_posargs_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-named_args_for_script_with_posargs_/formatted.sql
index d40ab7b878..d77fba950c 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-named_args_for_script_with_posargs_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-named_args_for_script_with_posargs_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* syntax version 1 */
USE plato;
+
$udfScript = @@
def AppendInfo(a_name, a_age = None, a_region = None):
res = a_name.decode('utf-8')
@@ -10,6 +11,7 @@ def AppendInfo(a_name, a_age = None, a_region = None):
res += ", region: " + repr(a_region)
return res.encode('utf-8')
@@;
+
$udf = Python3::AppendInfo(Callable<(name: String, [age: Int32?, region: Int32?]) -> String>, $udfScript);
$data = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-named_args_for_script_with_posargs_reuse_args_fail_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-named_args_for_script_with_posargs_reuse_args_fail_/formatted.sql
index 631ddcb55a..b1cc429950 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-named_args_for_script_with_posargs_reuse_args_fail_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-named_args_for_script_with_posargs_reuse_args_fail_/formatted.sql
@@ -1,5 +1,6 @@
/* custom error:Argument with name age was already used for positional argument #2*/
USE plato;
+
$udfScript = @@
def AppendInfo(a_name, a_age = None, a_region = None):
res = a_name.decode('utf-8')
@@ -9,6 +10,7 @@ def AppendInfo(a_name, a_age = None, a_region = None):
res += ", region: " + repr(a_region)
return res.encode('utf-8')
@@;
+
$udf = Python3::AppendInfo(Callable<(name: String, [age: Int32?, region: Int32?]) -> String>, $udfScript);
$data = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-python_script_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-python_script_/formatted.sql
index fd19c7e582..6a4f91d19d 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-python_script_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-python_script_/formatted.sql
@@ -1,10 +1,12 @@
/* postgres can not */
/* syntax version 1 */
USE plato;
+
$udfScript = @@
def AppendNum(name, age):
return name + str(age).encode('utf-8')
@@;
+
$udf = Python3::AppendNum(Callable<(String, Int32?) -> String>, $udfScript);
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-python_script_from_file_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-python_script_from_file_/formatted.sql
index f63ecad91d..7fbea6f03f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-python_script_from_file_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-python_script_from_file_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* syntax version 1 */
USE plato;
+
$udfScript = FileContent("python_script.py");
$udf = Python::AppendNum(Callable<(String, Int32?) -> String>, $udfScript);
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-python_struct_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-python_struct_/formatted.sql
index c03a7aa279..c904529008 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-python_struct_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-python_struct_/formatted.sql
@@ -1,5 +1,6 @@
/* postgres can not */
USE plato;
+
$udf = YQL::@@(block '(
(let $udfScript (String '@@@@
class Person:
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udaf_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udaf_/formatted.sql
index fc826a3fa0..857e5f9e1e 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udaf_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udaf_/formatted.sql
@@ -30,6 +30,7 @@ def serialize(state):
def deserialize(serialized):
return json.loads(serialized)
@@;
+
$create = Python3::create(Callable<(Double) -> Resource<Python3>>, $script);
$add = Python3::add(Callable<(Resource<Python3>, Double) -> Resource<Python3>>, $script);
$merge = Python3::merge(Callable<(Resource<Python3>, Resource<Python3>) -> Resource<Python3>>, $script);
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udaf_default_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udaf_default_/formatted.sql
index 2af0b9722e..9553b7ceda 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udaf_default_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udaf_default_/formatted.sql
@@ -4,24 +4,31 @@
$create = ($item, $_parent) -> {
RETURN AsList($item)
};
+
$add = ($state, $item, $_parent) -> {
RETURN Yql::Append($state, $item)
};
+
$merge = ($state1, $state2) -> {
RETURN ListExtend($state1, $state2)
};
+
$get_result = ($state) -> {
RETURN $state
};
+
$serialize = ($state) -> {
RETURN $state
};
+
$deserialize = ($state) -> {
RETURN $state
};
+
$default = ($result_type) -> {
RETURN Yql::List($result_type)
};
+
$udaf_factory = AGGREGATION_FACTORY(
"UDAF",
$create,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udaf_distinct_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udaf_distinct_/formatted.sql
index 7232fc3ea9..f54f14f851 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udaf_distinct_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udaf_distinct_/formatted.sql
@@ -30,6 +30,7 @@ def serialize(state):
def deserialize(serialized):
return json.loads(serialized)
@@;
+
$create = Python3::create(Callable<(Int64) -> Resource<Python3>>, $script);
$add = Python3::add(Callable<(Resource<Python3>, Int64) -> Resource<Python3>>, $script);
$merge = Python3::merge(Callable<(Resource<Python3>, Resource<Python3>) -> Resource<Python3>>, $script);
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udaf_lambda_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udaf_lambda_/formatted.sql
index 10f3c22274..cb377dd121 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udaf_lambda_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udaf_lambda_/formatted.sql
@@ -2,18 +2,23 @@
$create = ($item, $_parent) -> {
RETURN $item
};
+
$add = ($state, $item, $_parent) -> {
RETURN $item + $state
};
+
$merge = ($state1, $state2) -> {
RETURN $state1 + $state2
};
+
$get_result = ($state) -> {
RETURN $state
};
+
$serialize = ($state) -> {
RETURN $state
};
+
$deserialize = ($state) -> {
RETURN $state
};
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udaf_short_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udaf_short_/formatted.sql
index 2a28026fda..ff87e30b5f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udaf_short_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_udf-udaf_short_/formatted.sql
@@ -10,6 +10,7 @@ def add(state, item):
def merge(state_a, state_b):
return state_a + state_b
@@;
+
$create = Python3::create(Callable<(Int64) -> Int64>, $script);
$add = Python3::add(Callable<(Int64, Int64) -> Int64>, $script);
$merge = Python3::merge(Callable<(Int64, Int64) -> Int64>, $script);
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_union_all-union_all_with_discard_into_result_ansi_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_union_all-union_all_with_discard_into_result_ansi_/formatted.sql
index f8678ef507..5b55b4cbe6 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_union_all-union_all_with_discard_into_result_ansi_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_union_all-union_all_with_discard_into_result_ansi_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
PRAGMA AnsiOrderByLimitInUnionAll;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_union_all-union_all_with_top_level_limits_ansi_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_union_all-union_all_with_top_level_limits_ansi_/formatted.sql
index 92176f5931..9fcc135eb7 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_union_all-union_all_with_top_level_limits_ansi_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_union_all-union_all_with_top_level_limits_ansi_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
PRAGMA AnsiOrderByLimitInUnionAll;
$foo =
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-file_eval_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-file_eval_/formatted.sql
index a43dc75667..7549d7b621 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-file_eval_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-file_eval_/formatted.sql
@@ -2,6 +2,7 @@
/* syntax version 1 */
/* custom error:FileContent function can't be used inside generated code in views*/
PRAGMA yt.ViewIsolation = 'true';
+
USE plato;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-file_inner_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-file_inner_/formatted.sql
index 270a7c4f01..5b12303753 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-file_inner_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-file_inner_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* syntax version 1 */
PRAGMA yt.ViewIsolation = 'true';
+
USE plato;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-file_inner_library_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-file_inner_library_/formatted.sql
index c39c8f74a2..c5cf972a32 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-file_inner_library_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-file_inner_library_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* syntax version 1 */
PRAGMA yt.ViewIsolation = 'true';
+
USE plato;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-file_inner_udf_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-file_inner_udf_/formatted.sql
index 293363a97e..fc0f33cf1c 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-file_inner_udf_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-file_inner_udf_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* syntax version 1 */
PRAGMA yt.ViewIsolation = 'true';
+
USE plato;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-file_outer_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-file_outer_/formatted.sql
index 86975e7a22..c14380fabc 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-file_outer_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-file_outer_/formatted.sql
@@ -1,5 +1,6 @@
/* custom error:File not found*/
PRAGMA yt.ViewIsolation = 'true';
+
USE plato;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-file_outer_library_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-file_outer_library_/formatted.sql
index 1126ab8d3f..73fd73e1f2 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-file_outer_library_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-file_outer_library_/formatted.sql
@@ -2,7 +2,9 @@
/* syntax version 1 */
/* custom error: does not exist*/
PRAGMA yt.ViewIsolation = 'true';
+
USE plato;
+
PRAGMA library('mylib.sql');
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-init_view_after_eval_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-init_view_after_eval_/formatted.sql
index 311b5738a5..4dea92e508 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-init_view_after_eval_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-init_view_after_eval_/formatted.sql
@@ -10,7 +10,9 @@ $i =
$i =
PROCESS $i;
+
$members = StructTypeComponents(ListItemType(TypeHandle(TypeOf($i))));
+
$filteredMembers = ListFilter(
ListMap(
$members, ($x) -> {
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-secure_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-secure_/formatted.sql
index 06a6f4f6d0..31940d797c 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-secure_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-secure_/formatted.sql
@@ -1,5 +1,6 @@
/* custom error:SecureParam function can't be used in views*/
PRAGMA yt.ViewIsolation = 'true';
+
USE plato;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-secure_eval_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-secure_eval_/formatted.sql
index 4193d70693..a271f1a16b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-secure_eval_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-secure_eval_/formatted.sql
@@ -1,5 +1,6 @@
/* custom error:SecureParam function can't be used in views*/
PRAGMA yt.ViewIsolation = 'true';
+
USE plato;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-secure_eval_dyn_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-secure_eval_dyn_/formatted.sql
index fc32fb6c99..1793528914 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-secure_eval_dyn_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-secure_eval_dyn_/formatted.sql
@@ -1,5 +1,6 @@
/* custom error:FuncCode should have constant function name in views*/
PRAGMA yt.ViewIsolation = 'true';
+
USE plato;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-standalone_view_lambda_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-standalone_view_lambda_/formatted.sql
index 6c4129df69..c003448d02 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-standalone_view_lambda_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-standalone_view_lambda_/formatted.sql
@@ -2,6 +2,7 @@ USE plato;
$stream =
PROCESS InputView;
+
$type = EvaluateType(TypeHandle(ListItemType(TypeOf($stream))));
$lambda = ($row) -> (CAST($row AS $type));
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-system_udf_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-system_udf_/formatted.sql
index 1fb714c484..a115dd046b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-system_udf_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_view-system_udf_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* syntax version 1 */
PRAGMA yt.ViewIsolation = 'true';
+
USE plato;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-few_source_different_columns_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-few_source_different_columns_/formatted.sql
index 460a556d5d..5207b8b2c4 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-few_source_different_columns_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-few_source_different_columns_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* syntax version 1 */
PRAGMA yt.InferSchema = "2";
+
USE plato;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-optimize_weak_fields_combine_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-optimize_weak_fields_combine_/formatted.sql
index a09a5a323d..ac32a73ac1 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-optimize_weak_fields_combine_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-optimize_weak_fields_combine_/formatted.sql
@@ -1,5 +1,6 @@
/* kikimr can not */
PRAGMA yt.InferSchema;
+
USE plato;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-optimize_weak_fields_filter_combine_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-optimize_weak_fields_filter_combine_/formatted.sql
index 9074035ec5..d02a4e79b7 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-optimize_weak_fields_filter_combine_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-optimize_weak_fields_filter_combine_/formatted.sql
@@ -1,5 +1,6 @@
/* kikimr can not */
PRAGMA yt.InferSchema;
+
USE plato;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-optimize_weak_fields_map_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-optimize_weak_fields_map_/formatted.sql
index 3e0ccc2834..fa5b87fb56 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-optimize_weak_fields_map_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-optimize_weak_fields_map_/formatted.sql
@@ -1,5 +1,6 @@
/* kikimr can not */
PRAGMA yt.InferSchema;
+
USE plato;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-optimize_weak_fields_map_combine_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-optimize_weak_fields_map_combine_/formatted.sql
index 40b00e5283..15d1c70ca1 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-optimize_weak_fields_map_combine_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-optimize_weak_fields_map_combine_/formatted.sql
@@ -1,5 +1,6 @@
/* kikimr can not */
PRAGMA yt.InferSchema;
+
USE plato;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_infer_scheme_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_infer_scheme_/formatted.sql
index 3dc4c59314..d9a12163d6 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_infer_scheme_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_weak_field-weak_field_infer_scheme_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* kikimr can not */
USE plato;
+
PRAGMA yt.InferSchema;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-all_columns_hide_window_special_ones_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-all_columns_hide_window_special_ones_/formatted.sql
index 7fea48bf09..b0000fa140 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-all_columns_hide_window_special_ones_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-all_columns_hide_window_special_ones_/formatted.sql
@@ -1,5 +1,6 @@
/* postgres can not */
USE plato;
+
PRAGMA simplecolumns;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-current_session_extended_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-current_session_extended_/formatted.sql
index d99779c206..72bf936b89 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-current_session_extended_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-current_session_extended_/formatted.sql
@@ -2,6 +2,7 @@
/* postgres can not */
$init = ($row) -> (AsStruct($row.ts ?? 0 AS value, 1 AS count));
$calculate = ($_row, $state) -> ($state.value);
+
-- split partition into two-element grooups, make session key to be cumulative sum of ts from partition start
$update = ($row, $state) -> {
$state = AsStruct($state.count + 1 AS count, $state.value AS value);
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-distinct_over_window_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-distinct_over_window_/formatted.sql
index f9bfb012de..b16353d3b3 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-distinct_over_window_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-distinct_over_window_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
PRAGMA DistinctOverWindow;
$input = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-distinct_over_window_full_frames_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-distinct_over_window_full_frames_/formatted.sql
index 67a50155e3..7ed4238c57 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-distinct_over_window_full_frames_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-distinct_over_window_full_frames_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
PRAGMA DistinctOverWindow;
$input = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-distinct_over_window_struct_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-distinct_over_window_struct_/formatted.sql
index 0eb472164c..435319b439 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-distinct_over_window_struct_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-distinct_over_window_struct_/formatted.sql
@@ -1,7 +1,9 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
PRAGMA DistinctOverWindow;
+
$input = AsList(
AsStruct(1 AS key, 1 AS subkey, AsStruct(1 AS i1, 2 AS i2, 3 AS i3) AS col),
AsStruct(2 AS key, 1 AS subkey, AsStruct(1 AS i1, 2 AS i2, 3 AS i3) AS col),
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 66e2bfb9af..651bee7407 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
@@ -1,5 +1,6 @@
/* postgres can not */
USE plato;
+
$list = AsList(
AsList(3, 1),
AsList(1, 1),
@@ -15,6 +16,7 @@ FROM (
)
FLATTEN BY x
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-row_number_no_part_multi_input_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-row_number_no_part_multi_input_/formatted.sql
index 6b8f4e062a..9123e52e01 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-row_number_no_part_multi_input_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-row_number_no_part_multi_input_/formatted.sql
@@ -7,6 +7,7 @@ SELECT
FROM
Input
;
+
COMMIT;
$input = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-udaf_window_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-udaf_window_/formatted.sql
index 32c5fffa55..93f965714f 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-udaf_window_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-udaf_window_/formatted.sql
@@ -30,6 +30,7 @@ def serialize(state):
def deserialize(serialized):
return json.loads(serialized)
@@;
+
$create = Python3::create(Callable<(Double) -> Resource<Python3>>, $script);
$add = Python3::add(Callable<(Resource<Python3>, Double) -> Resource<Python3>>, $script);
$merge = Python3::merge(Callable<(Resource<Python3>, Resource<Python3>) -> Resource<Python3>>, $script);
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-udaf_with_def_value_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-udaf_with_def_value_/formatted.sql
index 2ef89817a7..f8cccaa66a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-udaf_with_def_value_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-udaf_with_def_value_/formatted.sql
@@ -31,26 +31,34 @@ $my_table =
10 AS ts,
40 AS value1
;
+
$cnt_create = ($_item, $_parent) -> {
RETURN 1ul
};
+
$cnt_add = ($state, $_item, $_parent) -> {
RETURN 1ul + $state
};
+
$cnt_merge = ($state1, $state2) -> {
RETURN $state1 + $state2
};
+
$cnt_get_result = ($state) -> {
RETURN $state
};
+
$cnt_serialize = ($state) -> {
RETURN $state
};
+
$cnt_deserialize = ($state) -> {
RETURN $state
};
+
-- non-trivial default value
$cnt_default = 0.0;
+
$cnt_udaf_factory = AggregationFactory(
"UDAF",
$cnt_create,
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_by_all_percentile_interval_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_by_all_percentile_interval_/formatted.sql
index 2725c9d11f..e1dc6f70fd 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_by_all_percentile_interval_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_by_all_percentile_interval_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* syntax version 1 */
USE plato;
+
$zero = unwrap(CAST(0 AS Interval));
-- safely cast data to get rid of optionals after cast
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_expr_bounds_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_expr_bounds_/formatted.sql
index 7a8ab16f28..167720e809 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_expr_bounds_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_expr_bounds_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* postgres can not */
USE plato;
+
DECLARE $begin AS Int32;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_aggr_with_qualified_all_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_aggr_with_qualified_all_/formatted.sql
index cfd8d5fee4..0d2deb702b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_aggr_with_qualified_all_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_aggr_with_qualified_all_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA SimpleColumns;
+
USE plato;
$q = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_aggr_with_qualified_all_no_simple_columns_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_aggr_with_qualified_all_no_simple_columns_/formatted.sql
index a1c23c1317..f2ad9611e8 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_aggr_with_qualified_all_no_simple_columns_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_aggr_with_qualified_all_no_simple_columns_/formatted.sql
@@ -1,4 +1,5 @@
PRAGMA DisableSimpleColumns;
+
USE plato;
$q = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_auto_arg_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_auto_arg_/formatted.sql
index b826651a57..b94ce66ce2 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_auto_arg_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_auto_arg_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* syntax version 1 */
USE plato;
+
PRAGMA DisableAnsiRankForNullableKeys;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_auto_arg_selective_rank_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_auto_arg_selective_rank_/formatted.sql
index 05a59c5541..af7ebf4207 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_auto_arg_selective_rank_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_auto_arg_selective_rank_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* syntax version 1 */
USE plato;
+
PRAGMA DisableSimpleColumns;
PRAGMA DisableAnsiRankForNullableKeys;
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_auto_arg_two_sort_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_auto_arg_two_sort_/formatted.sql
index 46ee3ea4f6..8cbc09efe6 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_auto_arg_two_sort_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_auto_arg_two_sort_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* syntax version 1 */
USE plato;
+
PRAGMA DisableAnsiRankForNullableKeys;
--INSERT INTO Output
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_in_lib_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_in_lib_/formatted.sql
index 22b3d2f7ae..f3883f8582 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_in_lib_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_in_lib_/formatted.sql
@@ -1,5 +1,7 @@
USE plato;
+
PRAGMA library('lib1.sql');
+
IMPORT lib1 SYMBOLS $subq;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_order_by_udf_empty_rank_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_order_by_udf_empty_rank_/formatted.sql
index a67976d4d9..556f092a36 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_order_by_udf_empty_rank_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_order_by_udf_empty_rank_/formatted.sql
@@ -1,6 +1,7 @@
/* syntax version 1 */
/* postgres can not */
PRAGMA DisableAnsiRankForNullableKeys;
+
USE plato;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_rank_by_all_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_rank_by_all_/formatted.sql
index 3949ecd70a..efb4457d4a 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_rank_by_all_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_rank_by_all_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* syntax version 1 */
USE plato;
+
PRAGMA DisableAnsiRankForNullableKeys;
$input = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_rank_by_opt_all_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_rank_by_opt_all_/formatted.sql
index a2181ca44b..b27c91f7ce 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_rank_by_opt_all_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_rank_by_opt_all_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* syntax version 1 */
USE plato;
+
PRAGMA DisableAnsiRankForNullableKeys;
$input = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_rank_by_opt_part_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_rank_by_opt_part_/formatted.sql
index cbf26df383..594bf863f1 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_rank_by_opt_part_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_rank_by_opt_part_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* syntax version 1 */
USE plato;
+
PRAGMA DisableAnsiRankForNullableKeys;
$input = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_rank_by_part_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_rank_by_part_/formatted.sql
index cac32252fa..99d3bc52ca 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_rank_by_part_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_func_rank_by_part_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
/* syntax version 1 */
USE plato;
+
PRAGMA DisableAnsiRankForNullableKeys;
$input = (
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_fuse_window_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_fuse_window_/formatted.sql
index 74da7c4d2f..d3634e4780 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_fuse_window_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_fuse_window_/formatted.sql
@@ -18,6 +18,7 @@ SELECT
FROM
$data
;
+
COMMIT;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_multiaggr_library_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_multiaggr_library_/formatted.sql
index 0db7cb0e1f..2fd453c60b 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_multiaggr_library_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-win_multiaggr_library_/formatted.sql
@@ -1,6 +1,7 @@
/* postgres can not */
PRAGMA library('multiaggr_subq.sql');
PRAGMA library('agg_factory.sql');
+
IMPORT multiaggr_subq SYMBOLS $multiaggr_win;
SELECT
diff --git a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-yql-15636_/formatted.sql b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-yql-15636_/formatted.sql
index b2836d9c46..1a5c45af92 100644
--- a/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-yql-15636_/formatted.sql
+++ b/yql/essentials/tests/sql/sql2yql/canondata/test_sql_format.test_window-yql-15636_/formatted.sql
@@ -9,6 +9,7 @@ SELECT
'1' AS user_phone_pd_id,
'2' AS utc_order_dttm
;
+
COMMIT;
SELECT