aboutsummaryrefslogtreecommitdiffstats
path: root/yql/essentials/tests/sql/suites
diff options
context:
space:
mode:
authorAlexander Smirnov <alex@ydb.tech>2024-11-23 21:12:15 +0000
committerAlexander Smirnov <alex@ydb.tech>2024-11-23 21:12:15 +0000
commit94a340fff420b50bea5bb806a5892d03b91036f1 (patch)
tree7e069e905f29f9ae99d7e2a28baf864b8123648f /yql/essentials/tests/sql/suites
parent398fb410adba8fede893681a5e67a809f02d0750 (diff)
parent8b9f13e29dea8f76f11579aae5344ac571d5e604 (diff)
downloadydb-94a340fff420b50bea5bb806a5892d03b91036f1.tar.gz
Merge branch 'rightlib' into mergelibs-241123-2111
Diffstat (limited to 'yql/essentials/tests/sql/suites')
-rw-r--r--yql/essentials/tests/sql/suites/action/eval_atom_wrong_type_expr.sql1
-rw-r--r--yql/essentials/tests/sql/suites/action/eval_atom_wrong_type_param.sql1
-rw-r--r--yql/essentials/tests/sql/suites/action/eval_on_modif_table_fail.sql1
-rw-r--r--yql/essentials/tests/sql/suites/action/eval_typeof_output_table.sql1
-rw-r--r--yql/essentials/tests/sql/suites/action/large_evaluate_for_fail.sql1
-rw-r--r--yql/essentials/tests/sql/suites/action/mixed_eval_typeof_world1.sql1
-rw-r--r--yql/essentials/tests/sql/suites/action/pending_arg_fail.sql3
-rw-r--r--yql/essentials/tests/sql/suites/aggregate/library_error_in_aggregation_fail.sql3
-rw-r--r--yql/essentials/tests/sql/suites/binding/tie_bad_count_fail.sql1
-rw-r--r--yql/essentials/tests/sql/suites/column_group/hint_append_fail.sql1
-rw-r--r--yql/essentials/tests/sql/suites/column_group/hint_diff_grp_fail.sql1
-rw-r--r--yql/essentials/tests/sql/suites/column_group/hint_dup_col_fail.sql1
-rw-r--r--yql/essentials/tests/sql/suites/column_group/hint_dup_def_fail.sql1
-rw-r--r--yql/essentials/tests/sql/suites/column_group/hint_empty_grp_fail.sql1
-rw-r--r--yql/essentials/tests/sql/suites/column_group/hint_non_lst_yson_fail.sql1
-rw-r--r--yql/essentials/tests/sql/suites/column_group/hint_non_map_yson_fail.sql1
-rw-r--r--yql/essentials/tests/sql/suites/column_group/hint_non_str_yson_fail.sql1
-rw-r--r--yql/essentials/tests/sql/suites/column_group/hint_non_yson_fail.sql1
-rw-r--r--yql/essentials/tests/sql/suites/column_group/hint_short_grp_fail.sql1
-rw-r--r--yql/essentials/tests/sql/suites/column_group/hint_unk_col_fail.sql1
-rw-r--r--yql/essentials/tests/sql/suites/column_group/insert_diff_groups1_fail.sql1
-rw-r--r--yql/essentials/tests/sql/suites/column_group/insert_diff_groups2_fail.sql1
-rw-r--r--yql/essentials/tests/sql/suites/column_group/insert_diff_groups3_fail.sql1
-rw-r--r--yql/essentials/tests/sql/suites/column_order/union_all_positional_columns_count_fail.sql1
-rw-r--r--yql/essentials/tests/sql/suites/column_order/union_all_positional_unordered_fail.sql3
-rw-r--r--yql/essentials/tests/sql/suites/datetime/date_tz_impossible_cast.sql1
-rw-r--r--yql/essentials/tests/sql/suites/expr/as_table_bad_columns_fail.sql1
-rw-r--r--yql/essentials/tests/sql/suites/expr/as_table_bad_row_type_fail.sql1
-rw-r--r--yql/essentials/tests/sql/suites/expr/ensure_runtime_fail.sql1
-rw-r--r--yql/essentials/tests/sql/suites/expr/ensure_type_fail.sql2
-rw-r--r--yql/essentials/tests/sql/suites/expr/implicit_bitcast_fail.sql1
-rw-r--r--yql/essentials/tests/sql/suites/expr/list_replicate_fail.sql1
-rw-r--r--yql/essentials/tests/sql/suites/expr/non_persistable_group_by_column_fail.sql1
-rw-r--r--yql/essentials/tests/sql/suites/expr/non_persistable_group_by_having_some_fail.sql1
-rw-r--r--yql/essentials/tests/sql/suites/expr/non_persistable_group_by_some_fail.sql1
-rw-r--r--yql/essentials/tests/sql/suites/expr/non_persistable_inner_select_fail.sql1
-rw-r--r--yql/essentials/tests/sql/suites/expr/non_persistable_insert_into_fail.sql1
-rw-r--r--yql/essentials/tests/sql/suites/expr/non_persistable_order_by_fail.sql1
-rw-r--r--yql/essentials/tests/sql/suites/expr/unwrap_runtime_fail.sql1
-rw-r--r--yql/essentials/tests/sql/suites/file/parse_file_bad_type_fail.sql1
-rw-r--r--yql/essentials/tests/sql/suites/file/second_pass_parse_file_fail.sql3
-rw-r--r--yql/essentials/tests/sql/suites/hor_join/yield_off.cfg3
-rw-r--r--yql/essentials/tests/sql/suites/in/in_tuple_check0_fail.sql1
-rw-r--r--yql/essentials/tests/sql/suites/in/in_tuple_check1_fail.sql1
-rw-r--r--yql/essentials/tests/sql/suites/insert/append_proto_fail.cfg (renamed from yql/essentials/tests/sql/suites/insert/append-proto_fail.cfg)0
-rw-r--r--yql/essentials/tests/sql/suites/insert/append_proto_fail.sql6
-rw-r--r--yql/essentials/tests/sql/suites/insert/append_view_fail.cfg (renamed from yql/essentials/tests/sql/suites/insert/append-view_fail.cfg)0
-rw-r--r--yql/essentials/tests/sql/suites/insert/append_view_fail.sql6
-rw-r--r--yql/essentials/tests/sql/suites/insert/append_with_read_udf_fail.cfg (renamed from yql/essentials/tests/sql/suites/insert/append-with_read_udf_fail.cfg)0
-rw-r--r--yql/essentials/tests/sql/suites/insert/append_with_read_udf_fail.sql6
-rw-r--r--yql/essentials/tests/sql/suites/insert/fail_read_view_after_modify.sql1
-rw-r--r--yql/essentials/tests/sql/suites/insert/keepmeta_nonstrict_fail.cfg (renamed from yql/essentials/tests/sql/suites/insert/keepmeta-nonstrict_fail.cfg)0
-rw-r--r--yql/essentials/tests/sql/suites/insert/keepmeta_nonstrict_fail.sql6
-rw-r--r--yql/essentials/tests/sql/suites/insert/keepmeta_proto_fail.cfg (renamed from yql/essentials/tests/sql/suites/insert/keepmeta-proto_fail.cfg)0
-rw-r--r--yql/essentials/tests/sql/suites/insert/keepmeta_proto_fail.sql6
-rw-r--r--yql/essentials/tests/sql/suites/insert/keepmeta_view_fail.cfg (renamed from yql/essentials/tests/sql/suites/insert/keepmeta-view_fail.cfg)0
-rw-r--r--yql/essentials/tests/sql/suites/insert/keepmeta_view_fail.sql6
-rw-r--r--yql/essentials/tests/sql/suites/insert/keepmeta_with_read_udf_fail.cfg (renamed from yql/essentials/tests/sql/suites/insert/keepmeta-with_read_udf_fail.cfg)0
-rw-r--r--yql/essentials/tests/sql/suites/insert/keepmeta_with_read_udf_fail.sql6
-rw-r--r--yql/essentials/tests/sql/suites/insert/override_view_fail.cfg (renamed from yql/essentials/tests/sql/suites/insert/override-view_fail.cfg)0
-rw-r--r--yql/essentials/tests/sql/suites/insert/override_view_fail.sql5
-rw-r--r--yql/essentials/tests/sql/suites/insert/use_anon_table_before_commit_fail.sql1
-rw-r--r--yql/essentials/tests/sql/suites/insert/use_anon_table_without_fill_fail.sql1
-rw-r--r--yql/essentials/tests/sql/suites/insert_monotonic/break_sort_fail.sql1
-rw-r--r--yql/essentials/tests/sql/suites/insert_monotonic/break_unique_fail.cfg1
-rw-r--r--yql/essentials/tests/sql/suites/insert_monotonic/break_unique_fail.sql4
-rw-r--r--yql/essentials/tests/sql/suites/insert_monotonic/non_existing_fail.sql3
-rw-r--r--yql/essentials/tests/sql/suites/insert_monotonic/not_all_fail.sql1
-rw-r--r--yql/essentials/tests/sql/suites/insert_monotonic/overlaping_fail.cfg1
-rw-r--r--yql/essentials/tests/sql/suites/insert_monotonic/overlaping_fail.sql4
-rw-r--r--yql/essentials/tests/sql/suites/insert_monotonic/truncate_fail.sql1
-rw-r--r--yql/essentials/tests/sql/suites/join/join_table_conflict_fail-off.cfg3
-rw-r--r--yql/essentials/tests/sql/suites/join/join_table_conflict_fail.sql2
-rw-r--r--yql/essentials/tests/sql/suites/join/strict_keys-off.cfg5
-rw-r--r--yql/essentials/tests/sql/suites/join/strict_keys.sql3
-rw-r--r--yql/essentials/tests/sql/suites/json/json_exists/on_error_exception.sql5
-rw-r--r--yql/essentials/tests/sql/suites/json/json_exists/passing_exception.sql5
-rw-r--r--yql/essentials/tests/sql/suites/json/json_query/on_empty_exception.sql5
-rw-r--r--yql/essentials/tests/sql/suites/json/json_query/on_error_exception.sql4
-rw-r--r--yql/essentials/tests/sql/suites/json/json_query/passing_exception.sql3
-rw-r--r--yql/essentials/tests/sql/suites/json/json_value/on_empty_cast_default_exception.sql3
-rw-r--r--yql/essentials/tests/sql/suites/json/json_value/on_empty_exception.sql3
-rw-r--r--yql/essentials/tests/sql/suites/json/json_value/on_error_cast_default_exception.sql3
-rw-r--r--yql/essentials/tests/sql/suites/json/json_value/on_error_cast_udf_exception.sql3
-rw-r--r--yql/essentials/tests/sql/suites/json/json_value/on_error_cast_value_exception.sql3
-rw-r--r--yql/essentials/tests/sql/suites/json/json_value/on_error_jsonpath_exception.sql3
-rw-r--r--yql/essentials/tests/sql/suites/json/json_value/passing_exception.sql3
-rw-r--r--yql/essentials/tests/sql/suites/lambda/lambda_with_tie_bad_count_fail.sql2
-rw-r--r--yql/essentials/tests/sql/suites/lineage/error_type.sql1
-rw-r--r--yql/essentials/tests/sql/suites/match_recognize/test_type_predicate.sql1
-rw-r--r--yql/essentials/tests/sql/suites/optimizers/sort_by_nonstrict_const.sql1
-rw-r--r--yql/essentials/tests/sql/suites/params/missing_param_fail.sql1
-rw-r--r--yql/essentials/tests/sql/suites/params/no_params_fail.sql3
-rw-r--r--yql/essentials/tests/sql/suites/params/param_type_mismatch_fail.sql3
-rw-r--r--yql/essentials/tests/sql/suites/pg/join_using_table_used_order2.sql7
-rw-r--r--yql/essentials/tests/sql/suites/pg_duplicated/ambigous_order_by_from_join.sql5
-rw-r--r--yql/essentials/tests/sql/suites/pg_duplicated/ambigous_order_by_from_table.sql3
-rw-r--r--yql/essentials/tests/sql/suites/pg_duplicated/ambigous_order_by_item_expression_from_projection.sql5
-rw-r--r--yql/essentials/tests/sql/suites/pg_duplicated/ambigous_order_by_with_duplicates.sql5
-rw-r--r--yql/essentials/tests/sql/suites/pg_duplicated/ambigous_order_by_wo_duplicated_in_projection.sql5
-rw-r--r--yql/essentials/tests/sql/suites/pg_duplicated/ambigous_ref.sql3
-rw-r--r--yql/essentials/tests/sql/suites/pragma/yson_strict_fail.sql1
-rw-r--r--yql/essentials/tests/sql/suites/produce/process_multi_in.cfg1
-rw-r--r--yql/essentials/tests/sql/suites/produce/process_multi_out_bad_count_fail.sql3
-rw-r--r--yql/essentials/tests/sql/suites/produce/reduce_with_flat_python_stream.cfg3
-rw-r--r--yql/essentials/tests/sql/suites/schema/read_schema_change_other.sql1
-rw-r--r--yql/essentials/tests/sql/suites/schema/select_all_inferschema_range_empty_fail.cfg (renamed from yql/essentials/tests/sql/suites/schema/select_all_inferschema_range-empty_fail.cfg)0
-rw-r--r--yql/essentials/tests/sql/suites/schema/select_all_inferschema_range_empty_fail.sql3
-rw-r--r--yql/essentials/tests/sql/suites/schema/user_schema_append.sql2
-rw-r--r--yql/essentials/tests/sql/suites/select/anon_clash.sql1
-rw-r--r--yql/essentials/tests/sql/suites/simple_columns/simple_columns_base_fail.sql4
-rw-r--r--yql/essentials/tests/sql/suites/simple_columns/simple_columns_join_fail.sql2
-rw-r--r--yql/essentials/tests/sql/suites/solomon/BadDownsamplingAggregation.cfg2
-rw-r--r--yql/essentials/tests/sql/suites/solomon/BadDownsamplingAggregation.sql6
-rw-r--r--yql/essentials/tests/sql/suites/solomon/BadDownsamplingDisabled.cfg2
-rw-r--r--yql/essentials/tests/sql/suites/solomon/BadDownsamplingDisabled.sql6
-rw-r--r--yql/essentials/tests/sql/suites/solomon/BadDownsamplingFill.cfg2
-rw-r--r--yql/essentials/tests/sql/suites/solomon/BadDownsamplingFill.sql6
-rw-r--r--yql/essentials/tests/sql/suites/solomon/BadDownsamplingInterval.cfg2
-rw-r--r--yql/essentials/tests/sql/suites/solomon/BadDownsamplingInterval.sql6
-rw-r--r--yql/essentials/tests/sql/suites/solomon/Basic.sql5
-rw-r--r--yql/essentials/tests/sql/suites/solomon/BrokenJsonResponse.cfg2
-rw-r--r--yql/essentials/tests/sql/suites/solomon/BrokenJsonResponse.sql5
-rw-r--r--yql/essentials/tests/sql/suites/solomon/Downsampling.sql9
-rw-r--r--yql/essentials/tests/sql/suites/solomon/DownsamplingValidSettings.sql17
-rw-r--r--yql/essentials/tests/sql/suites/solomon/InvalidProject.cfg2
-rw-r--r--yql/essentials/tests/sql/suites/solomon/InvalidProject.sql5
-rw-r--r--yql/essentials/tests/sql/suites/solomon/LabelColumns.sql6
-rw-r--r--yql/essentials/tests/sql/suites/solomon/Subquery.sql15
-rw-r--r--yql/essentials/tests/sql/suites/solomon/UnknownSetting.cfg2
-rw-r--r--yql/essentials/tests/sql/suites/solomon/UnknownSetting.sql6
-rw-r--r--yql/essentials/tests/sql/suites/solomon/default.cfg1
-rw-r--r--yql/essentials/tests/sql/suites/table_range/each_with_non_existing_all_fail.cfg (renamed from yql/essentials/tests/sql/suites/table_range/each_with_non_existing-all_fail.cfg)0
-rw-r--r--yql/essentials/tests/sql/suites/table_range/each_with_non_existing_all_fail.sql5
-rw-r--r--yql/essentials/tests/sql/suites/udf/named_args_for_script_with_posargs_reuse_args_fail.sql3
-rw-r--r--yql/essentials/tests/sql/suites/udf/python_struct.cfg2
-rw-r--r--yql/essentials/tests/sql/suites/udf/python_struct.sql2
-rw-r--r--yql/essentials/tests/sql/suites/udf/wrong_args_fail.sql1
-rw-r--r--yql/essentials/tests/sql/suites/view/file_eval.sql1
-rw-r--r--yql/essentials/tests/sql/suites/view/file_outer.sql3
-rw-r--r--yql/essentials/tests/sql/suites/view/file_outer_library.sql1
-rw-r--r--yql/essentials/tests/sql/suites/view/secure.sql3
-rw-r--r--yql/essentials/tests/sql/suites/view/secure_eval.sql3
-rw-r--r--yql/essentials/tests/sql/suites/view/secure_eval_dyn.sql3
-rw-r--r--yql/essentials/tests/sql/suites/weak_field/weak_field_wrong_types_fail.sql2
145 files changed, 188 insertions, 191 deletions
diff --git a/yql/essentials/tests/sql/suites/action/eval_atom_wrong_type_expr.sql b/yql/essentials/tests/sql/suites/action/eval_atom_wrong_type_expr.sql
index 9e8a2a8c6e..eeda7684a3 100644
--- a/yql/essentials/tests/sql/suites/action/eval_atom_wrong_type_expr.sql
+++ b/yql/essentials/tests/sql/suites/action/eval_atom_wrong_type_expr.sql
@@ -1,4 +1,5 @@
/* yt can not */
+/* custom error: Expected data or optional of data, but got: List<String> */
use plato;
$n = ["foo"];
diff --git a/yql/essentials/tests/sql/suites/action/eval_atom_wrong_type_param.sql b/yql/essentials/tests/sql/suites/action/eval_atom_wrong_type_param.sql
index 7de917ef03..78990decb9 100644
--- a/yql/essentials/tests/sql/suites/action/eval_atom_wrong_type_param.sql
+++ b/yql/essentials/tests/sql/suites/action/eval_atom_wrong_type_param.sql
@@ -1,4 +1,5 @@
/* yt can not */
+/* custom error: Expected data or optional of data, but got optional of: List<String> */
use plato;
declare $n as List<String>?;
diff --git a/yql/essentials/tests/sql/suites/action/eval_on_modif_table_fail.sql b/yql/essentials/tests/sql/suites/action/eval_on_modif_table_fail.sql
index 67ec4878f3..4cd9a1ba98 100644
--- a/yql/essentials/tests/sql/suites/action/eval_on_modif_table_fail.sql
+++ b/yql/essentials/tests/sql/suites/action/eval_on_modif_table_fail.sql
@@ -1,5 +1,6 @@
/* syntax version 1 */
/* postgres can not */
+/* custom error: Table "Output" is used before commit */
USE plato;
insert into Output
diff --git a/yql/essentials/tests/sql/suites/action/eval_typeof_output_table.sql b/yql/essentials/tests/sql/suites/action/eval_typeof_output_table.sql
index 88b43b3736..80428193e3 100644
--- a/yql/essentials/tests/sql/suites/action/eval_typeof_output_table.sql
+++ b/yql/essentials/tests/sql/suites/action/eval_typeof_output_table.sql
@@ -1,5 +1,6 @@
/* syntax version 1 */
/* postgres can not */
+/* custom error: Table "Output" does not exist */
USE plato;
INSERT INTO Output
diff --git a/yql/essentials/tests/sql/suites/action/large_evaluate_for_fail.sql b/yql/essentials/tests/sql/suites/action/large_evaluate_for_fail.sql
index 74a9ac9790..539bda0b60 100644
--- a/yql/essentials/tests/sql/suites/action/large_evaluate_for_fail.sql
+++ b/yql/essentials/tests/sql/suites/action/large_evaluate_for_fail.sql
@@ -1,5 +1,6 @@
/* syntax version 1 */
/* postgres can not */
+/* custom error: Too large list for EVALUATE FOR, allowed: 3, got: 10 */
pragma config.flags("EvaluateForLimit", "3");
evaluate for $_i in ListFromRange(0, 10) do empty_action();
diff --git a/yql/essentials/tests/sql/suites/action/mixed_eval_typeof_world1.sql b/yql/essentials/tests/sql/suites/action/mixed_eval_typeof_world1.sql
index 54de5b2950..af5339c5a5 100644
--- a/yql/essentials/tests/sql/suites/action/mixed_eval_typeof_world1.sql
+++ b/yql/essentials/tests/sql/suites/action/mixed_eval_typeof_world1.sql
@@ -1,5 +1,6 @@
/* syntax version 1 */
/* postgres can not */
+/* custom error:Anonymous table "@Output1" must be materialized*/
use plato;
$force_remove_members = ($struct, $to_remove) -> {
diff --git a/yql/essentials/tests/sql/suites/action/pending_arg_fail.sql b/yql/essentials/tests/sql/suites/action/pending_arg_fail.sql
index 5c09ceb11c..5d3155c610 100644
--- a/yql/essentials/tests/sql/suites/action/pending_arg_fail.sql
+++ b/yql/essentials/tests/sql/suites/action/pending_arg_fail.sql
@@ -1,4 +1,5 @@
/* syntax version 1 */
/* postgres can not */
+/* custom error:Failed to evaluate unresolved argument: row. Did you use a column?*/
use plato;
-select ListExtract(value,key) from Input; \ No newline at end of file
+select ListExtract(value,key) from Input;
diff --git a/yql/essentials/tests/sql/suites/aggregate/library_error_in_aggregation_fail.sql b/yql/essentials/tests/sql/suites/aggregate/library_error_in_aggregation_fail.sql
index 3d7640c756..53152d8437 100644
--- a/yql/essentials/tests/sql/suites/aggregate/library_error_in_aggregation_fail.sql
+++ b/yql/essentials/tests/sql/suites/aggregate/library_error_in_aggregation_fail.sql
@@ -1,5 +1,4 @@
-/* syntax version 1 */
-/* postgres can not */
+/* custom error:Unsupported column type: String*/
USE plato;
diff --git a/yql/essentials/tests/sql/suites/binding/tie_bad_count_fail.sql b/yql/essentials/tests/sql/suites/binding/tie_bad_count_fail.sql
index de29966b64..18e5b364db 100644
--- a/yql/essentials/tests/sql/suites/binding/tie_bad_count_fail.sql
+++ b/yql/essentials/tests/sql/suites/binding/tie_bad_count_fail.sql
@@ -1,5 +1,6 @@
/* syntax version 1 */
/* postgres can not */
+/* custom error:Expected tuple type of size: 2, but got: 3*/
$i, $j = AsTuple(1, 5u, "test");
select $i, $j;
diff --git a/yql/essentials/tests/sql/suites/column_group/hint_append_fail.sql b/yql/essentials/tests/sql/suites/column_group/hint_append_fail.sql
index 2317d88dd2..720052d6e1 100644
--- a/yql/essentials/tests/sql/suites/column_group/hint_append_fail.sql
+++ b/yql/essentials/tests/sql/suites/column_group/hint_append_fail.sql
@@ -1,3 +1,4 @@
+/* custom error:Insert with "column_groups" to existing table is not allowed*/
USE plato;
insert into Output
diff --git a/yql/essentials/tests/sql/suites/column_group/hint_diff_grp_fail.sql b/yql/essentials/tests/sql/suites/column_group/hint_diff_grp_fail.sql
index 9eaa116ad5..f47f4f81f9 100644
--- a/yql/essentials/tests/sql/suites/column_group/hint_diff_grp_fail.sql
+++ b/yql/essentials/tests/sql/suites/column_group/hint_diff_grp_fail.sql
@@ -1,3 +1,4 @@
+/* custom error:All appends within the same commit should have the equal "column_groups" value*/
USE plato;
insert into Output
diff --git a/yql/essentials/tests/sql/suites/column_group/hint_dup_col_fail.sql b/yql/essentials/tests/sql/suites/column_group/hint_dup_col_fail.sql
index e40a0624f9..1acaba9f6d 100644
--- a/yql/essentials/tests/sql/suites/column_group/hint_dup_col_fail.sql
+++ b/yql/essentials/tests/sql/suites/column_group/hint_dup_col_fail.sql
@@ -1,3 +1,4 @@
+/* custom error:Duplicate column "a"*/
USE plato;
-- duplicate column
diff --git a/yql/essentials/tests/sql/suites/column_group/hint_dup_def_fail.sql b/yql/essentials/tests/sql/suites/column_group/hint_dup_def_fail.sql
index 445ed03645..8f0db30396 100644
--- a/yql/essentials/tests/sql/suites/column_group/hint_dup_def_fail.sql
+++ b/yql/essentials/tests/sql/suites/column_group/hint_dup_def_fail.sql
@@ -1,3 +1,4 @@
+/* custom error:Not more than one group should have # value: "def2"*/
USE plato;
-- duplicate column
diff --git a/yql/essentials/tests/sql/suites/column_group/hint_empty_grp_fail.sql b/yql/essentials/tests/sql/suites/column_group/hint_empty_grp_fail.sql
index 30067b1ded..521675ee5d 100644
--- a/yql/essentials/tests/sql/suites/column_group/hint_empty_grp_fail.sql
+++ b/yql/essentials/tests/sql/suites/column_group/hint_empty_grp_fail.sql
@@ -1,3 +1,4 @@
+/* custom error:Expected list with at least two columns, group: "g1"*/
USE plato;
-- empty group
diff --git a/yql/essentials/tests/sql/suites/column_group/hint_non_lst_yson_fail.sql b/yql/essentials/tests/sql/suites/column_group/hint_non_lst_yson_fail.sql
index e7d630bfea..00d0a444b5 100644
--- a/yql/essentials/tests/sql/suites/column_group/hint_non_lst_yson_fail.sql
+++ b/yql/essentials/tests/sql/suites/column_group/hint_non_lst_yson_fail.sql
@@ -1,3 +1,4 @@
+/* custom error:Expected list value, group: "g1"*/
USE plato;
-- bad yson
diff --git a/yql/essentials/tests/sql/suites/column_group/hint_non_map_yson_fail.sql b/yql/essentials/tests/sql/suites/column_group/hint_non_map_yson_fail.sql
index 295f9ecf61..58b413af20 100644
--- a/yql/essentials/tests/sql/suites/column_group/hint_non_map_yson_fail.sql
+++ b/yql/essentials/tests/sql/suites/column_group/hint_non_map_yson_fail.sql
@@ -1,3 +1,4 @@
+/* custom error:Expected Yson map, got: list_node*/
USE plato;
-- bad yson
diff --git a/yql/essentials/tests/sql/suites/column_group/hint_non_str_yson_fail.sql b/yql/essentials/tests/sql/suites/column_group/hint_non_str_yson_fail.sql
index 35fb731190..8ed51c1871 100644
--- a/yql/essentials/tests/sql/suites/column_group/hint_non_str_yson_fail.sql
+++ b/yql/essentials/tests/sql/suites/column_group/hint_non_str_yson_fail.sql
@@ -1,3 +1,4 @@
+/* custom error:Expected string value in list, found int64_node, group: "g1"*/
USE plato;
-- bad yson
diff --git a/yql/essentials/tests/sql/suites/column_group/hint_non_yson_fail.sql b/yql/essentials/tests/sql/suites/column_group/hint_non_yson_fail.sql
index c2a36824dd..209aef0e43 100644
--- a/yql/essentials/tests/sql/suites/column_group/hint_non_yson_fail.sql
+++ b/yql/essentials/tests/sql/suites/column_group/hint_non_yson_fail.sql
@@ -1,3 +1,4 @@
+/* custom error:Unexpected '!' while parsing node*/
USE plato;
-- bad yson
diff --git a/yql/essentials/tests/sql/suites/column_group/hint_short_grp_fail.sql b/yql/essentials/tests/sql/suites/column_group/hint_short_grp_fail.sql
index febf511fbe..895f4cbd61 100644
--- a/yql/essentials/tests/sql/suites/column_group/hint_short_grp_fail.sql
+++ b/yql/essentials/tests/sql/suites/column_group/hint_short_grp_fail.sql
@@ -1,3 +1,4 @@
+/* custom error:Expected list with at least two columns, group: "g1"*/
USE plato;
-- too short group
diff --git a/yql/essentials/tests/sql/suites/column_group/hint_unk_col_fail.sql b/yql/essentials/tests/sql/suites/column_group/hint_unk_col_fail.sql
index ebd127dbf3..64a49820a9 100644
--- a/yql/essentials/tests/sql/suites/column_group/hint_unk_col_fail.sql
+++ b/yql/essentials/tests/sql/suites/column_group/hint_unk_col_fail.sql
@@ -1,3 +1,4 @@
+/* custom error:Column group "g1" refers to unknown column "l"*/
USE plato;
-- unknown column
diff --git a/yql/essentials/tests/sql/suites/column_group/insert_diff_groups1_fail.sql b/yql/essentials/tests/sql/suites/column_group/insert_diff_groups1_fail.sql
index f429533a41..e962ccf194 100644
--- a/yql/essentials/tests/sql/suites/column_group/insert_diff_groups1_fail.sql
+++ b/yql/essentials/tests/sql/suites/column_group/insert_diff_groups1_fail.sql
@@ -1,3 +1,4 @@
+/* custom error:Insert with different "column_groups" to existing table is not allowed*/
USE plato;
pragma yt.ColumnGroupMode="perusage";
diff --git a/yql/essentials/tests/sql/suites/column_group/insert_diff_groups2_fail.sql b/yql/essentials/tests/sql/suites/column_group/insert_diff_groups2_fail.sql
index 2646c4cfe3..18ef3246fa 100644
--- a/yql/essentials/tests/sql/suites/column_group/insert_diff_groups2_fail.sql
+++ b/yql/essentials/tests/sql/suites/column_group/insert_diff_groups2_fail.sql
@@ -1,3 +1,4 @@
+/* custom error:Insert with different "column_groups" to existing table is not allowed*/
USE plato;
pragma yt.ColumnGroupMode="perusage";
diff --git a/yql/essentials/tests/sql/suites/column_group/insert_diff_groups3_fail.sql b/yql/essentials/tests/sql/suites/column_group/insert_diff_groups3_fail.sql
index 5f09a1e177..1e0a1a4734 100644
--- a/yql/essentials/tests/sql/suites/column_group/insert_diff_groups3_fail.sql
+++ b/yql/essentials/tests/sql/suites/column_group/insert_diff_groups3_fail.sql
@@ -1,3 +1,4 @@
+/* custom error:Insert with "column_groups" to existing table is not allowed*/
USE plato;
pragma yt.ColumnGroupMode="perusage";
diff --git a/yql/essentials/tests/sql/suites/column_order/union_all_positional_columns_count_fail.sql b/yql/essentials/tests/sql/suites/column_order/union_all_positional_columns_count_fail.sql
index 7f44ded569..3b5fd2428b 100644
--- a/yql/essentials/tests/sql/suites/column_order/union_all_positional_columns_count_fail.sql
+++ b/yql/essentials/tests/sql/suites/column_order/union_all_positional_columns_count_fail.sql
@@ -1,5 +1,6 @@
/* postgres can not */
/* syntax version 1 */
+/* custom error:Different column counts in UNION ALL inputs: input #0 has 3 column, input #1 has 2 columns*/
pragma PositionalUnionAll;
select 1 as c, 2 as b, 3 as a
diff --git a/yql/essentials/tests/sql/suites/column_order/union_all_positional_unordered_fail.sql b/yql/essentials/tests/sql/suites/column_order/union_all_positional_unordered_fail.sql
index 78c4dd86c4..c4128ac9be 100644
--- a/yql/essentials/tests/sql/suites/column_order/union_all_positional_unordered_fail.sql
+++ b/yql/essentials/tests/sql/suites/column_order/union_all_positional_unordered_fail.sql
@@ -1,5 +1,4 @@
-/* postgres can not */
-/* syntax version 1 */
+/* custom error:Input #1 does not have ordered columns. Consider making column order explicit by using SELECT with column names*/
pragma PositionalUnionAll;
select 1 as c, 2 as b, 3 as a
diff --git a/yql/essentials/tests/sql/suites/datetime/date_tz_impossible_cast.sql b/yql/essentials/tests/sql/suites/datetime/date_tz_impossible_cast.sql
index f8f220c217..87057a8bd6 100644
--- a/yql/essentials/tests/sql/suites/datetime/date_tz_impossible_cast.sql
+++ b/yql/essentials/tests/sql/suites/datetime/date_tz_impossible_cast.sql
@@ -1,3 +1,4 @@
+/* custom error:cannot be casted to TzDate*/
SELECT
CAST(AddTimezone(
/* "1970-01-01T20:59:59Z" */
diff --git a/yql/essentials/tests/sql/suites/expr/as_table_bad_columns_fail.sql b/yql/essentials/tests/sql/suites/expr/as_table_bad_columns_fail.sql
index a21a19e481..79f45f480c 100644
--- a/yql/essentials/tests/sql/suites/expr/as_table_bad_columns_fail.sql
+++ b/yql/essentials/tests/sql/suites/expr/as_table_bad_columns_fail.sql
@@ -1,4 +1,5 @@
/* postgres can not */
+/* custom error:Member not found: Value3. Did you mean Value1?*/
$data = AsList(
AsStruct(1u AS Key, "v1" AS Value1, 100 AS Value2),
diff --git a/yql/essentials/tests/sql/suites/expr/as_table_bad_row_type_fail.sql b/yql/essentials/tests/sql/suites/expr/as_table_bad_row_type_fail.sql
index beb55021a6..3f972a327f 100644
--- a/yql/essentials/tests/sql/suites/expr/as_table_bad_row_type_fail.sql
+++ b/yql/essentials/tests/sql/suites/expr/as_table_bad_row_type_fail.sql
@@ -1,4 +1,5 @@
/* postgres can not */
+/* custom error:Expected struct type, but got: Uint32*/
$data = AsList(1u, 2u, 3u);
diff --git a/yql/essentials/tests/sql/suites/expr/ensure_runtime_fail.sql b/yql/essentials/tests/sql/suites/expr/ensure_runtime_fail.sql
index 4ea3509678..5756dbe688 100644
--- a/yql/essentials/tests/sql/suites/expr/ensure_runtime_fail.sql
+++ b/yql/essentials/tests/sql/suites/expr/ensure_runtime_fail.sql
@@ -1,2 +1,3 @@
/* postgres can not */
+/* custom error:message*/
select Ensure(42, 2 != 2, "message");
diff --git a/yql/essentials/tests/sql/suites/expr/ensure_type_fail.sql b/yql/essentials/tests/sql/suites/expr/ensure_type_fail.sql
index 08ae648b5c..a0aee93406 100644
--- a/yql/essentials/tests/sql/suites/expr/ensure_type_fail.sql
+++ b/yql/essentials/tests/sql/suites/expr/ensure_type_fail.sql
@@ -1,5 +1,5 @@
/* syntax version 1 */
/* postgres can not */
/* syntax version 1 */
-
+/* custom error:Mismatch types: Int32 != String (message)*/
select EnsureType(42, String, "message");
diff --git a/yql/essentials/tests/sql/suites/expr/implicit_bitcast_fail.sql b/yql/essentials/tests/sql/suites/expr/implicit_bitcast_fail.sql
index b30ed85ce3..f609402b29 100644
--- a/yql/essentials/tests/sql/suites/expr/implicit_bitcast_fail.sql
+++ b/yql/essentials/tests/sql/suites/expr/implicit_bitcast_fail.sql
@@ -1,4 +1,5 @@
/* postgres can not */
+/* custom error:Cannot infer common type for Int64 and Uint64*/
pragma warning("error", "1107");
select AsList(
7498311229109140978,
diff --git a/yql/essentials/tests/sql/suites/expr/list_replicate_fail.sql b/yql/essentials/tests/sql/suites/expr/list_replicate_fail.sql
index 0567764565..fe6b10be5c 100644
--- a/yql/essentials/tests/sql/suites/expr/list_replicate_fail.sql
+++ b/yql/essentials/tests/sql/suites/expr/list_replicate_fail.sql
@@ -1,3 +1,4 @@
/* postgres can not */
+/* custom error:Second argument in ListReplicate = 18446744073709551615 exceeds maximum value = 4294967296*/
select
ListReplicate(1, -1);
diff --git a/yql/essentials/tests/sql/suites/expr/non_persistable_group_by_column_fail.sql b/yql/essentials/tests/sql/suites/expr/non_persistable_group_by_column_fail.sql
index eae813be7a..b20bac6443 100644
--- a/yql/essentials/tests/sql/suites/expr/non_persistable_group_by_column_fail.sql
+++ b/yql/essentials/tests/sql/suites/expr/non_persistable_group_by_column_fail.sql
@@ -1,3 +1,4 @@
+/* custom error:Expected hashable and equatable type for key column: key, but got: Resource<'MTRand'>*/
PRAGMA Warning("error", '1104');
USE plato;
diff --git a/yql/essentials/tests/sql/suites/expr/non_persistable_group_by_having_some_fail.sql b/yql/essentials/tests/sql/suites/expr/non_persistable_group_by_having_some_fail.sql
index 3fc1126b89..d7e1dba4ad 100644
--- a/yql/essentials/tests/sql/suites/expr/non_persistable_group_by_having_some_fail.sql
+++ b/yql/essentials/tests/sql/suites/expr/non_persistable_group_by_having_some_fail.sql
@@ -1,3 +1,4 @@
+/* custom error:Persistable required*/
PRAGMA Warning("error", '1104');
USE plato;
diff --git a/yql/essentials/tests/sql/suites/expr/non_persistable_group_by_some_fail.sql b/yql/essentials/tests/sql/suites/expr/non_persistable_group_by_some_fail.sql
index e7b61c9b47..9c99d9a10f 100644
--- a/yql/essentials/tests/sql/suites/expr/non_persistable_group_by_some_fail.sql
+++ b/yql/essentials/tests/sql/suites/expr/non_persistable_group_by_some_fail.sql
@@ -1,3 +1,4 @@
+/* custom error:Persistable required*/
PRAGMA Warning("error", '1104');
USE plato;
diff --git a/yql/essentials/tests/sql/suites/expr/non_persistable_inner_select_fail.sql b/yql/essentials/tests/sql/suites/expr/non_persistable_inner_select_fail.sql
index 4f6a600c31..a01042a41c 100644
--- a/yql/essentials/tests/sql/suites/expr/non_persistable_inner_select_fail.sql
+++ b/yql/essentials/tests/sql/suites/expr/non_persistable_inner_select_fail.sql
@@ -1,3 +1,4 @@
+/* custom error:Persistable required*/
PRAGMA Warning("error", '1104');
USE plato;
diff --git a/yql/essentials/tests/sql/suites/expr/non_persistable_insert_into_fail.sql b/yql/essentials/tests/sql/suites/expr/non_persistable_insert_into_fail.sql
index cd75cf3d25..56b73236a9 100644
--- a/yql/essentials/tests/sql/suites/expr/non_persistable_insert_into_fail.sql
+++ b/yql/essentials/tests/sql/suites/expr/non_persistable_insert_into_fail.sql
@@ -1,3 +1,4 @@
+/* custom error:Persistable required*/
PRAGMA Warning("error", '1104');
USE plato;
diff --git a/yql/essentials/tests/sql/suites/expr/non_persistable_order_by_fail.sql b/yql/essentials/tests/sql/suites/expr/non_persistable_order_by_fail.sql
index c94d1805ab..d600f8d474 100644
--- a/yql/essentials/tests/sql/suites/expr/non_persistable_order_by_fail.sql
+++ b/yql/essentials/tests/sql/suites/expr/non_persistable_order_by_fail.sql
@@ -1,3 +1,4 @@
+/* custom error:Persistable required*/
PRAGMA Warning("error", '1104');
USE plato;
diff --git a/yql/essentials/tests/sql/suites/expr/unwrap_runtime_fail.sql b/yql/essentials/tests/sql/suites/expr/unwrap_runtime_fail.sql
index 64c87cd8dd..9d55855989 100644
--- a/yql/essentials/tests/sql/suites/expr/unwrap_runtime_fail.sql
+++ b/yql/essentials/tests/sql/suites/expr/unwrap_runtime_fail.sql
@@ -1,2 +1,3 @@
/* postgres can not */
+/* custom error:message*/
select Unwrap(null, "message");
diff --git a/yql/essentials/tests/sql/suites/file/parse_file_bad_type_fail.sql b/yql/essentials/tests/sql/suites/file/parse_file_bad_type_fail.sql
index 2a47763852..81fb716b15 100644
--- a/yql/essentials/tests/sql/suites/file/parse_file_bad_type_fail.sql
+++ b/yql/essentials/tests/sql/suites/file/parse_file_bad_type_fail.sql
@@ -1,2 +1,3 @@
/* postgres can not */
+/* custom error:User type Uuid is not supported*/
select ParseFile('uuid', "keyid.lst");
diff --git a/yql/essentials/tests/sql/suites/file/second_pass_parse_file_fail.sql b/yql/essentials/tests/sql/suites/file/second_pass_parse_file_fail.sql
index 10a2763a86..14980696a4 100644
--- a/yql/essentials/tests/sql/suites/file/second_pass_parse_file_fail.sql
+++ b/yql/essentials/tests/sql/suites/file/second_pass_parse_file_fail.sql
@@ -1,5 +1,6 @@
/* postgres can not */
+/* custom error:The file iterator was already created. To scan file data multiple times please use ListCollect either over ParseFile or over some lazy function over it, e.g. ListMap*/
$list = ParseFile("int32","keyid.lst");
select ListExtend(
ListMap($list, ($x)->{return $x + 1 }),
- ListMap($list, ($x)->{return $x + 2 })); \ No newline at end of file
+ ListMap($list, ($x)->{return $x + 2 }));
diff --git a/yql/essentials/tests/sql/suites/hor_join/yield_off.cfg b/yql/essentials/tests/sql/suites/hor_join/yield_off.cfg
new file mode 100644
index 0000000000..3c11f9c54b
--- /dev/null
+++ b/yql/essentials/tests/sql/suites/hor_join/yield_off.cfg
@@ -0,0 +1,3 @@
+in Input input.txt
+udf python3_udf
+providers yt
diff --git a/yql/essentials/tests/sql/suites/in/in_tuple_check0_fail.sql b/yql/essentials/tests/sql/suites/in/in_tuple_check0_fail.sql
index 6c8928c351..f32fb9bcff 100644
--- a/yql/essentials/tests/sql/suites/in/in_tuple_check0_fail.sql
+++ b/yql/essentials/tests/sql/suites/in/in_tuple_check0_fail.sql
@@ -1,3 +1,4 @@
+/* custom error:Can't compare Tuple<Int32,Int32> with Tuple<Int32,Tuple<Int32,Int32>>*/
select AsTuple(1, 1) in (
AsTuple(2, 1),
AsTuple(1, 2),
diff --git a/yql/essentials/tests/sql/suites/in/in_tuple_check1_fail.sql b/yql/essentials/tests/sql/suites/in/in_tuple_check1_fail.sql
index ae352a79b6..91bda9b22d 100644
--- a/yql/essentials/tests/sql/suites/in/in_tuple_check1_fail.sql
+++ b/yql/essentials/tests/sql/suites/in/in_tuple_check1_fail.sql
@@ -1,3 +1,4 @@
+/* custom error:Can't compare Tuple<Int32,Int32> with Int32*/
select AsTuple(1, 1) in (
AsTuple(2, 1),
AsTuple(1, 2),
diff --git a/yql/essentials/tests/sql/suites/insert/append-proto_fail.cfg b/yql/essentials/tests/sql/suites/insert/append_proto_fail.cfg
index 6d87958c65..6d87958c65 100644
--- a/yql/essentials/tests/sql/suites/insert/append-proto_fail.cfg
+++ b/yql/essentials/tests/sql/suites/insert/append_proto_fail.cfg
diff --git a/yql/essentials/tests/sql/suites/insert/append_proto_fail.sql b/yql/essentials/tests/sql/suites/insert/append_proto_fail.sql
new file mode 100644
index 0000000000..437e165a80
--- /dev/null
+++ b/yql/essentials/tests/sql/suites/insert/append_proto_fail.sql
@@ -0,0 +1,6 @@
+/* postgres can not */
+/* multirun can not */
+/* custom error:Table "Output" has udf remappers, append is not allowed*/
+insert into plato.Output
+select * from plato.Input;
+
diff --git a/yql/essentials/tests/sql/suites/insert/append-view_fail.cfg b/yql/essentials/tests/sql/suites/insert/append_view_fail.cfg
index db398a8d2f..db398a8d2f 100644
--- a/yql/essentials/tests/sql/suites/insert/append-view_fail.cfg
+++ b/yql/essentials/tests/sql/suites/insert/append_view_fail.cfg
diff --git a/yql/essentials/tests/sql/suites/insert/append_view_fail.sql b/yql/essentials/tests/sql/suites/insert/append_view_fail.sql
new file mode 100644
index 0000000000..3a9f61a60c
--- /dev/null
+++ b/yql/essentials/tests/sql/suites/insert/append_view_fail.sql
@@ -0,0 +1,6 @@
+/* postgres can not */
+/* multirun can not */
+/* custom error:Modification of "Output" view is not supported*/
+insert into plato.Output
+select * from plato.Input;
+
diff --git a/yql/essentials/tests/sql/suites/insert/append-with_read_udf_fail.cfg b/yql/essentials/tests/sql/suites/insert/append_with_read_udf_fail.cfg
index 1d043c6420..1d043c6420 100644
--- a/yql/essentials/tests/sql/suites/insert/append-with_read_udf_fail.cfg
+++ b/yql/essentials/tests/sql/suites/insert/append_with_read_udf_fail.cfg
diff --git a/yql/essentials/tests/sql/suites/insert/append_with_read_udf_fail.sql b/yql/essentials/tests/sql/suites/insert/append_with_read_udf_fail.sql
new file mode 100644
index 0000000000..437e165a80
--- /dev/null
+++ b/yql/essentials/tests/sql/suites/insert/append_with_read_udf_fail.sql
@@ -0,0 +1,6 @@
+/* postgres can not */
+/* multirun can not */
+/* custom error:Table "Output" has udf remappers, append is not allowed*/
+insert into plato.Output
+select * from plato.Input;
+
diff --git a/yql/essentials/tests/sql/suites/insert/fail_read_view_after_modify.sql b/yql/essentials/tests/sql/suites/insert/fail_read_view_after_modify.sql
index aa2f928459..a58b0d5d89 100644
--- a/yql/essentials/tests/sql/suites/insert/fail_read_view_after_modify.sql
+++ b/yql/essentials/tests/sql/suites/insert/fail_read_view_after_modify.sql
@@ -1,5 +1,6 @@
/* postgres can not */
/* syntax version 1 */
+/* custom error:Table "Output" cannot have any view after replacing its content*/
insert into plato.Output with truncate
select * from plato.Input;
diff --git a/yql/essentials/tests/sql/suites/insert/keepmeta-nonstrict_fail.cfg b/yql/essentials/tests/sql/suites/insert/keepmeta_nonstrict_fail.cfg
index 1f376d1f93..1f376d1f93 100644
--- a/yql/essentials/tests/sql/suites/insert/keepmeta-nonstrict_fail.cfg
+++ b/yql/essentials/tests/sql/suites/insert/keepmeta_nonstrict_fail.cfg
diff --git a/yql/essentials/tests/sql/suites/insert/keepmeta_nonstrict_fail.sql b/yql/essentials/tests/sql/suites/insert/keepmeta_nonstrict_fail.sql
new file mode 100644
index 0000000000..4ca22363d6
--- /dev/null
+++ b/yql/essentials/tests/sql/suites/insert/keepmeta_nonstrict_fail.sql
@@ -0,0 +1,6 @@
+/* postgres can not */
+/* multirun can not */
+/* custom error:Table "Output" has non-strict schema, truncate with keep meta is not allowed*/
+insert into plato.Output with (truncate, keepmeta)
+select * from plato.Input;
+
diff --git a/yql/essentials/tests/sql/suites/insert/keepmeta-proto_fail.cfg b/yql/essentials/tests/sql/suites/insert/keepmeta_proto_fail.cfg
index 6d87958c65..6d87958c65 100644
--- a/yql/essentials/tests/sql/suites/insert/keepmeta-proto_fail.cfg
+++ b/yql/essentials/tests/sql/suites/insert/keepmeta_proto_fail.cfg
diff --git a/yql/essentials/tests/sql/suites/insert/keepmeta_proto_fail.sql b/yql/essentials/tests/sql/suites/insert/keepmeta_proto_fail.sql
new file mode 100644
index 0000000000..57967fed0f
--- /dev/null
+++ b/yql/essentials/tests/sql/suites/insert/keepmeta_proto_fail.sql
@@ -0,0 +1,6 @@
+/* postgres can not */
+/* multirun can not */
+/* custom error:Table "Output" has udf remappers, truncate with keep meta is not allowed*/
+insert into plato.Output with (truncate, keepmeta)
+select * from plato.Input;
+
diff --git a/yql/essentials/tests/sql/suites/insert/keepmeta-view_fail.cfg b/yql/essentials/tests/sql/suites/insert/keepmeta_view_fail.cfg
index db398a8d2f..db398a8d2f 100644
--- a/yql/essentials/tests/sql/suites/insert/keepmeta-view_fail.cfg
+++ b/yql/essentials/tests/sql/suites/insert/keepmeta_view_fail.cfg
diff --git a/yql/essentials/tests/sql/suites/insert/keepmeta_view_fail.sql b/yql/essentials/tests/sql/suites/insert/keepmeta_view_fail.sql
new file mode 100644
index 0000000000..e4cea9e1cd
--- /dev/null
+++ b/yql/essentials/tests/sql/suites/insert/keepmeta_view_fail.sql
@@ -0,0 +1,6 @@
+/* postgres can not */
+/* multirun can not */
+/* custom error:Modification of "Output" view is not supported*/
+insert into plato.Output with (truncate, keepmeta)
+select * from plato.Input;
+
diff --git a/yql/essentials/tests/sql/suites/insert/keepmeta-with_read_udf_fail.cfg b/yql/essentials/tests/sql/suites/insert/keepmeta_with_read_udf_fail.cfg
index 1d043c6420..1d043c6420 100644
--- a/yql/essentials/tests/sql/suites/insert/keepmeta-with_read_udf_fail.cfg
+++ b/yql/essentials/tests/sql/suites/insert/keepmeta_with_read_udf_fail.cfg
diff --git a/yql/essentials/tests/sql/suites/insert/keepmeta_with_read_udf_fail.sql b/yql/essentials/tests/sql/suites/insert/keepmeta_with_read_udf_fail.sql
new file mode 100644
index 0000000000..57967fed0f
--- /dev/null
+++ b/yql/essentials/tests/sql/suites/insert/keepmeta_with_read_udf_fail.sql
@@ -0,0 +1,6 @@
+/* postgres can not */
+/* multirun can not */
+/* custom error:Table "Output" has udf remappers, truncate with keep meta is not allowed*/
+insert into plato.Output with (truncate, keepmeta)
+select * from plato.Input;
+
diff --git a/yql/essentials/tests/sql/suites/insert/override-view_fail.cfg b/yql/essentials/tests/sql/suites/insert/override_view_fail.cfg
index db398a8d2f..db398a8d2f 100644
--- a/yql/essentials/tests/sql/suites/insert/override-view_fail.cfg
+++ b/yql/essentials/tests/sql/suites/insert/override_view_fail.cfg
diff --git a/yql/essentials/tests/sql/suites/insert/override_view_fail.sql b/yql/essentials/tests/sql/suites/insert/override_view_fail.sql
new file mode 100644
index 0000000000..9a2e8ed269
--- /dev/null
+++ b/yql/essentials/tests/sql/suites/insert/override_view_fail.sql
@@ -0,0 +1,5 @@
+/* postgres can not */
+/* custom error:Modification of "Output" view is not supported*/
+insert into plato.Output with truncate
+select * from plato.Input;
+
diff --git a/yql/essentials/tests/sql/suites/insert/use_anon_table_before_commit_fail.sql b/yql/essentials/tests/sql/suites/insert/use_anon_table_before_commit_fail.sql
index acf1795e35..befe8e1209 100644
--- a/yql/essentials/tests/sql/suites/insert/use_anon_table_before_commit_fail.sql
+++ b/yql/essentials/tests/sql/suites/insert/use_anon_table_before_commit_fail.sql
@@ -1,4 +1,5 @@
/* postgres can not */
+/* custom error:Anonymous table "@a" must be materialized. Use COMMIT before reading from it*/
use plato;
insert into @a
diff --git a/yql/essentials/tests/sql/suites/insert/use_anon_table_without_fill_fail.sql b/yql/essentials/tests/sql/suites/insert/use_anon_table_without_fill_fail.sql
index 5d78422272..fcb33546b6 100644
--- a/yql/essentials/tests/sql/suites/insert/use_anon_table_without_fill_fail.sql
+++ b/yql/essentials/tests/sql/suites/insert/use_anon_table_without_fill_fail.sql
@@ -1,4 +1,5 @@
/* postgres can not */
+/* custom error:Anonymous table "@a" must be materialized. Use COMMIT before reading from it*/
use plato;
select * from @a;
diff --git a/yql/essentials/tests/sql/suites/insert_monotonic/break_sort_fail.sql b/yql/essentials/tests/sql/suites/insert_monotonic/break_sort_fail.sql
index a44b306f32..9aeefc479d 100644
--- a/yql/essentials/tests/sql/suites/insert_monotonic/break_sort_fail.sql
+++ b/yql/essentials/tests/sql/suites/insert_monotonic/break_sort_fail.sql
@@ -1,3 +1,4 @@
+/* custom error:Inserts with "monotonic_keys" setting must not change output table sorting*/
use plato;
INSERT INTO Output WITH MONOTONIC_KEYS
diff --git a/yql/essentials/tests/sql/suites/insert_monotonic/break_unique_fail.cfg b/yql/essentials/tests/sql/suites/insert_monotonic/break_unique_fail.cfg
index a517989811..281562f784 100644
--- a/yql/essentials/tests/sql/suites/insert_monotonic/break_unique_fail.cfg
+++ b/yql/essentials/tests/sql/suites/insert_monotonic/break_unique_fail.cfg
@@ -1,3 +1,4 @@
xfail
in Input input4.txt
out Output sorted_unique.txt
+providers yt
diff --git a/yql/essentials/tests/sql/suites/insert_monotonic/break_unique_fail.sql b/yql/essentials/tests/sql/suites/insert_monotonic/break_unique_fail.sql
index 00865ab6c3..ea673eab1c 100644
--- a/yql/essentials/tests/sql/suites/insert_monotonic/break_unique_fail.sql
+++ b/yql/essentials/tests/sql/suites/insert_monotonic/break_unique_fail.sql
@@ -1,7 +1,7 @@
/* ytfile can not */
-/* dqfile can not */
+/* custom error:Duplicate key*/
USE plato;
INSERT INTO Output WITH MONOTONIC_KEYS
SELECT DISTINCT * FROM Input
-ORDER BY key, subkey; \ No newline at end of file
+ORDER BY key, subkey;
diff --git a/yql/essentials/tests/sql/suites/insert_monotonic/non_existing_fail.sql b/yql/essentials/tests/sql/suites/insert_monotonic/non_existing_fail.sql
index fe58dae84c..b60c6bb81f 100644
--- a/yql/essentials/tests/sql/suites/insert_monotonic/non_existing_fail.sql
+++ b/yql/essentials/tests/sql/suites/insert_monotonic/non_existing_fail.sql
@@ -1,5 +1,6 @@
+/* custom error:Insert with "monotonic_keys" setting cannot be used with a non-existent table*/
USE plato;
INSERT INTO Output WITH MONOTONIC_KEYS
SELECT 1 as key
-ORDER BY key; \ No newline at end of file
+ORDER BY key;
diff --git a/yql/essentials/tests/sql/suites/insert_monotonic/not_all_fail.sql b/yql/essentials/tests/sql/suites/insert_monotonic/not_all_fail.sql
index a209e180d7..b00b52d880 100644
--- a/yql/essentials/tests/sql/suites/insert_monotonic/not_all_fail.sql
+++ b/yql/essentials/tests/sql/suites/insert_monotonic/not_all_fail.sql
@@ -1,3 +1,4 @@
+/* custom error:All appends within the same commit should have the same "monotonic_keys" flag*/
USE plato;
INSERT INTO Output WITH MONOTONIC_KEYS
diff --git a/yql/essentials/tests/sql/suites/insert_monotonic/overlaping_fail.cfg b/yql/essentials/tests/sql/suites/insert_monotonic/overlaping_fail.cfg
index 1b0d1ea529..c8b120c0b3 100644
--- a/yql/essentials/tests/sql/suites/insert_monotonic/overlaping_fail.cfg
+++ b/yql/essentials/tests/sql/suites/insert_monotonic/overlaping_fail.cfg
@@ -1,3 +1,4 @@
xfail
in Input input3.txt
out Output sorted.txt
+providers yt
diff --git a/yql/essentials/tests/sql/suites/insert_monotonic/overlaping_fail.sql b/yql/essentials/tests/sql/suites/insert_monotonic/overlaping_fail.sql
index ec7888b052..4064ac0b9b 100644
--- a/yql/essentials/tests/sql/suites/insert_monotonic/overlaping_fail.sql
+++ b/yql/essentials/tests/sql/suites/insert_monotonic/overlaping_fail.sql
@@ -1,7 +1,7 @@
/* ytfile can not */
-/* dqfile can not */
+/* custom error:job outputs overlap with original table*/
USE plato;
INSERT INTO Output WITH MONOTONIC_KEYS
SELECT * FROM Input
-ORDER BY key, subkey; \ No newline at end of file
+ORDER BY key, subkey;
diff --git a/yql/essentials/tests/sql/suites/insert_monotonic/truncate_fail.sql b/yql/essentials/tests/sql/suites/insert_monotonic/truncate_fail.sql
index 374d347fbf..50f8700e82 100644
--- a/yql/essentials/tests/sql/suites/insert_monotonic/truncate_fail.sql
+++ b/yql/essentials/tests/sql/suites/insert_monotonic/truncate_fail.sql
@@ -1,3 +1,4 @@
+/* custom error:"monotonic_keys" setting can not be used with TRUNCATE mode*/
USE plato;
INSERT INTO Output WITH (MONOTONIC_KEYS, TRUNCATE)
diff --git a/yql/essentials/tests/sql/suites/join/join_table_conflict_fail-off.cfg b/yql/essentials/tests/sql/suites/join/join_table_conflict_fail-off.cfg
deleted file mode 100644
index 4408d29e54..0000000000
--- a/yql/essentials/tests/sql/suites/join/join_table_conflict_fail-off.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-xfail
-in Input input.txtproviders dq
-pragma Dq.HashJoinMode='off';
diff --git a/yql/essentials/tests/sql/suites/join/join_table_conflict_fail.sql b/yql/essentials/tests/sql/suites/join/join_table_conflict_fail.sql
index e499d334b0..45fb1781a5 100644
--- a/yql/essentials/tests/sql/suites/join/join_table_conflict_fail.sql
+++ b/yql/essentials/tests/sql/suites/join/join_table_conflict_fail.sql
@@ -1,5 +1,5 @@
+/* custom error:column name: value conflicted without correlation name it may be one of: Input.value, d.value*/
PRAGMA DisableSimpleColumns;
-/* postgres can not */
USE plato;
$data = (SELECT key as kk, subkey as sk, value || value as value FROM Input WHERE cast(key as uint32)/100 > 3);
diff --git a/yql/essentials/tests/sql/suites/join/strict_keys-off.cfg b/yql/essentials/tests/sql/suites/join/strict_keys-off.cfg
deleted file mode 100644
index e334c38f00..0000000000
--- a/yql/essentials/tests/sql/suites/join/strict_keys-off.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-xfail
-in Input1 sorted_by_kv1.txt
-in Input2 sorted_by_kv1_opt.txt
-providers dq
-pragma Dq.HashJoinMode='off';
diff --git a/yql/essentials/tests/sql/suites/join/strict_keys.sql b/yql/essentials/tests/sql/suites/join/strict_keys.sql
index e9382fa7fa..b9ca0641f8 100644
--- a/yql/essentials/tests/sql/suites/join/strict_keys.sql
+++ b/yql/essentials/tests/sql/suites/join/strict_keys.sql
@@ -1,5 +1,4 @@
-/* syntax version 1 */
-/* postgres can not */
+/* custom error:Strict key type match requested, but keys have different types*/
use plato;
define subquery $strict() as
diff --git a/yql/essentials/tests/sql/suites/json/json_exists/on_error_exception.sql b/yql/essentials/tests/sql/suites/json/json_exists/on_error_exception.sql
index 4670b0aa58..fbcaabcd77 100644
--- a/yql/essentials/tests/sql/suites/json/json_exists/on_error_exception.sql
+++ b/yql/essentials/tests/sql/suites/json/json_exists/on_error_exception.sql
@@ -1,7 +1,6 @@
-/* syntax version 1 */
-/* postgres can not */
+/* custom error:Member not found*/
-- Accessing absent object member will cause jsonpath error in strict mode
$json = CAST("{}" as Json);
SELECT
- JSON_EXISTS($json, "strict $.key" ERROR ON ERROR); \ No newline at end of file
+ JSON_EXISTS($json, "strict $.key" ERROR ON ERROR);
diff --git a/yql/essentials/tests/sql/suites/json/json_exists/passing_exception.sql b/yql/essentials/tests/sql/suites/json/json_exists/passing_exception.sql
index 540741eeba..84a75105a9 100644
--- a/yql/essentials/tests/sql/suites/json/json_exists/passing_exception.sql
+++ b/yql/essentials/tests/sql/suites/json/json_exists/passing_exception.sql
@@ -1,5 +1,4 @@
-/* syntax version 1 */
-/* postgres can not */
+/* custom error:Expected data or optional of data, but got: Tuple<Int32,Int32>*/
$json = CAST(@@{
"key": 123
@@ -11,4 +10,4 @@ SELECT
$json, "strict $var"
PASSING
AsTuple(1, 2) as var
- ); \ No newline at end of file
+ );
diff --git a/yql/essentials/tests/sql/suites/json/json_query/on_empty_exception.sql b/yql/essentials/tests/sql/suites/json/json_query/on_empty_exception.sql
index 4298669f03..e175a5753f 100644
--- a/yql/essentials/tests/sql/suites/json/json_query/on_empty_exception.sql
+++ b/yql/essentials/tests/sql/suites/json/json_query/on_empty_exception.sql
@@ -1,7 +1,6 @@
-/* syntax version 1 */
-/* postgres can not */
+/* custom error:Empty result*/
-- Accessing absent object member will cause empty result in lax mode
$json = CAST("{}" as Json);
SELECT
- JSON_QUERY($json, "lax $.key" ERROR ON EMPTY); \ No newline at end of file
+ JSON_QUERY($json, "lax $.key" ERROR ON EMPTY);
diff --git a/yql/essentials/tests/sql/suites/json/json_query/on_error_exception.sql b/yql/essentials/tests/sql/suites/json/json_query/on_error_exception.sql
index 6b1a7e0701..572988b9be 100644
--- a/yql/essentials/tests/sql/suites/json/json_query/on_error_exception.sql
+++ b/yql/essentials/tests/sql/suites/json/json_query/on_error_exception.sql
@@ -1,6 +1,4 @@
-/* syntax version 1 */
-/* postgres can not */
-
+/* custom error:Member not found*/
-- Accessing absent object member will cause jsonpath error in strict mode
$json = CAST("{}" as Json);
SELECT
diff --git a/yql/essentials/tests/sql/suites/json/json_query/passing_exception.sql b/yql/essentials/tests/sql/suites/json/json_query/passing_exception.sql
index 0be7f24fa1..151e6dbcd1 100644
--- a/yql/essentials/tests/sql/suites/json/json_query/passing_exception.sql
+++ b/yql/essentials/tests/sql/suites/json/json_query/passing_exception.sql
@@ -1,5 +1,6 @@
/* syntax version 1 */
/* postgres can not */
+/* custom error:Expected data or optional of data, but got: Tuple<Int32,Int32>*/
$json = CAST(@@{
"key": 123
@@ -12,4 +13,4 @@ SELECT
PASSING
AsTuple(1, 2) as var
WITH UNCONDITIONAL ARRAY WRAPPER
- ); \ No newline at end of file
+ );
diff --git a/yql/essentials/tests/sql/suites/json/json_value/on_empty_cast_default_exception.sql b/yql/essentials/tests/sql/suites/json/json_value/on_empty_cast_default_exception.sql
index c646cdb91f..8237aef338 100644
--- a/yql/essentials/tests/sql/suites/json/json_value/on_empty_cast_default_exception.sql
+++ b/yql/essentials/tests/sql/suites/json/json_value/on_empty_cast_default_exception.sql
@@ -1,5 +1,4 @@
-/* syntax version 1 */
-/* postgres can not */
+/* custom error:Failed to cast default value from ON EMPTY clause to target type Optional<Uint32>*/
$json = CAST("{}" as Json);
SELECT
diff --git a/yql/essentials/tests/sql/suites/json/json_value/on_empty_exception.sql b/yql/essentials/tests/sql/suites/json/json_value/on_empty_exception.sql
index 1ec55af7ca..d30d3161b0 100644
--- a/yql/essentials/tests/sql/suites/json/json_value/on_empty_exception.sql
+++ b/yql/essentials/tests/sql/suites/json/json_value/on_empty_exception.sql
@@ -1,5 +1,4 @@
-/* syntax version 1 */
-/* postgres can not */
+/* custom error:Result is empty*/
$json = CAST("{}" as Json);
SELECT
diff --git a/yql/essentials/tests/sql/suites/json/json_value/on_error_cast_default_exception.sql b/yql/essentials/tests/sql/suites/json/json_value/on_error_cast_default_exception.sql
index 51f4591ad7..a7169032d9 100644
--- a/yql/essentials/tests/sql/suites/json/json_value/on_error_cast_default_exception.sql
+++ b/yql/essentials/tests/sql/suites/json/json_value/on_error_cast_default_exception.sql
@@ -1,5 +1,4 @@
-/* syntax version 1 */
-/* postgres can not */
+/* custom error:Failed to cast default value from ON ERROR clause to target type Optional<Uint16>*/
-- Here JsonPath engine returns error result and ON ERROR section must be used.
-- But default value in ON ERROR section is -123 and casting it to Uint16 will fail.
diff --git a/yql/essentials/tests/sql/suites/json/json_value/on_error_cast_udf_exception.sql b/yql/essentials/tests/sql/suites/json/json_value/on_error_cast_udf_exception.sql
index 722a06256c..a3fb807857 100644
--- a/yql/essentials/tests/sql/suites/json/json_value/on_error_cast_udf_exception.sql
+++ b/yql/essentials/tests/sql/suites/json/json_value/on_error_cast_udf_exception.sql
@@ -1,5 +1,4 @@
-/* syntax version 1 */
-/* postgres can not */
+/* custom error:Cannot convert extracted JSON value to target type*/
-- In this case call to Json2::SqlValueNumber will fail because "string"
-- does not represent Number value
diff --git a/yql/essentials/tests/sql/suites/json/json_value/on_error_cast_value_exception.sql b/yql/essentials/tests/sql/suites/json/json_value/on_error_cast_value_exception.sql
index 5b97c45e49..a671f89fca 100644
--- a/yql/essentials/tests/sql/suites/json/json_value/on_error_cast_value_exception.sql
+++ b/yql/essentials/tests/sql/suites/json/json_value/on_error_cast_value_exception.sql
@@ -1,5 +1,4 @@
-/* syntax version 1 */
-/* postgres can not */
+/* custom error:Failed to cast extracted JSON value to target type Optional<Uint16>*/
-- In this case call to Json2::SqlValueNumber will be successfull, but cast
-- of -123 to Uint16 will fail
diff --git a/yql/essentials/tests/sql/suites/json/json_value/on_error_jsonpath_exception.sql b/yql/essentials/tests/sql/suites/json/json_value/on_error_jsonpath_exception.sql
index 8314007547..ee4467e138 100644
--- a/yql/essentials/tests/sql/suites/json/json_value/on_error_jsonpath_exception.sql
+++ b/yql/essentials/tests/sql/suites/json/json_value/on_error_jsonpath_exception.sql
@@ -1,5 +1,4 @@
-/* syntax version 1 */
-/* postgres can not */
+/* custom error:Member not found*/
$json = CAST("{}" as Json);
SELECT
diff --git a/yql/essentials/tests/sql/suites/json/json_value/passing_exception.sql b/yql/essentials/tests/sql/suites/json/json_value/passing_exception.sql
index 7e94a73ccc..2c6dfcf9b9 100644
--- a/yql/essentials/tests/sql/suites/json/json_value/passing_exception.sql
+++ b/yql/essentials/tests/sql/suites/json/json_value/passing_exception.sql
@@ -1,5 +1,6 @@
/* syntax version 1 */
/* postgres can not */
+/* custom error:Expected data or optional of data, but got: Tuple<Int32,Int32>*/
$json = CAST(@@{
"key": 123
@@ -11,4 +12,4 @@ SELECT
$json, "strict $var"
PASSING
AsTuple(1, 2) as var
- ); \ No newline at end of file
+ );
diff --git a/yql/essentials/tests/sql/suites/lambda/lambda_with_tie_bad_count_fail.sql b/yql/essentials/tests/sql/suites/lambda/lambda_with_tie_bad_count_fail.sql
index 5172adb751..ce5e52aafa 100644
--- a/yql/essentials/tests/sql/suites/lambda/lambda_with_tie_bad_count_fail.sql
+++ b/yql/essentials/tests/sql/suites/lambda/lambda_with_tie_bad_count_fail.sql
@@ -1,4 +1,4 @@
-/* postgres can not */
+/* custom error:Expected tuple type of size: 2, but got: 3*/
USE plato;
$func = ($x, $y)->{
diff --git a/yql/essentials/tests/sql/suites/lineage/error_type.sql b/yql/essentials/tests/sql/suites/lineage/error_type.sql
index 21f12d6d0d..94fea56f9d 100644
--- a/yql/essentials/tests/sql/suites/lineage/error_type.sql
+++ b/yql/essentials/tests/sql/suites/lineage/error_type.sql
@@ -1,3 +1,4 @@
+/* custom error:Uncompatible member foo types: Int32 and String*/
USE plato;
INSERT INTO Output
diff --git a/yql/essentials/tests/sql/suites/match_recognize/test_type_predicate.sql b/yql/essentials/tests/sql/suites/match_recognize/test_type_predicate.sql
index b19e7c6671..68726319ce 100644
--- a/yql/essentials/tests/sql/suites/match_recognize/test_type_predicate.sql
+++ b/yql/essentials/tests/sql/suites/match_recognize/test_type_predicate.sql
@@ -1,3 +1,4 @@
+/* custom error:DEFINE expression must be a predicate*/
pragma FeatureR010="prototype";
pragma config.flags("MatchRecognizeStream", "disable");
diff --git a/yql/essentials/tests/sql/suites/optimizers/sort_by_nonstrict_const.sql b/yql/essentials/tests/sql/suites/optimizers/sort_by_nonstrict_const.sql
index 47abbabbd6..cd682fe33f 100644
--- a/yql/essentials/tests/sql/suites/optimizers/sort_by_nonstrict_const.sql
+++ b/yql/essentials/tests/sql/suites/optimizers/sort_by_nonstrict_const.sql
@@ -1,4 +1,5 @@
/* yt can not */
+/* custom error:Member not found: date*/
use plato;
select * from Input order by date, double;
diff --git a/yql/essentials/tests/sql/suites/params/missing_param_fail.sql b/yql/essentials/tests/sql/suites/params/missing_param_fail.sql
index 65aa3ded37..49614fb221 100644
--- a/yql/essentials/tests/sql/suites/params/missing_param_fail.sql
+++ b/yql/essentials/tests/sql/suites/params/missing_param_fail.sql
@@ -1,3 +1,4 @@
+/* custom error:Missing value for parameter: $y*/
declare $x as int;
declare $y as int;
select $x + $y;
diff --git a/yql/essentials/tests/sql/suites/params/no_params_fail.sql b/yql/essentials/tests/sql/suites/params/no_params_fail.sql
index 9144f91e92..4acbca7409 100644
--- a/yql/essentials/tests/sql/suites/params/no_params_fail.sql
+++ b/yql/essentials/tests/sql/suites/params/no_params_fail.sql
@@ -1,2 +1,3 @@
+/* custom error:Missing value for parameter: $x*/
declare $x as int;
-select 2 * $x; \ No newline at end of file
+select 2 * $x;
diff --git a/yql/essentials/tests/sql/suites/params/param_type_mismatch_fail.sql b/yql/essentials/tests/sql/suites/params/param_type_mismatch_fail.sql
index ea6e631d35..e3fd5e0927 100644
--- a/yql/essentials/tests/sql/suites/params/param_type_mismatch_fail.sql
+++ b/yql/essentials/tests/sql/suites/params/param_type_mismatch_fail.sql
@@ -1,2 +1,3 @@
+/* custom error:Unexpected symbol "-" at pos 0 in string "-21"*/
declare $x as UInt32;
-select 2 * $x; \ No newline at end of file
+select 2 * $x;
diff --git a/yql/essentials/tests/sql/suites/pg/join_using_table_used_order2.sql b/yql/essentials/tests/sql/suites/pg/join_using_table_used_order2.sql
index b5d0bdd25c..1a99d4d1fc 100644
--- a/yql/essentials/tests/sql/suites/pg/join_using_table_used_order2.sql
+++ b/yql/essentials/tests/sql/suites/pg/join_using_table_used_order2.sql
@@ -1,10 +1,11 @@
--!syntax_pg
-select * from
- ((select 1 as foo, 1 as bar, 1 as zoo) aa
+/* custom error:common column name "zoo" appears more than once in left table*/
+select * from
+ ((select 1 as foo, 1 as bar, 1 as zoo) aa
join
(select 1 as foo, 1 as bar, 1 as zoo) bb
using (foo)
join
(select 1 as bar, 1 as zoo) cc
using (zoo)
- ) \ No newline at end of file
+ )
diff --git a/yql/essentials/tests/sql/suites/pg_duplicated/ambigous_order_by_from_join.sql b/yql/essentials/tests/sql/suites/pg_duplicated/ambigous_order_by_from_join.sql
index 50a8ce4e63..587d729855 100644
--- a/yql/essentials/tests/sql/suites/pg_duplicated/ambigous_order_by_from_join.sql
+++ b/yql/essentials/tests/sql/suites/pg_duplicated/ambigous_order_by_from_join.sql
@@ -1,8 +1,9 @@
--!syntax_pg
-select a.x + 1 as y, b.x + 1 as z from
+/* custom error:Column reference is ambiguous: x*/
+select a.x + 1 as y, b.x + 1 as z from
((select 1 x) a
join
(select 1 x) b
on a.x = b.x)
order by x+1
--- column reference "x" is ambiguous \ No newline at end of file
+-- column reference "x" is ambiguous
diff --git a/yql/essentials/tests/sql/suites/pg_duplicated/ambigous_order_by_from_table.sql b/yql/essentials/tests/sql/suites/pg_duplicated/ambigous_order_by_from_table.sql
index 08260c4911..a5f79a68b3 100644
--- a/yql/essentials/tests/sql/suites/pg_duplicated/ambigous_order_by_from_table.sql
+++ b/yql/essentials/tests/sql/suites/pg_duplicated/ambigous_order_by_from_table.sql
@@ -1,5 +1,6 @@
--!syntax_pg
-select a.* from
+/* custom error:Column reference is ambiguous: x*/
+select a.* from
(select 1 x, 2 x) a
order by x
-- ORDER BY "x" is ambiguous
diff --git a/yql/essentials/tests/sql/suites/pg_duplicated/ambigous_order_by_item_expression_from_projection.sql b/yql/essentials/tests/sql/suites/pg_duplicated/ambigous_order_by_item_expression_from_projection.sql
index 7efb496218..cda9243446 100644
--- a/yql/essentials/tests/sql/suites/pg_duplicated/ambigous_order_by_item_expression_from_projection.sql
+++ b/yql/essentials/tests/sql/suites/pg_duplicated/ambigous_order_by_item_expression_from_projection.sql
@@ -1,4 +1,5 @@
--!syntax_pg
-select x + 1 as y, x - 1 as y from
+/* custom error: ORDER BY column reference 'y' is ambigous*/
+select x + 1 as y, x - 1 as y from
(select 1 x) a
-order by y+1 \ No newline at end of file
+order by y+1
diff --git a/yql/essentials/tests/sql/suites/pg_duplicated/ambigous_order_by_with_duplicates.sql b/yql/essentials/tests/sql/suites/pg_duplicated/ambigous_order_by_with_duplicates.sql
index 9ceb4a1e41..bd8fb0c34b 100644
--- a/yql/essentials/tests/sql/suites/pg_duplicated/ambigous_order_by_with_duplicates.sql
+++ b/yql/essentials/tests/sql/suites/pg_duplicated/ambigous_order_by_with_duplicates.sql
@@ -1,5 +1,6 @@
--!syntax_pg
-select x + 1 as y, x - 1 as y from
+/* custom error:ORDER BY column reference 'y' is ambigous*/
+select x + 1 as y, x - 1 as y from
(select 1 x) a
order by y
--- order by y is ambigous \ No newline at end of file
+-- order by y is ambigous
diff --git a/yql/essentials/tests/sql/suites/pg_duplicated/ambigous_order_by_wo_duplicated_in_projection.sql b/yql/essentials/tests/sql/suites/pg_duplicated/ambigous_order_by_wo_duplicated_in_projection.sql
index f27341fb2b..6e83754925 100644
--- a/yql/essentials/tests/sql/suites/pg_duplicated/ambigous_order_by_wo_duplicated_in_projection.sql
+++ b/yql/essentials/tests/sql/suites/pg_duplicated/ambigous_order_by_wo_duplicated_in_projection.sql
@@ -1,5 +1,6 @@
--!syntax_pg
-select z from
+/* custom error:Column reference is ambiguous: x*/
+select z from
(select 1 x, 1 x, 3 z) a
order by x
--- column reference "x" is ambiguous \ No newline at end of file
+-- column reference "x" is ambiguous
diff --git a/yql/essentials/tests/sql/suites/pg_duplicated/ambigous_ref.sql b/yql/essentials/tests/sql/suites/pg_duplicated/ambigous_ref.sql
index 22098666df..ea0738592d 100644
--- a/yql/essentials/tests/sql/suites/pg_duplicated/ambigous_ref.sql
+++ b/yql/essentials/tests/sql/suites/pg_duplicated/ambigous_ref.sql
@@ -1,2 +1,3 @@
--!syntax_pg
-select a.x from (select 1 x, 2 x) a \ No newline at end of file
+/* custom error:Column reference is ambiguous: x*/
+select a.x from (select 1 x, 2 x) a
diff --git a/yql/essentials/tests/sql/suites/pragma/yson_strict_fail.sql b/yql/essentials/tests/sql/suites/pragma/yson_strict_fail.sql
index 1db347862d..df71232b39 100644
--- a/yql/essentials/tests/sql/suites/pragma/yson_strict_fail.sql
+++ b/yql/essentials/tests/sql/suites/pragma/yson_strict_fail.sql
@@ -1,4 +1,5 @@
/* postgres can not */
+/* custom error:Cannot parse string value from integer*/
PRAGMA yson.Strict;
SELECT Yson::ConvertToString(Yson("122"));
diff --git a/yql/essentials/tests/sql/suites/produce/process_multi_in.cfg b/yql/essentials/tests/sql/suites/produce/process_multi_in.cfg
index 19cfc046c5..5b95850078 100644
--- a/yql/essentials/tests/sql/suites/produce/process_multi_in.cfg
+++ b/yql/essentials/tests/sql/suites/produce/process_multi_in.cfg
@@ -1,3 +1,4 @@
in Input input0.txt
res result.txt
udf python3_udf
+providers yt
diff --git a/yql/essentials/tests/sql/suites/produce/process_multi_out_bad_count_fail.sql b/yql/essentials/tests/sql/suites/produce/process_multi_out_bad_count_fail.sql
index fdd02d93e3..6ad283fafc 100644
--- a/yql/essentials/tests/sql/suites/produce/process_multi_out_bad_count_fail.sql
+++ b/yql/essentials/tests/sql/suites/produce/process_multi_out_bad_count_fail.sql
@@ -1,5 +1,4 @@
-/* syntax version 1 */
-/* postgres can not */
+/* custom error:Expected tuple type of size: 3, but got: 2*/
$udfScript = @@
def MyFunc(list):
return [(int(x.key) % 2, x) for x in list]
diff --git a/yql/essentials/tests/sql/suites/produce/reduce_with_flat_python_stream.cfg b/yql/essentials/tests/sql/suites/produce/reduce_with_flat_python_stream.cfg
new file mode 100644
index 0000000000..e34e70ff55
--- /dev/null
+++ b/yql/essentials/tests/sql/suites/produce/reduce_with_flat_python_stream.cfg
@@ -0,0 +1,3 @@
+in Input0 input0.txt
+udf python3_udf
+providers yt
diff --git a/yql/essentials/tests/sql/suites/schema/read_schema_change_other.sql b/yql/essentials/tests/sql/suites/schema/read_schema_change_other.sql
index 7be00eab9c..eb96315c2a 100644
--- a/yql/essentials/tests/sql/suites/schema/read_schema_change_other.sql
+++ b/yql/essentials/tests/sql/suites/schema/read_schema_change_other.sql
@@ -1 +1,2 @@
+/* custom error:It is forbidden to specify the column '_other'*/
select * from plato.Input with schema Struct<_other:Yson>;
diff --git a/yql/essentials/tests/sql/suites/schema/select_all_inferschema_range-empty_fail.cfg b/yql/essentials/tests/sql/suites/schema/select_all_inferschema_range_empty_fail.cfg
index c2ff0dfe88..c2ff0dfe88 100644
--- a/yql/essentials/tests/sql/suites/schema/select_all_inferschema_range-empty_fail.cfg
+++ b/yql/essentials/tests/sql/suites/schema/select_all_inferschema_range_empty_fail.cfg
diff --git a/yql/essentials/tests/sql/suites/schema/select_all_inferschema_range_empty_fail.sql b/yql/essentials/tests/sql/suites/schema/select_all_inferschema_range_empty_fail.sql
new file mode 100644
index 0000000000..60e0887a84
--- /dev/null
+++ b/yql/essentials/tests/sql/suites/schema/select_all_inferschema_range_empty_fail.sql
@@ -0,0 +1,3 @@
+/* custom error:Cannot infer schema for table Input2, first 1 row(s) has no columns*/
+pragma yt.InferSchemaTableCountThreshold="0";
+select * from plato.range(``, Input1, Input3) with inferscheme;
diff --git a/yql/essentials/tests/sql/suites/schema/user_schema_append.sql b/yql/essentials/tests/sql/suites/schema/user_schema_append.sql
index 5ec9e939bd..f1b86675c3 100644
--- a/yql/essentials/tests/sql/suites/schema/user_schema_append.sql
+++ b/yql/essentials/tests/sql/suites/schema/user_schema_append.sql
@@ -1,4 +1,4 @@
-/* syntax version 1 */
+/* custom error:Table "Input" row type differs from the written row type: Struct<-subkey:String>*/
USE plato;
INSERT INTO Input
diff --git a/yql/essentials/tests/sql/suites/select/anon_clash.sql b/yql/essentials/tests/sql/suites/select/anon_clash.sql
index 7fa8927b9b..b4b62d51cf 100644
--- a/yql/essentials/tests/sql/suites/select/anon_clash.sql
+++ b/yql/essentials/tests/sql/suites/select/anon_clash.sql
@@ -1,3 +1,4 @@
+/* custom error: Table "a" does not exist */
use plato;
insert into @a select 1 as t;
diff --git a/yql/essentials/tests/sql/suites/simple_columns/simple_columns_base_fail.sql b/yql/essentials/tests/sql/suites/simple_columns/simple_columns_base_fail.sql
index 6930913766..85cca8dbec 100644
--- a/yql/essentials/tests/sql/suites/simple_columns/simple_columns_base_fail.sql
+++ b/yql/essentials/tests/sql/suites/simple_columns/simple_columns_base_fail.sql
@@ -1,4 +1,4 @@
-/* postgres can not */
+/* custom error:Duplicated member: magic*/
PRAGMA SimpleColumns;
USE plato;
@@ -6,7 +6,7 @@ USE plato;
$req = (SELECT 100500 as magic, t.* FROM Input as t);
--INSERT INTO Output
-SELECT
+SELECT
ff.*,
subkey as magic, -- 'magic' is exist from ff.magic
value as val
diff --git a/yql/essentials/tests/sql/suites/simple_columns/simple_columns_join_fail.sql b/yql/essentials/tests/sql/suites/simple_columns/simple_columns_join_fail.sql
index 7728a22ba1..0605937349 100644
--- a/yql/essentials/tests/sql/suites/simple_columns/simple_columns_join_fail.sql
+++ b/yql/essentials/tests/sql/suites/simple_columns/simple_columns_join_fail.sql
@@ -1,4 +1,4 @@
-/* postgres can not */
+/* custom error:Duplicated member: kk*/
PRAGMA SimpleColumns;
USE plato;
diff --git a/yql/essentials/tests/sql/suites/solomon/BadDownsamplingAggregation.cfg b/yql/essentials/tests/sql/suites/solomon/BadDownsamplingAggregation.cfg
deleted file mode 100644
index 58b70eefbe..0000000000
--- a/yql/essentials/tests/sql/suites/solomon/BadDownsamplingAggregation.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-providers solomon
-xfail
diff --git a/yql/essentials/tests/sql/suites/solomon/BadDownsamplingAggregation.sql b/yql/essentials/tests/sql/suites/solomon/BadDownsamplingAggregation.sql
deleted file mode 100644
index dda21f9ce6..0000000000
--- a/yql/essentials/tests/sql/suites/solomon/BadDownsamplingAggregation.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-SELECT * FROM local_solomon.my_project WITH (
- program = @@{}@@,
- from = "2023-12-08T14:40:39Z",
- to = "2023-12-08T14:45:39Z",
- `downsampling.aggregation` = "ABC"
-);
diff --git a/yql/essentials/tests/sql/suites/solomon/BadDownsamplingDisabled.cfg b/yql/essentials/tests/sql/suites/solomon/BadDownsamplingDisabled.cfg
deleted file mode 100644
index 58b70eefbe..0000000000
--- a/yql/essentials/tests/sql/suites/solomon/BadDownsamplingDisabled.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-providers solomon
-xfail
diff --git a/yql/essentials/tests/sql/suites/solomon/BadDownsamplingDisabled.sql b/yql/essentials/tests/sql/suites/solomon/BadDownsamplingDisabled.sql
deleted file mode 100644
index 61ca6e90b5..0000000000
--- a/yql/essentials/tests/sql/suites/solomon/BadDownsamplingDisabled.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-SELECT * FROM local_solomon.my_project WITH (
- program = @@{}@@,
- from = "2023-12-08T14:40:39Z",
- to = "2023-12-08T14:45:39Z",
- `downsampling.disabled` = "ABC"
-);
diff --git a/yql/essentials/tests/sql/suites/solomon/BadDownsamplingFill.cfg b/yql/essentials/tests/sql/suites/solomon/BadDownsamplingFill.cfg
deleted file mode 100644
index 58b70eefbe..0000000000
--- a/yql/essentials/tests/sql/suites/solomon/BadDownsamplingFill.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-providers solomon
-xfail
diff --git a/yql/essentials/tests/sql/suites/solomon/BadDownsamplingFill.sql b/yql/essentials/tests/sql/suites/solomon/BadDownsamplingFill.sql
deleted file mode 100644
index cf7dac7f35..0000000000
--- a/yql/essentials/tests/sql/suites/solomon/BadDownsamplingFill.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-SELECT * FROM local_solomon.my_project WITH (
- program = @@{}@@,
- from = "2023-12-08T14:40:39Z",
- to = "2023-12-08T14:45:39Z",
- `downsampling.fill` = "ABC"
-);
diff --git a/yql/essentials/tests/sql/suites/solomon/BadDownsamplingInterval.cfg b/yql/essentials/tests/sql/suites/solomon/BadDownsamplingInterval.cfg
deleted file mode 100644
index 58b70eefbe..0000000000
--- a/yql/essentials/tests/sql/suites/solomon/BadDownsamplingInterval.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-providers solomon
-xfail
diff --git a/yql/essentials/tests/sql/suites/solomon/BadDownsamplingInterval.sql b/yql/essentials/tests/sql/suites/solomon/BadDownsamplingInterval.sql
deleted file mode 100644
index e5f24c16e9..0000000000
--- a/yql/essentials/tests/sql/suites/solomon/BadDownsamplingInterval.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-SELECT * FROM local_solomon.my_project WITH (
- program = @@{}@@,
- from = "2023-12-08T14:40:39Z",
- to = "2023-12-08T14:45:39Z",
- `downsampling.grid_interval` = "ABC"
-);
diff --git a/yql/essentials/tests/sql/suites/solomon/Basic.sql b/yql/essentials/tests/sql/suites/solomon/Basic.sql
deleted file mode 100644
index d59089121f..0000000000
--- a/yql/essentials/tests/sql/suites/solomon/Basic.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-SELECT * FROM local_solomon.my_project WITH (
- program = @@{}@@,
- from = "2023-12-08T14:40:39Z",
- to = "2023-12-08T14:45:39Z"
-);
diff --git a/yql/essentials/tests/sql/suites/solomon/BrokenJsonResponse.cfg b/yql/essentials/tests/sql/suites/solomon/BrokenJsonResponse.cfg
deleted file mode 100644
index 58b70eefbe..0000000000
--- a/yql/essentials/tests/sql/suites/solomon/BrokenJsonResponse.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-providers solomon
-xfail
diff --git a/yql/essentials/tests/sql/suites/solomon/BrokenJsonResponse.sql b/yql/essentials/tests/sql/suites/solomon/BrokenJsonResponse.sql
deleted file mode 100644
index c7fd10d9e3..0000000000
--- a/yql/essentials/tests/sql/suites/solomon/BrokenJsonResponse.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-SELECT * FROM local_solomon.broken_json WITH (
- program = @@{}@@,
- from = "2023-12-08T14:40:39Z",
- to = "2023-12-08T14:45:39Z"
-);
diff --git a/yql/essentials/tests/sql/suites/solomon/Downsampling.sql b/yql/essentials/tests/sql/suites/solomon/Downsampling.sql
deleted file mode 100644
index 976cbc696a..0000000000
--- a/yql/essentials/tests/sql/suites/solomon/Downsampling.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-SELECT * FROM local_solomon.my_project WITH (
- program = @@{}@@,
- from = "2023-12-08T14:40:39Z",
- to = "2023-12-08T14:45:39Z",
- `downsampling.disabled` = "true",
- `downsampling.aggregation` = "SUM",
- `downsampling.grid_interval` = "25",
- `downsampling.fill` = "PREVIOUS"
-);
diff --git a/yql/essentials/tests/sql/suites/solomon/DownsamplingValidSettings.sql b/yql/essentials/tests/sql/suites/solomon/DownsamplingValidSettings.sql
deleted file mode 100644
index c1f59e9de9..0000000000
--- a/yql/essentials/tests/sql/suites/solomon/DownsamplingValidSettings.sql
+++ /dev/null
@@ -1,17 +0,0 @@
-SELECT * FROM local_solomon.my_project WITH (
- program = @@{}@@,
- from = "2023-12-08T14:40:39Z",
- to = "2023-12-08T14:45:39Z",
-
- `downsampling.aggregation` = "AVG",
- `downsampling.aggregation` = "COUNT",
- `downsampling.aggregation` = "DEFAULT_AGGREGATION",
- `downsampling.aggregation` = "LAST",
- `downsampling.aggregation` = "MAX",
- `downsampling.aggregation` = "MIN",
- `downsampling.aggregation` = "SUM",
-
- `downsampling.fill` = "NONE",
- `downsampling.fill` = "NULL",
- `downsampling.fill` = "PREVIOUS"
-);
diff --git a/yql/essentials/tests/sql/suites/solomon/InvalidProject.cfg b/yql/essentials/tests/sql/suites/solomon/InvalidProject.cfg
deleted file mode 100644
index 58b70eefbe..0000000000
--- a/yql/essentials/tests/sql/suites/solomon/InvalidProject.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-providers solomon
-xfail
diff --git a/yql/essentials/tests/sql/suites/solomon/InvalidProject.sql b/yql/essentials/tests/sql/suites/solomon/InvalidProject.sql
deleted file mode 100644
index a9275c07d1..0000000000
--- a/yql/essentials/tests/sql/suites/solomon/InvalidProject.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-SELECT * FROM local_solomon.invalid WITH (
- program = @@{}@@,
- from = "2023-12-08T14:40:39Z",
- to = "2023-12-08T14:45:39Z"
-);
diff --git a/yql/essentials/tests/sql/suites/solomon/LabelColumns.sql b/yql/essentials/tests/sql/suites/solomon/LabelColumns.sql
deleted file mode 100644
index 0ff5b736c4..0000000000
--- a/yql/essentials/tests/sql/suites/solomon/LabelColumns.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-SELECT * FROM local_solomon.my_project WITH (
- program = @@{}@@,
- from = "2023-12-08T14:40:39Z",
- to = "2023-12-08T14:45:39Z",
- labels = "downsampling.disabled, downsampling.fill, project, downsampling.gridMillis"
-);
diff --git a/yql/essentials/tests/sql/suites/solomon/Subquery.sql b/yql/essentials/tests/sql/suites/solomon/Subquery.sql
deleted file mode 100644
index d3886b00ff..0000000000
--- a/yql/essentials/tests/sql/suites/solomon/Subquery.sql
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINE SUBQUERY $q($p) AS
-
-SELECT * FROM local_solomon.my_project WITH (
- program = $p,
- from = "2023-12-08T14:40:39Z",
- to = "2023-12-08T14:45:39Z",
- `downsampling.disabled` = "true",
- `downsampling.aggregation` = "SUM",
- `downsampling.grid_interval` = "25",
- `downsampling.fill` = "PREVIOUS"
-);
-
-END DEFINE;
-
-SELECT * FROM $q(@@{}@@);
diff --git a/yql/essentials/tests/sql/suites/solomon/UnknownSetting.cfg b/yql/essentials/tests/sql/suites/solomon/UnknownSetting.cfg
deleted file mode 100644
index 58b70eefbe..0000000000
--- a/yql/essentials/tests/sql/suites/solomon/UnknownSetting.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-providers solomon
-xfail
diff --git a/yql/essentials/tests/sql/suites/solomon/UnknownSetting.sql b/yql/essentials/tests/sql/suites/solomon/UnknownSetting.sql
deleted file mode 100644
index 0e51464d23..0000000000
--- a/yql/essentials/tests/sql/suites/solomon/UnknownSetting.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-SELECT * FROM local_solomon.my_project WITH (
- program = @@{}@@,
- from = "2023-12-08T14:40:39Z",
- to = "2023-12-08T14:45:39Z",
- unk = "ABC"
-);
diff --git a/yql/essentials/tests/sql/suites/solomon/default.cfg b/yql/essentials/tests/sql/suites/solomon/default.cfg
deleted file mode 100644
index 3e2499f96d..0000000000
--- a/yql/essentials/tests/sql/suites/solomon/default.cfg
+++ /dev/null
@@ -1 +0,0 @@
-providers solomon
diff --git a/yql/essentials/tests/sql/suites/table_range/each_with_non_existing-all_fail.cfg b/yql/essentials/tests/sql/suites/table_range/each_with_non_existing_all_fail.cfg
index 62226ec6e8..62226ec6e8 100644
--- a/yql/essentials/tests/sql/suites/table_range/each_with_non_existing-all_fail.cfg
+++ b/yql/essentials/tests/sql/suites/table_range/each_with_non_existing_all_fail.cfg
diff --git a/yql/essentials/tests/sql/suites/table_range/each_with_non_existing_all_fail.sql b/yql/essentials/tests/sql/suites/table_range/each_with_non_existing_all_fail.sql
new file mode 100644
index 0000000000..fd8caf1393
--- /dev/null
+++ b/yql/essentials/tests/sql/suites/table_range/each_with_non_existing_all_fail.sql
@@ -0,0 +1,5 @@
+/* syntax version 1 */
+/* kikimr can not - range not supported */
+/* custom error:The list of tables is empty*/
+USE plato;
+SELECT * FROM each(["Input1", "Input2", "Input3"]);
diff --git a/yql/essentials/tests/sql/suites/udf/named_args_for_script_with_posargs_reuse_args_fail.sql b/yql/essentials/tests/sql/suites/udf/named_args_for_script_with_posargs_reuse_args_fail.sql
index 21f66fa806..7efb78e427 100644
--- a/yql/essentials/tests/sql/suites/udf/named_args_for_script_with_posargs_reuse_args_fail.sql
+++ b/yql/essentials/tests/sql/suites/udf/named_args_for_script_with_posargs_reuse_args_fail.sql
@@ -1,5 +1,4 @@
-/* postgres can not */
-/* syntax version 1 */
+/* 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):
diff --git a/yql/essentials/tests/sql/suites/udf/python_struct.cfg b/yql/essentials/tests/sql/suites/udf/python_struct.cfg
index d86459a8db..3c11f9c54b 100644
--- a/yql/essentials/tests/sql/suites/udf/python_struct.cfg
+++ b/yql/essentials/tests/sql/suites/udf/python_struct.cfg
@@ -1,3 +1,3 @@
in Input input.txt
-udf python2_udf
+udf python3_udf
providers yt
diff --git a/yql/essentials/tests/sql/suites/udf/python_struct.sql b/yql/essentials/tests/sql/suites/udf/python_struct.sql
index ed7fc8eeb3..82e43427d2 100644
--- a/yql/essentials/tests/sql/suites/udf/python_struct.sql
+++ b/yql/essentials/tests/sql/suites/udf/python_struct.sql
@@ -15,7 +15,7 @@ def NewPerson(name, age):
(let str (DataType 'String))
(let personType (StructType '('name str) '('age ui32)))
(let udfType (CallableType '() '(personType) '(str) '(ui32)))
- (let udf (ScriptUdf 'Python 'NewPerson udfType $udfScript))
+ (let udf (ScriptUdf 'Python3 'NewPerson udfType $udfScript))
(return udf)
))@@;
diff --git a/yql/essentials/tests/sql/suites/udf/wrong_args_fail.sql b/yql/essentials/tests/sql/suites/udf/wrong_args_fail.sql
index 759bfd3816..eed17d5589 100644
--- a/yql/essentials/tests/sql/suites/udf/wrong_args_fail.sql
+++ b/yql/essentials/tests/sql/suites/udf/wrong_args_fail.sql
@@ -1,4 +1,5 @@
/* postgres can not */
+/* custom error:Callable expected at most 3 argument(s)*/
-- Find has optional args
select String::ReplaceAll(); -- too few
diff --git a/yql/essentials/tests/sql/suites/view/file_eval.sql b/yql/essentials/tests/sql/suites/view/file_eval.sql
index 890ebdece4..6e64be4356 100644
--- a/yql/essentials/tests/sql/suites/view/file_eval.sql
+++ b/yql/essentials/tests/sql/suites/view/file_eval.sql
@@ -1,5 +1,6 @@
/* postgres can not */
/* syntax version 1 */
+/* custom error:FileContent function can't be used inside generated code in views*/
pragma yt.ViewIsolation = 'true';
USE plato;
SELECT k, s, v FROM Input VIEW file_eval;
diff --git a/yql/essentials/tests/sql/suites/view/file_outer.sql b/yql/essentials/tests/sql/suites/view/file_outer.sql
index bc1b0a4070..952a4d8d92 100644
--- a/yql/essentials/tests/sql/suites/view/file_outer.sql
+++ b/yql/essentials/tests/sql/suites/view/file_outer.sql
@@ -1,5 +1,4 @@
-/* postgres can not */
-/* syntax version 1 */
+/* custom error:File not found*/
pragma yt.ViewIsolation = 'true';
USE plato;
SELECT k, s, v FROM Input VIEW file_outer;
diff --git a/yql/essentials/tests/sql/suites/view/file_outer_library.sql b/yql/essentials/tests/sql/suites/view/file_outer_library.sql
index b7e7ee2ad4..e994026f4b 100644
--- a/yql/essentials/tests/sql/suites/view/file_outer_library.sql
+++ b/yql/essentials/tests/sql/suites/view/file_outer_library.sql
@@ -1,5 +1,6 @@
/* postgres can not */
/* syntax version 1 */
+/* custom error: does not exist*/
pragma yt.ViewIsolation = 'true';
USE plato;
PRAGMA library('mylib.sql');
diff --git a/yql/essentials/tests/sql/suites/view/secure.sql b/yql/essentials/tests/sql/suites/view/secure.sql
index be73998ca2..15ef309d96 100644
--- a/yql/essentials/tests/sql/suites/view/secure.sql
+++ b/yql/essentials/tests/sql/suites/view/secure.sql
@@ -1,5 +1,4 @@
-/* postgres can not */
-/* syntax version 1 */
+/* custom error:SecureParam function can't be used in views*/
pragma yt.ViewIsolation = 'true';
USE plato;
SELECT k, s, v FROM Input VIEW secure;
diff --git a/yql/essentials/tests/sql/suites/view/secure_eval.sql b/yql/essentials/tests/sql/suites/view/secure_eval.sql
index 32f07f32df..13acee4487 100644
--- a/yql/essentials/tests/sql/suites/view/secure_eval.sql
+++ b/yql/essentials/tests/sql/suites/view/secure_eval.sql
@@ -1,5 +1,4 @@
-/* postgres can not */
-/* syntax version 1 */
+/* custom error:SecureParam function can't be used in views*/
pragma yt.ViewIsolation = 'true';
USE plato;
SELECT k, s, v FROM Input VIEW secure_eval;
diff --git a/yql/essentials/tests/sql/suites/view/secure_eval_dyn.sql b/yql/essentials/tests/sql/suites/view/secure_eval_dyn.sql
index 44f17b18da..0a1b696155 100644
--- a/yql/essentials/tests/sql/suites/view/secure_eval_dyn.sql
+++ b/yql/essentials/tests/sql/suites/view/secure_eval_dyn.sql
@@ -1,5 +1,4 @@
-/* postgres can not */
-/* syntax version 1 */
+/* custom error:FuncCode should have constant function name in views*/
pragma yt.ViewIsolation = 'true';
USE plato;
SELECT k, s, v FROM Input VIEW secure_eval_dynamic;
diff --git a/yql/essentials/tests/sql/suites/weak_field/weak_field_wrong_types_fail.sql b/yql/essentials/tests/sql/suites/weak_field/weak_field_wrong_types_fail.sql
index 0d8cf87a35..447c2a5804 100644
--- a/yql/essentials/tests/sql/suites/weak_field/weak_field_wrong_types_fail.sql
+++ b/yql/essentials/tests/sql/suites/weak_field/weak_field_wrong_types_fail.sql
@@ -1,4 +1,4 @@
-/* postgres can not */
+/* custom error:incompatible WeakField types: Optional<Int32!=Uint32>*/
use plato;
SELECT
WeakField(first_num, "int32", 42) -- first_num column have another type