From 0a70117e18da93603ddedd8f41fc60d2adb0b2bd Mon Sep 17 00:00:00 2001
From: creativcoder <creativcoders@gmail.com>
Date: Sun, 22 Nov 2020 16:16:39 +0530
Subject: [PATCH] Fix #6: implicitly defined named schemas should resolve in
 union variants

---
 src/value.rs        |  6 ++--
 tests/read_write.rs | 68 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 72 insertions(+), 2 deletions(-)

diff --git a/src/value.rs b/src/value.rs
index 9589682..44d5b20 100644
--- a/src/value.rs
+++ b/src/value.rs
@@ -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));
diff --git a/tests/read_write.rs b/tests/read_write.rs
index 4fd4e13..49a620d 100644
--- a/tests/read_write.rs
+++ b/tests/read_write.rs
@@ -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);
+    }
+}