Skip to content

Validate enum values when requested #551

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
slabko merged 1 commit into from
Aug 24, 2026
Merged

Validate enum values when requested #551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions clickhouse/columns/enum.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ ColumnEnum<T>::ColumnEnum(TypeRef type, std::vector<T>&& data)

template <typename T>
void ColumnEnum<T>::Append(const T& value, bool checkValue) {
if (checkValue) {
// TODO: type_->HasEnumValue(value), "Enum type doesn't have value " + std::to_string(value);
if (checkValue && !type_->As<EnumType>()->HasEnumValue(value)) {
throw ValidationError("Enum type doesn't have value " + std::to_string(value));
}
data_.push_back(value);
}
Expand All @@ -56,8 +56,8 @@ std::string_view ColumnEnum<T>::NameAt(size_t n) const {

template <typename T>
void ColumnEnum<T>::SetAt(size_t n, const T& value, bool checkValue) {
if (checkValue) {
// TODO: type_->HasEnumValue(value), "Enum type doesn't have value " + std::to_string(value);
if (checkValue && !type_->As<EnumType>()->HasEnumValue(value)) {
throw ValidationError("Enum type doesn't have value " + std::to_string(value));
}
data_.at(n) = value;
}
Expand Down
14 changes: 14 additions & 0 deletions ut/columns_ut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -751,6 +751,20 @@ TEST(ColumnsCase, EnumTest) {
ASSERT_TRUE(CreateColumnByType("Enum8('Hi' = 1, 'Hello' = 2)")->Type()->IsEqual(Type::CreateEnum8(enum_items)));
}

TEST(ColumnsCase, EnumCheckValue) {
auto column = std::make_shared<ColumnEnum8>(Type::CreateEnum8({{"Hi", 1}, {"Hello", 2}}));

EXPECT_NO_THROW(column->Append(1, true));
EXPECT_THROW(column->Append(3, true), ValidationError);
EXPECT_EQ(column->Size(), 1u);

EXPECT_NO_THROW(column->SetAt(0, 2, true));
EXPECT_EQ(column->At(0), 2);

EXPECT_THROW(column->SetAt(0, 3, true), ValidationError);
EXPECT_EQ(column->At(0), 2);
}

TEST(ColumnsCase, NullableSlice) {
auto data = std::make_shared<ColumnUInt32>(MakeNumbers());
auto nulls = std::make_shared<ColumnUInt8>(MakeBools());
Expand Down
Loading