diff --git a/src/iceberg/json_serde.cc b/src/iceberg/json_serde.cc index f322996ec7..126be22d87 100644 --- a/src/iceberg/json_serde.cc +++ b/src/iceberg/json_serde.cc @@ -494,7 +494,9 @@ Result> StructTypeFromJson(const nlohmann::json& json) { } Result> ListTypeFromJson(const nlohmann::json& json) { - ICEBERG_ASSIGN_OR_RAISE(auto element_type, TypeFromJson(json[kElement])); + ICEBERG_ASSIGN_OR_RAISE( + auto element_type, + GetJsonValue(json, kElement).and_then(TypeFromJson)); ICEBERG_ASSIGN_OR_RAISE(auto element_id, GetJsonValue(json, kElementId)); ICEBERG_ASSIGN_OR_RAISE(auto element_required, GetJsonValue(json, kElementRequired)); diff --git a/src/iceberg/test/json_serde_test.cc b/src/iceberg/test/json_serde_test.cc index 22b0a08dec..97707b06e5 100644 --- a/src/iceberg/test/json_serde_test.cc +++ b/src/iceberg/test/json_serde_test.cc @@ -189,6 +189,16 @@ TEST(JsonInternalTest, SchemaFieldRejectsNonUtcTimestamptzDefault) { EXPECT_TRUE(FieldFromJson(utc).has_value()); } +TEST(JsonInternalTest, ListTypeFromJsonMissingElement) { + nlohmann::json invalid_json = + R"({"type":"list","element-id":1,"element-required":true})"_json; + // missing "element" + + auto result = TypeFromJson(invalid_json); + EXPECT_THAT(result, IsError(ErrorKind::kJsonParseError)); + EXPECT_THAT(result, HasErrorMessage("Missing 'element'")); +} + TEST(JsonInternalTest, SortField) { auto identity_transform = Transform::Identity();