Merge pull request jonhoo#17 from simonhdickson/master

Fix time field length when us=0

Author: jonhoo

src/value/decode.rs

@@ -251,7 +251,11 @@ use std::time::Duration;
 impl<'a> Into<Duration> for Value<'a> {
     fn into(self) -> Duration {
         if let ValueInner::Time(mut v) = self.0 {
-            assert!(v.len() == 8 || v.len() == 12);
+            assert!(v.len() == 0 || v.len() == 8 || v.len() == 12);
+
+            if v.len() == 0 {
+                return Duration::from_secs(0);
+            }
 
             let neg = v.read_u8().unwrap();
             if neg != 0u8 {
@@ -452,6 +456,12 @@ mod tests {
         time::Duration::from_secs(1893),
         ColumnType::MYSQL_TYPE_TIME
     );
+    rt!(
+        dur_zero,
+        time::Duration,
+        time::Duration::from_secs(0),
+        ColumnType::MYSQL_TYPE_TIME
+    );
     rt!(
         bytes,
         &[u8],

src/value/encode.rs

@@ -527,20 +527,24 @@ impl ToMysqlValue for Duration {
 
         match c.coltype {
             ColumnType::MYSQL_TYPE_TIME => {
-                if us != 0 {
-                    w.write_u8(12u8)?;
+                if self.as_secs() == 0 && us == 0 {
+                    w.write_u8(0u8)?;
                 } else {
-                    w.write_u8(9u8)?;
-                }
+                    if us != 0 {
+                        w.write_u8(12u8)?;
+                    } else {
+                        w.write_u8(8u8)?;
+                    }
 
-                w.write_u8(0u8)?; // positive only (for now)
-                w.write_u32::<LittleEndian>(d as u32)?;
-                w.write_u8(h as u8)?;
-                w.write_u8(m as u8)?;
-                w.write_u8(s as u8)?;
+                    w.write_u8(0u8)?; // positive only (for now)
+                    w.write_u32::<LittleEndian>(d as u32)?;
+                    w.write_u8(h as u8)?;
+                    w.write_u8(m as u8)?;
+                    w.write_u8(s as u8)?;
 
-                if us != 0 {
-                    w.write_u32::<LittleEndian>(us)?;
+                    if us != 0 {
+                        w.write_u32::<LittleEndian>(us)?;
+                    }
                 }
                 Ok(())
             }
@@ -719,6 +723,8 @@ mod tests {
             chrono::Utc.ymd(1989, 12, 7).and_hms(8, 0, 4).naive_utc()
         );
         rt!(dur, time::Duration, time::Duration::from_secs(1893));
+        rt!(dur_micro, time::Duration, time::Duration::new(1893, 5000));
+        rt!(dur_zero, time::Duration, time::Duration::from_secs(0));
         rt!(bytes, Vec<u8>, vec![0x42, 0x00, 0x1a]);
         rt!(string, String, "foobar".to_owned());
     }