ISAR/rusqlite
3
0
Fork 0
mirror of https://github.com/isar/rusqlite.git synced 2024-11-23 09:09:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Partially fix the bug reported by @iwinux.

Browse Source 
If microseconds are specified but no timezone indicator, parsing
fails...
This commit is contained in:
gwenn 2016-05-04 21:57:16 +02:00
parent 87844c688e
commit 79376a4ca9
1 changed files with 58 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
src/types/chrono.rs
View File

@ -179,15 +179,14 @@ impl FromSql for DateTime<UTC> {
unsafe fn column_result(stmt: *mut sqlite3_stmt, col: c_int) -> Result<DateTime<UTC>> { unsafe fn column_result(stmt: *mut sqlite3_stmt, col: c_int) -> Result<DateTime<UTC>> {
match sqlite3_column_type(stmt, col) { match sqlite3_column_type(stmt, col) {
ffi::SQLITE_TEXT => { ffi::SQLITE_TEXT => {
let s = try!(String::column_result(stmt, col)); let mut s = try!(String::column_result(stmt, col));
if s.len() > 23 { if s.len() > 23 {
let fmt = if s.as_bytes()[10] == b'T' { if s.as_bytes()[10] == b' ' {
"%Y-%m-%dT%H:%M:%S%.f%:z" s.as_mut_vec()[10] = b'T';
} else {
"%Y-%m-%d %H:%M:%S%.f%:z"
}; };
match UTC.datetime_from_str(&s, fmt) { // It cannot be used when the offset can be missing.
Ok(dt) => Ok(dt), match DateTime::parse_from_rfc3339(&s) {
Ok(dt) => Ok(dt.with_timezone(&UTC)),
Err(err) => Err(Error::FromSqlConversionFailure(Box::new(err))), Err(err) => Err(Error::FromSqlConversionFailure(Box::new(err))),
} }
} else { } else {
@ -220,20 +219,19 @@ impl ToSql for DateTime<Local> {
/// "YYYY-MM-DD HH:MM:SS.SSS[+-]HH:MM"/"YYYY-MM-DD HH:MM"/"YYYY-MM-DD HH:MM:SS"/"YYYY-MM-DD HH:MM:SS.SSS"/ Julian Day / Unix Time => ISO 8601 date and time with time zone. /// "YYYY-MM-DD HH:MM:SS.SSS[+-]HH:MM"/"YYYY-MM-DD HH:MM"/"YYYY-MM-DD HH:MM:SS"/"YYYY-MM-DD HH:MM:SS.SSS"/ Julian Day / Unix Time => ISO 8601 date and time with time zone.
/// ("YYYY-MM-DDTHH:MM:SS.SSS[+-]HH:MM"/"YYYY-MM-DDTHH:MM"/"YYYY-MM-DDTHH:MM:SS"/"YYYY-MM-DDTHH:MM:SS.SSS" also supported) /// ("YYYY-MM-DDTHH:MM:SS.SSS[+-]HH:MM"/"YYYY-MM-DDTHH:MM"/"YYYY-MM-DDTHH:MM:SS"/"YYYY-MM-DDTHH:MM:SS.SSS" also supported)
/// When the timezone is not specified, Local is used. /// When the timezone is not specified, UTC is used.
impl FromSql for DateTime<Local> { impl FromSql for DateTime<Local> {
unsafe fn column_result(stmt: *mut sqlite3_stmt, col: c_int) -> Result<DateTime<Local>> { unsafe fn column_result(stmt: *mut sqlite3_stmt, col: c_int) -> Result<DateTime<Local>> {
match sqlite3_column_type(stmt, col) { match sqlite3_column_type(stmt, col) {
ffi::SQLITE_TEXT => { ffi::SQLITE_TEXT => {
let s = try!(String::column_result(stmt, col)); let mut s = try!(String::column_result(stmt, col));
if s.len() > 23 { if s.len() > 23 {
let fmt = if s.as_bytes()[10] == b'T' { if s.as_bytes()[10] == b' ' {
"%Y-%m-%dT%H:%M:%S%.f%:z" s.as_mut_vec()[10] = b'T';
} else {
"%Y-%m-%d %H:%M:%S%.f%:z"
}; };
match Local.datetime_from_str(&s, fmt) { // It cannot be used when the offset can be missing.
Ok(dt) => Ok(dt), match DateTime::parse_from_rfc3339(&s) {
Ok(dt) => Ok(dt.with_timezone(&Local)),
Err(err) => Err(Error::FromSqlConversionFailure(Box::new(err))), Err(err) => Err(Error::FromSqlConversionFailure(Box::new(err))),
} }
} else { } else {
@ -371,4 +369,49 @@ mod test {
let i: DateTime<Local> = db.query_row("SELECT i FROM foo", &[], |r| r.get(0)).unwrap(); let i: DateTime<Local> = db.query_row("SELECT i FROM foo", &[], |r| r.get(0)).unwrap();
assert_eq!(local, i); assert_eq!(local, i);
} }
#[test]
fn test_timezone() {
// Worst
UTC.datetime_from_str("2016-05-04 17:00:42.862471+08:00",
"%Y-%m-%d %H:%M:%S%.f%:z")
.unwrap_err();
UTC.datetime_from_str("2016-05-04 17:00:42.862471Z", "%Y-%m-%d %H:%M:%S%.f%:z")
.unwrap_err();
UTC.datetime_from_str("2016-05-04 17:00:42.862471", "%Y-%m-%d %H:%M:%S%.f%:z").unwrap_err();
UTC.datetime_from_str("2016-05-04 17:00:42.862471+08:00", "%Y-%m-%d %H:%M:%S%.f%z")
.unwrap_err();
UTC.datetime_from_str("2016-05-04 17:00:42.862471Z", "%Y-%m-%d %H:%M:%S%.f%z").unwrap_err();
UTC.datetime_from_str("2016-05-04 17:00:42.862471", "%Y-%m-%d %H:%M:%S%.f%z").unwrap_err();
// Better but...
DateTime::parse_from_str("2016-05-04 17:00:42.862471+08:00", "%Y-%m-%d %H:%M:%S%.f%z")
.unwrap()
.with_timezone(&UTC);
DateTime::parse_from_str("2016-05-04 17:00:42.862471Z", "%Y-%m-%d %H:%M:%S%.f%z")
.unwrap_err(); // Invalid
DateTime::parse_from_str("2016-05-04 17:00:42.862471", "%Y-%m-%d %H:%M:%S%.f%z")
.unwrap_err(); // TooShort
DateTime::parse_from_str("2016-05-04 17:00:42.862471+08:00",
"%Y-%m-%d %H:%M:%S%.f%:z")
.unwrap()
.with_timezone(&UTC);
DateTime::parse_from_str("2016-05-04 17:00:42.862471Z", "%Y-%m-%d %H:%M:%S%.f%:z")
.unwrap_err(); // Invalid
DateTime::parse_from_str("2016-05-04 17:00:42.862471", "%Y-%m-%d %H:%M:%S%.f%:z")
.unwrap_err(); // TooShort
// Best but in SQLite, the timezone indicator is optional
DateTime::parse_from_rfc3339("2016-05-04T17:00:42.862471+08:00")
.unwrap()
.with_timezone(&UTC);
DateTime::parse_from_rfc3339("2016-05-04T17:00:42.862471Z").unwrap().with_timezone(&UTC);
DateTime::parse_from_rfc3339("2016-05-04T17:00:42.862471").unwrap_err(); // TooShort
"2016-05-04T17:00:42.862471+08:00".parse::<DateTime<UTC>>().unwrap();
"2016-05-04T17:00:42.862471Z".parse::<DateTime<UTC>>().unwrap();
"2016-05-04T17:00:42.862471".parse::<DateTime<UTC>>().unwrap_err(); // TooShort
}
} }