Update time to 0.3.2 (#1455)

Co-authored-by: Tyler Hill <tyhi@tyhi.rs>
launchbadge · Apr 14, 2022 · ba123e6 · ba123e6
1 parent 08296a2
commit ba123e6
Show file tree

Hide file tree

Showing 11 changed files with 82 additions and 237 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -137,7 +137,7 @@ sqlx-macros = { version = "0.5.12", path = "sqlx-macros", default-features = fal
 
 [dev-dependencies]
 anyhow = "1.0.52"
-time_ = { version = "0.2.27", package = "time" }
+time_ = { version = "0.3.2", package = "time" }
 futures = "0.3.19"
 env_logger = "0.8.4"
 async-std = { version = "1.10.0", features = ["attributes"] }

diff --git a/sqlx-core/Cargo.toml b/sqlx-core/Cargo.toml
@@ -155,7 +155,7 @@ sha-1 = { version = "0.10.0", default-features = false, optional = true }
 sha2 = { version = "0.10.0", default-features = false, optional = true }
 sqlformat = "0.1.8"
 thiserror = "1.0.30"
-time = { version = "0.2.27", optional = true }
+time = { version = "0.3.2", features = ["macros", "formatting", "parsing"], optional = true }
 tokio-stream = { version = "0.1.8", features = ["fs"], optional = true }
 smallvec = "1.7.0"
 url = { version = "2.2.2", default-features = false }

diff --git a/sqlx-core/src/mysql/types/time.rs b/sqlx-core/src/mysql/types/time.rs
@@ -1,8 +1,8 @@
-use std::borrow::Cow;
 use std::convert::TryFrom;
 
 use byteorder::{ByteOrder, LittleEndian};
 use bytes::Buf;
+use time::macros::format_description;
 use time::{Date, OffsetDateTime, PrimitiveDateTime, Time, UtcOffset};
 
 use crate::decode::Decode;
@@ -87,7 +87,7 @@ impl<'r> Decode<'r, MySql> for Time {
                 // are 0 then the length is 0 and no further data is send
                 // https://dev.mysql.com/doc/internals/en/binary-protocol-value.html
                 if len == 0 {
-                    return Ok(Time::try_from_hms_micro(0, 0, 0, 0).unwrap());
+                    return Ok(Time::MIDNIGHT);
                 }
 
                 // is negative : int<1>
@@ -101,21 +101,11 @@ impl<'r> Decode<'r, MySql> for Time {
                 decode_time(len - 5, buf)
             }
 
-            MySqlValueFormat::Text => {
-                let s = value.as_str()?;
-
-                // If there are less than 9 digits after the decimal point
-                // We need to zero-pad
-                // TODO: Ask [time] to add a parse % for less-than-fixed-9 nanos
-
-                let s = if s.len() < 20 {
-                    Cow::Owned(format!("{:0<19}", s))
-                } else {
-                    Cow::Borrowed(s)
-                };
-
-                Time::parse(&*s, "%H:%M:%S.%N").map_err(Into::into)
-            }
+            MySqlValueFormat::Text => Time::parse(
+                value.as_str()?,
+                &format_description!("[hour]:[minute]:[second].[subsecond]"),
+            )
+            .map_err(Into::into),
         }
     }
 }
@@ -148,7 +138,7 @@ impl<'r> Decode<'r, MySql> for Date {
             }
             MySqlValueFormat::Text => {
                 let s = value.as_str()?;
-                Date::parse(s, "%Y-%m-%d").map_err(Into::into)
+                Date::parse(s, &format_description!("[year]-[month]-[day]")).map_err(Into::into)
             }
         }
     }
@@ -211,21 +201,22 @@ impl<'r> Decode<'r, MySql> for PrimitiveDateTime {
             MySqlValueFormat::Text => {
                 let s = value.as_str()?;
 
-                // If there are less than 9 digits after the decimal point
-                // We need to zero-pad
-                // TODO: Ask [time] to add a parse % for less-than-fixed-9 nanos
-
-                let s = if s.len() < 31 {
-                    if s.contains('.') {
-                        Cow::Owned(format!("{:0<30}", s))
-                    } else {
-                        Cow::Owned(format!("{}.000000000", s))
-                    }
+                // If there are no nanoseconds parse without them
+                if s.contains('.') {
+                    PrimitiveDateTime::parse(
+                        s,
+                        &format_description!(
+                            "[year]-[month]-[day] [hour]:[minute]:[second].[subsecond]"
+                        ),
+                    )
+                    .map_err(Into::into)
                 } else {
-                    Cow::Borrowed(s)
-                };
-
-                PrimitiveDateTime::parse(&*s, "%Y-%m-%d %H:%M:%S.%N").map_err(Into::into)
+                    PrimitiveDateTime::parse(
+                        s,
+                        &format_description!("[year]-[month]-[day] [hour]:[minute]:[second]"),
+                    )
+                    .map_err(Into::into)
+                }
             }
         }
     }
@@ -237,7 +228,7 @@ fn encode_date(date: &Date, buf: &mut Vec<u8>) {
         .unwrap_or_else(|_| panic!("Date out of range for Mysql: {}", date));
 
     buf.extend_from_slice(&year.to_le_bytes());
-    buf.push(date.month());
+    buf.push(date.month().into());
     buf.push(date.day());
 }
 
@@ -247,9 +238,9 @@ fn decode_date(buf: &[u8]) -> Result<Option<Date>, BoxDynError> {
         return Ok(None);
     }
 
-    Date::try_from_ymd(
+    Date::from_calendar_date(
         LittleEndian::read_u16(buf) as i32,
-        buf[2] as u8,
+        time::Month::try_from(buf[2] as u8)?,
         buf[3] as u8,
     )
     .map_err(Into::into)
@@ -278,6 +269,6 @@ fn decode_time(len: u8, mut buf: &[u8]) -> Result<Time, BoxDynError> {
         0
     };
 
-    Time::try_from_hms_micro(hour, minute, seconds, micros as u32)
+    Time::from_hms_micro(hour, minute, seconds, micros as u32)
         .map_err(|e| format!("Time out of range for MySQL: {}", e).into())
 }