From 200d534b8a967766e8018aa3e7e7421670906e79 Mon Sep 17 00:00:00 2001 From: Ryan Leckey Date: Sat, 21 Mar 2020 03:01:23 -0700 Subject: [PATCH] Fix time/chrono decode tests --- sqlx-core/src/mysql/types/time.rs | 11 +++++++---- sqlx-core/src/postgres/types/chrono.rs | 6 +++--- sqlx-core/src/postgres/types/time.rs | 24 ++++++++++++------------ 3 files changed, 22 insertions(+), 19 deletions(-) diff --git a/sqlx-core/src/mysql/types/time.rs b/sqlx-core/src/mysql/types/time.rs index cf7a4c03..022a847a 100644 --- a/sqlx-core/src/mysql/types/time.rs +++ b/sqlx-core/src/mysql/types/time.rs @@ -284,15 +284,18 @@ fn test_encode_date_time() { fn test_decode_date_time() { // test values from https://dev.mysql.com/doc/internals/en/binary-protocol-value.html let buf = [11, 218, 7, 10, 17, 19, 27, 30, 1, 0, 0, 0]; - let date1 = >::decode(&buf).unwrap(); + let date1 = + >::decode(Some(MySqlValue::Binary(&buf))).unwrap(); assert_eq!(date1.to_string(), "2010-10-17 19:27:30.000001"); let buf = [7, 218, 7, 10, 17, 19, 27, 30]; - let date2 = >::decode(&buf).unwrap(); + let date2 = + >::decode(Some(MySqlValue::Binary(&buf))).unwrap(); assert_eq!(date2.to_string(), "2010-10-17 19:27:30"); let buf = [4, 218, 7, 10, 17]; - let date3 = >::decode(&buf).unwrap(); + let date3 = + >::decode(Some(MySqlValue::Binary(&buf))).unwrap(); assert_eq!(date3.to_string(), "2010-10-17 0:00"); } @@ -307,6 +310,6 @@ fn test_encode_date() { #[test] fn test_decode_date() { let buf = [4, 218, 7, 10, 17]; - let date = >::decode(&buf).unwrap(); + let date = >::decode(Some(MySqlValue::Binary(&buf))).unwrap(); assert_eq!(date, date!(2010 - 10 - 17)); } diff --git a/sqlx-core/src/postgres/types/chrono.rs b/sqlx-core/src/postgres/types/chrono.rs index a16418ca..c1e13944 100644 --- a/sqlx-core/src/postgres/types/chrono.rs +++ b/sqlx-core/src/postgres/types/chrono.rs @@ -265,18 +265,18 @@ fn test_encode_time() { #[test] fn test_decode_time() { let buf = [0u8; 8]; - let time: NaiveTime = Decode::::decode(&buf).unwrap(); + let time: NaiveTime = Decode::::decode(Some(PgValue::Binary(&buf))).unwrap(); assert_eq!(time, NaiveTime::from_hms(0, 0, 0),); // half an hour let buf = (1_000_000i64 * 60 * 30).to_be_bytes(); - let time: NaiveTime = Decode::::decode(&buf).unwrap(); + let time: NaiveTime = Decode::::decode(Some(PgValue::Binary(&buf))).unwrap(); assert_eq!(time, NaiveTime::from_hms(0, 30, 0),); // 12:53:05.125305 let buf = (1_000_000i64 * 60 * 60 * 12 + 1_000_000i64 * 60 * 53 + 1_000_000i64 * 5 + 125305) .to_be_bytes(); - let time: NaiveTime = Decode::::decode(&buf).unwrap(); + let time: NaiveTime = Decode::::decode(Some(PgValue::Binary(&buf))).unwrap(); assert_eq!(time, NaiveTime::from_hms_micro(12, 53, 5, 125305),); } diff --git a/sqlx-core/src/postgres/types/time.rs b/sqlx-core/src/postgres/types/time.rs index 04323976..dcc40025 100644 --- a/sqlx-core/src/postgres/types/time.rs +++ b/sqlx-core/src/postgres/types/time.rs @@ -285,18 +285,18 @@ fn test_encode_time() { #[test] fn test_decode_time() { let buf = [0u8; 8]; - let time: Time = Decode::::decode(&buf).unwrap(); + let time: Time = Decode::::decode(Some(PgValue::Binary(&buf))).unwrap(); assert_eq!(time, time!(0:00)); // half an hour let buf = (1_000_000i64 * 60 * 30).to_be_bytes(); - let time: Time = Decode::::decode(&buf).unwrap(); + let time: Time = Decode::::decode(Some(PgValue::Binary(&buf))).unwrap(); assert_eq!(time, time!(0:30)); // 12:53:05.125305 let buf = (1_000_000i64 * 60 * 60 * 12 + 1_000_000i64 * 60 * 53 + 1_000_000i64 * 5 + 125305) .to_be_bytes(); - let time: Time = Decode::::decode(&buf).unwrap(); + let time: Time = Decode::::decode(Some(PgValue::Binary(&buf))).unwrap(); assert_eq!(time, time!(12:53:05.125305)); } @@ -325,21 +325,21 @@ fn test_encode_datetime() { #[test] fn test_decode_datetime() { let buf = [0u8; 8]; - let date: PrimitiveDateTime = Decode::::decode(&buf).unwrap(); + let date: PrimitiveDateTime = Decode::::decode(Some(PgValue::Binary(&buf))).unwrap(); assert_eq!( date, PrimitiveDateTime::new(date!(2000 - 01 - 01), time!(00:00:00)) ); let buf = 3_600_000_000i64.to_be_bytes(); - let date: PrimitiveDateTime = Decode::::decode(&buf).unwrap(); + let date: PrimitiveDateTime = Decode::::decode(Some(PgValue::Binary(&buf))).unwrap(); assert_eq!( date, PrimitiveDateTime::new(date!(2000 - 01 - 01), time!(01:00:00)) ); let buf = 629_377_265_000_000i64.to_be_bytes(); - let date: PrimitiveDateTime = Decode::::decode(&buf).unwrap(); + let date: PrimitiveDateTime = Decode::::decode(Some(PgValue::Binary(&buf))).unwrap(); assert_eq!( date, PrimitiveDateTime::new(date!(2019 - 12 - 11), time!(11:01:05)) @@ -372,21 +372,21 @@ fn test_encode_offsetdatetime() { #[test] fn test_decode_offsetdatetime() { let buf = [0u8; 8]; - let date: OffsetDateTime = Decode::::decode(&buf).unwrap(); + let date: OffsetDateTime = Decode::::decode(Some(PgValue::Binary(&buf))).unwrap(); assert_eq!( date, PrimitiveDateTime::new(date!(2000 - 01 - 01), time!(00:00:00)).assume_utc() ); let buf = 3_600_000_000i64.to_be_bytes(); - let date: OffsetDateTime = Decode::::decode(&buf).unwrap(); + let date: OffsetDateTime = Decode::::decode(Some(PgValue::Binary(&buf))).unwrap(); assert_eq!( date, PrimitiveDateTime::new(date!(2000 - 01 - 01), time!(01:00:00)).assume_utc() ); let buf = 629_377_265_000_000i64.to_be_bytes(); - let date: OffsetDateTime = Decode::::decode(&buf).unwrap(); + let date: OffsetDateTime = Decode::::decode(Some(PgValue::Binary(&buf))).unwrap(); assert_eq!( date, PrimitiveDateTime::new(date!(2019 - 12 - 11), time!(11:01:05)).assume_utc() @@ -417,14 +417,14 @@ fn test_encode_date() { #[test] fn test_decode_date() { let buf = [0; 4]; - let date: Date = Decode::::decode(&buf).unwrap(); + let date: Date = Decode::::decode(Some(PgValue::Binary(&buf))).unwrap(); assert_eq!(date, date!(2000 - 01 - 01)); let buf = 366i32.to_be_bytes(); - let date: Date = Decode::::decode(&buf).unwrap(); + let date: Date = Decode::::decode(Some(PgValue::Binary(&buf))).unwrap(); assert_eq!(date, date!(2001 - 01 - 01)); let buf = 7284i32.to_be_bytes(); - let date: Date = Decode::::decode(&buf).unwrap(); + let date: Date = Decode::::decode(Some(PgValue::Binary(&buf))).unwrap(); assert_eq!(date, date!(2019 - 12 - 11)); }