Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions src/value.rs
Original file line number Diff line number Diff line change
Expand Up @@ -357,8 +357,10 @@ fn resolve_union<'a>(
| (Value::Bytes(_), Variant::Bytes)
| (Value::Str(_), Variant::Str)
| (Value::Map(_), Variant::Map { .. })
| (Value::Array(_), Variant::Array { .. }) => return Ok((idx, variant)),
(Value::Fixed(_), Variant::Fixed { .. }) => return Ok((idx, variant)),
| (Value::Array(_), Variant::Array { .. })
| (Value::Fixed(_), Variant::Fixed { .. })
| (Value::Enum(_), Variant::Enum { .. })
| (Value::Record(_), Variant::Record { .. }) => return Ok((idx, variant)),
(Value::Array(v), Variant::Fixed { size, .. }) => {
if v.len() == *size {
return Ok((idx, variant));
Expand Down
68 changes: 68 additions & 0 deletions tests/read_write.rs
Original file line number Diff line number Diff line change
Expand Up @@ -402,3 +402,71 @@ fn read_deflate_reuse() {
let _v: LongList = from_value(&i).unwrap();
}
}

#[test]
fn parses_field_record_defined_within_union() {
#[derive(Serialize, Deserialize, PartialEq, Debug)]
struct Reference {
#[serde(rename = "feedReference")]
pub feed_reference: Option<FeedReference>,
}

#[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
pub struct FeedReference {
pub instance: String,
pub provider: String,
}

impl Default for FeedReference {
fn default() -> FeedReference {
FeedReference {
instance: String::default(),
provider: String::default(),
}
}
}

let schema = r##"
{
"name": "Reference",
"type": "record",
"fields": [
{
"name": "feedReference",
"type": [
"null",
{
"name": "FeedReference",
"type": "record",
"fields": [
{
"name": "instance",
"type": "string"
},
{
"name": "provider",
"type": "string"
}
]
}
],
"default": null
}
]
}
"##;

let reference = Reference {
feed_reference: Some(FeedReference::default()),
};

let schema = Schema::from_str(&schema).unwrap();
let mut writer = avrow::Writer::new(&schema, vec![]).unwrap();
writer.serialize(&reference).unwrap();
let a = writer.into_inner().unwrap();
let reader = Reader::new(a.as_slice()).unwrap();
for i in reader {
let a: Reference = from_value(&i).unwrap();
assert_eq!(a, reference);
}
}