diff --git a/ydb/tests/compatibility/test_data_type.py b/ydb/tests/compatibility/test_data_type.py index f94fc2d0f3d7..c9b79ab10cb6 100644 --- a/ydb/tests/compatibility/test_data_type.py +++ b/ydb/tests/compatibility/test_data_type.py @@ -29,6 +29,10 @@ def setup(self, store_type): columns_in_pk_limit = 20 self.count_rows = 30 self.store_type = store_type + + if store_type == "COLUMN" and min(self.versions) < (26, 1): + types_not_supported_yet_in_columnshard.add("Bool") + # not all the types are supported for column tables supported_pk_types = pk_types if store_type == "ROW" else {k: v for k, v in pk_types.items() if k not in types_not_supported_yet_in_columnshard} supported_non_pk_types = non_pk_types if store_type == "ROW" else {k: v for k, v in non_pk_types.items() if k not in types_not_supported_yet_in_columnshard} @@ -52,12 +56,17 @@ def setup(self, store_type): } ) self.table_names.append(f"table_{i}_{self.store_type}") + + extra_feature_flags = { + "enable_parameterized_decimal": True, + "enable_table_datetime64": True, + } + + if min(self.versions) >= (26, 1): + extra_feature_flags["enable_columnshard_bool"] = True + yield from self.setup_cluster( - extra_feature_flags={ - "enable_parameterized_decimal": True, - "enable_table_datetime64": True, - "enable_columnshard_bool": True, - }, + extra_feature_flags=extra_feature_flags, column_shard_config={ "disabled_on_scheme_shard": False, }, @@ -259,10 +268,6 @@ def test_data_type(self): if (min(self.versions) < (25, 1)): types_not_supported_yet_in_columnshard.add("Decimal") - if any("Bool" in type_name for type_name in self.all_types.keys()) and self.store_type == "COLUMN": - if (min(self.versions) < (26, 1)): - types_not_supported_yet_in_columnshard.add("Bool") - self.create_table() self.write_data() @@ -280,10 +285,6 @@ def test_parametrized_data_type(self): if (min(self.versions) < (25, 1)): types_not_supported_yet_in_columnshard.add("Decimal") - if any("Bool" in type_name for type_name in self.all_types.keys()) and self.store_type == "COLUMN": - if (min(self.versions) < (26, 1)): - types_not_supported_yet_in_columnshard.add("Bool") - self.create_table() self.parametrized_write_data()