itsscb/sqlx
1
0
Fork 0
mirror of https://github.com/launchbadge/sqlx.git synced 2025-10-02 15:25:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

mysql: Fix decoding of TIME '00:00:00.000000'

Browse Source 
Fixes #418
This commit is contained in:
Peter Maatman 2020-06-28 12:41:54 +02:00 committed by Ryan Leckey
parent e4005bb53d
commit eda0b7dea4
3 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sqlx-core/src/mysql/types/chrono.rs
View File

@ -78,6 +78,13 @@ impl<'r> Decode<'r, MySql> for NaiveTime {
// data length, expecting 8 or 12 (fractional seconds)
let len = buf.get_u8();
// MySQL specifies that if all of hours, minutes, seconds, microseconds
// 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(NaiveTime::from_hms_micro(0, 0, 0, 0));
}
// is negative : int<1>
let is_negative = buf.get_u8();
debug_assert_eq!(is_negative, 0, "Negative dates/times are not supported");

7
sqlx-core/src/mysql/types/time.rs
View File

@ -83,6 +83,13 @@ impl<'r> Decode<'r, MySql> for Time {
// data length, expecting 8 or 12 (fractional seconds)
let len = buf.get_u8();
// MySQL specifies that if all of hours, minutes, seconds, microseconds
// 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());
}
// is negative : int<1>
let is_negative = buf.get_u8();
assert_eq!(is_negative, 0, "Negative dates/times are not supported");

10
tests/mysql/types.rs
View File

@ -49,6 +49,11 @@ mod chrono {
"DATE '2050-11-23'" == NaiveDate::from_ymd(2050, 11, 23)
));
test_type!(chrono_time_zero<NaiveTime>(
MySql,
"TIME '00:00:00.000000'" == NaiveTime::from_hms_micro(0, 0, 0, 0)
));
test_type!(chrono_time<NaiveTime>(
MySql,
"TIME '05:10:20.115100'" == NaiveTime::from_hms_micro(5, 10, 20, 115100)
@ -81,6 +86,11 @@ mod time_tests {
"DATE '2050-11-23'" == date!(2050 - 11 - 23)
));
test_type!(time_time_zero<Time>(
MySql,
"TIME '00:00:00.000000'" == time!(00:00:00.000000)
));
test_type!(time_time<Time>(
MySql,
"TIME '05:10:20.115100'" == time!(5:10:20.115100)