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

Fix Timespec FromSql implementations (#431)

Browse Source 
Make sure SQLite built-in CURRENT_TIMESTAMP output is
supported.
This commit is contained in:
gwenn 2018-11-22 16:50:10 +01:00
parent 3a178d6d17
commit 2b8eee2b83
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/types/time.rs
View File

@ -3,6 +3,7 @@ extern crate time;
use types::{FromSql, FromSqlError, FromSqlResult, ToSql, ToSqlOutput, ValueRef}; use types::{FromSql, FromSqlError, FromSqlResult, ToSql, ToSqlOutput, ValueRef};
use Result; use Result;
const CURRENT_TIMESTAMP_FMT: &str = "%Y-%m-%d %H:%M:%S";
const SQLITE_DATETIME_FMT: &str = "%Y-%m-%dT%H:%M:%S.%fZ"; const SQLITE_DATETIME_FMT: &str = "%Y-%m-%dT%H:%M:%S.%fZ";
const SQLITE_DATETIME_FMT_LEGACY: &str = "%Y-%m-%d %H:%M:%S:%f %Z"; const SQLITE_DATETIME_FMT_LEGACY: &str = "%Y-%m-%d %H:%M:%S:%f %Z";
@ -21,10 +22,13 @@ impl FromSql for time::Timespec {
value value
.as_str() .as_str()
.and_then(|s| { .and_then(|s| {
time::strptime(s, SQLITE_DATETIME_FMT).or_else(|err| { match s.len() {
time::strptime(s, SQLITE_DATETIME_FMT_LEGACY) 19 => time::strptime(s, CURRENT_TIMESTAMP_FMT),
.or_else(|_| Err(FromSqlError::Other(Box::new(err)))) _ => time::strptime(s, SQLITE_DATETIME_FMT).or_else(|err| {
}) time::strptime(s, SQLITE_DATETIME_FMT_LEGACY).or_else(|_| Err(err))
}),
}
.or_else(|err| Err(FromSqlError::Other(Box::new(err))))
}) })
.map(|tm| tm.to_timespec()) .map(|tm| tm.to_timespec())
} }
@ -33,7 +37,7 @@ impl FromSql for time::Timespec {
#[cfg(test)] #[cfg(test)]
mod test { mod test {
use super::time; use super::time;
use {Connection, NO_PARAMS}; use {Connection, Result, NO_PARAMS};
fn checked_memory_handle() -> Connection { fn checked_memory_handle() -> Connection {
let db = Connection::open_in_memory().unwrap(); let db = Connection::open_in_memory().unwrap();
@ -67,4 +71,12 @@ mod test {
assert_eq!(from, ts); assert_eq!(from, ts);
} }
} }
#[test]
fn test_sqlite_functions() {
let db = checked_memory_handle();
let result: Result<time::Timespec> =
db.query_row("SELECT CURRENT_TIMESTAMP", NO_PARAMS, |r| r.get(0));
assert!(result.is_ok());
}
} }