From bd636d811e0b1a7f441c1c0d8c177435c5742ba0 Mon Sep 17 00:00:00 2001
From: fx-kirin <ono.kirin@gmail.com>
Date: Sat, 6 Jun 2020 05:14:49 +0900
Subject: [PATCH] Fix serde with `_option` macro bug. (#429)

* fixing option handling.

* Add a test for serde option handling in bincode

Co-authored-by: Brandon W Maister <quodlibetor@gmail.com>
---
 src/datetime.rs       |  6 +++---
 src/naive/datetime.rs | 32 +++++++++++++++++++++++++++++---
 2 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/src/datetime.rs b/src/datetime.rs
index 643d34402d..e56ec6a75d 100644
--- a/src/datetime.rs
+++ b/src/datetime.rs
@@ -1184,7 +1184,7 @@ pub mod serde {
             where S: ser::Serializer
         {
             match *opt {
-                Some(ref dt) => ts_nanoseconds::serialize(dt, serializer),
+                Some(ref dt) => serializer.serialize_some(&dt.timestamp_nanos()),
                 None => serializer.serialize_none(),
             }
         }
@@ -1475,7 +1475,7 @@ pub mod serde {
             where S: ser::Serializer
         {
             match *opt {
-                Some(ref dt) => ts_milliseconds::serialize(dt, serializer),
+                Some(ref dt) => serializer.serialize_some(&dt.timestamp_millis()),
                 None => serializer.serialize_none(),
             }
         }
@@ -1762,7 +1762,7 @@ pub mod serde {
             where S: ser::Serializer
         {
             match *opt {
-                Some(ref dt) => ts_seconds::serialize(dt, serializer),
+                Some(ref dt) => serializer.serialize_some(&dt.timestamp()),
                 None => serializer.serialize_none(),
             }
         }
diff --git a/src/naive/datetime.rs b/src/naive/datetime.rs
index 6989a627e6..fdc2613e66 100644
--- a/src/naive/datetime.rs
+++ b/src/naive/datetime.rs
@@ -2153,6 +2153,7 @@ pub mod serde {
         }
     }
 
+    #[cfg(test)] extern crate serde_derive;
     #[cfg(test)] extern crate serde_json;
     #[cfg(test)] extern crate bincode;
 
@@ -2166,18 +2167,43 @@ pub mod serde {
         super::test_decodable_json(|input| self::serde_json::from_str(&input));
     }
 
+    // Bincode is relevant to test separately from JSON because
+    // it is not self-describing.
     #[test]
     fn test_serde_bincode() {
-        // Bincode is relevant to test separately from JSON because
-        // it is not self-describing.
-        use naive::NaiveDate;
         use self::bincode::{Infinite, serialize, deserialize};
+        use naive::NaiveDate;
 
         let dt = NaiveDate::from_ymd(2016, 7, 8).and_hms_milli(9, 10, 48, 90);
         let encoded = serialize(&dt, Infinite).unwrap();
         let decoded: NaiveDateTime = deserialize(&encoded).unwrap();
         assert_eq!(dt, decoded);
     }
+
+    #[test]
+    fn test_serde_bincode_optional() {
+        use ::serde::ts_nanoseconds_option;
+        use self::serde_derive::{Deserialize, Serialize};
+        use prelude::*;
+        use self::bincode::{Infinite, serialize, deserialize};
+
+        #[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
+        struct Test {
+            one: Option<i64>,
+            #[serde(with = "ts_nanoseconds_option")]
+            two: Option<DateTime<Utc>>,
+        }
+
+        let expected = Test {
+            one: Some(1),
+            two: Some(Utc.ymd(1970, 1, 1).and_hms(0, 1, 1)),
+        };
+        let bytes: Vec<u8> = serialize(&expected, Infinite).unwrap();
+        let actual = deserialize::<Test>(&(bytes)).unwrap();
+
+        assert_eq!(expected, actual);
+
+    }
 }
 
 #[cfg(test)]