mirror of
https://github.com/isar/rusqlite.git
synced 2024-11-27 03:51:38 +08:00
Restore support for full RFC3339 timestamps with a space seperator
This commit is contained in:
parent
6d9b268776
commit
6a4abff462
@ -102,7 +102,16 @@ impl<Tz: TimeZone> ToSql for DateTime<Tz> {
|
|||||||
/// RFC3339 ("YYYY-MM-DDTHH:MM:SS.SSS[+-]HH:MM") into DateTime<UTC>.
|
/// RFC3339 ("YYYY-MM-DDTHH:MM:SS.SSS[+-]HH:MM") into DateTime<UTC>.
|
||||||
impl FromSql for DateTime<UTC> {
|
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>> {
|
||||||
let s = try!(String::column_result(stmt, col));
|
let s = {
|
||||||
|
let mut s = try!(String::column_result(stmt, col));
|
||||||
|
if s.len() >= 11 {
|
||||||
|
let sbytes = s.as_mut_vec();
|
||||||
|
if sbytes[10] == b' ' {
|
||||||
|
sbytes[10] = b'T';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
s
|
||||||
|
};
|
||||||
match DateTime::parse_from_rfc3339(&s) {
|
match DateTime::parse_from_rfc3339(&s) {
|
||||||
Ok(dt) => Ok(dt.with_timezone(&UTC)),
|
Ok(dt) => Ok(dt.with_timezone(&UTC)),
|
||||||
Err(_) => NaiveDateTime::column_result(stmt, col).map(|dt| UTC.from_utc_datetime(&dt)),
|
Err(_) => NaiveDateTime::column_result(stmt, col).map(|dt| UTC.from_utc_datetime(&dt)),
|
||||||
@ -201,6 +210,9 @@ mod test {
|
|||||||
|
|
||||||
let v3: DateTime<UTC> = db.query_row("SELECT '2016-02-23 23:56:04'", &[], |r| r.get(0)).unwrap();
|
let v3: DateTime<UTC> = db.query_row("SELECT '2016-02-23 23:56:04'", &[], |r| r.get(0)).unwrap();
|
||||||
assert_eq!(utc - Duration::milliseconds(789), v3);
|
assert_eq!(utc - Duration::milliseconds(789), v3);
|
||||||
|
|
||||||
|
let v4: DateTime<UTC> = db.query_row("SELECT '2016-02-23 23:56:04.789+00:00'", &[], |r| r.get(0)).unwrap();
|
||||||
|
assert_eq!(utc, v4);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
|
Loading…
Reference in New Issue
Block a user