(avro-rs) branch main updated: fix: add support to deserialize an enum inside a struct in from_value() (#15)

[mgrigorov]

This is an automated email from the ASF dual-hosted git repository.

mgrigorov pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/avro-rs.git


The following commit(s) were added to refs/heads/main by this push:
     new 3ac24ef  fix: add support to deserialize an enum inside a struct in 
from_value() (#15)
3ac24ef is described below

commit 3ac24ef030ee7216fc99c53b13833a8e70c29900
Author: Jordi Oliver <jordi.obua...@gmail.com>
AuthorDate: Fri Oct 4 14:20:23 2024 +0200

    fix: add support to deserialize an enum inside a struct in from_value() 
(#15)
---
 avro/src/de.rs | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/avro/src/de.rs b/avro/src/de.rs
index 2dcfc40..6745152 100644
--- a/avro/src/de.rs
+++ b/avro/src/de.rs
@@ -272,6 +272,7 @@ impl<'a, 'de> de::Deserializer<'de> for &'a 
Deserializer<'de> {
                 Value::Map(ref items) => 
visitor.visit_map(MapDeserializer::new(items)),
                 Value::Bytes(ref bytes) | Value::Fixed(_, ref bytes) => 
visitor.visit_bytes(bytes),
                 Value::Decimal(ref d) => visitor.visit_bytes(&d.to_vec()?),
+                Value::Enum(_, ref s) => visitor.visit_borrowed_str(s),
                 _ => Err(de::Error::custom(format!(
                     "unsupported union: {:?}",
                     self.input
@@ -284,6 +285,7 @@ impl<'a, 'de> de::Deserializer<'de> for &'a 
Deserializer<'de> {
             Value::Map(ref items) => 
visitor.visit_map(MapDeserializer::new(items)),
             Value::Bytes(ref bytes) | Value::Fixed(_, ref bytes) => 
visitor.visit_bytes(bytes),
             Value::Decimal(ref d) => visitor.visit_bytes(&d.to_vec()?),
+            Value::Enum(_, s) => visitor.visit_borrowed_str(s),
             value => Err(de::Error::custom(format!(
                 "incorrect value of type: {:?}",
                 crate::schema::SchemaKind::from(value)
@@ -1242,12 +1244,18 @@ mod tests {
             record_in_union: i32,
         }
 
+        #[derive(Debug, Deserialize, PartialEq, Eq)]
+        enum EnumInStruct {
+            Val1,
+        }
+
         #[derive(Debug, Deserialize, PartialEq, Eq)]
         struct StructWithMissingFields {
             a_string: String,
             a_record: Option<RecordInUnion>,
             an_array: Option<[bool; 2]>,
             a_union_map: Option<HashMap<String, i64>>,
+            an_enum: EnumInStruct,
         }
 
         let raw_map: HashMap<String, i64> = [
@@ -1415,6 +1423,11 @@ mod tests {
                 "a_non_existing_union_map".to_string(),
                 Value::Union(0, Box::new(Value::Map(HashMap::new()))),
             ),
+            ("an_enum".to_string(), Value::Enum(0, "Val1".to_owned())),
+            (
+                "a_non_existing_enum".to_string(),
+                Value::Enum(0, "AnotherVariant".to_owned()),
+            ),
         ]);
 
         let deserialized: StructWithMissingFields = 
crate::from_value(&record)?;
@@ -1425,6 +1438,7 @@ mod tests {
             }),
             an_array: Some([true, false]),
             a_union_map: Some(raw_map),
+            an_enum: EnumInStruct::Val1,
         };
         assert_eq!(deserialized, reference);
         Ok(())