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

Fix FromSql impl for OffsetDateTime

Browse Source 
See 'Missing datetime format support' #968
This commit is contained in:
gwenn 2021-06-11 21:42:02 +02:00
parent ee7f7b89d5
commit 78e4036f90
1 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/types/time.rs
View File

@ -4,13 +4,15 @@ use crate::Result;
use time::{OffsetDateTime, PrimitiveDateTime, UtcOffset}; use time::{OffsetDateTime, PrimitiveDateTime, UtcOffset};
const CURRENT_TIMESTAMP_FMT: &str = "%Y-%m-%d %H:%M:%S"; const CURRENT_TIMESTAMP_FMT: &str = "%Y-%m-%d %H:%M:%S";
const SQLITE_DATETIME_FMT: &str = "%Y-%m-%d %H:%M:%S.%NZ"; const SQLITE_DATETIME_FMT: &str = "%Y-%m-%d %H:%M:%S.%N";
const SQLITE_DATETIME_Z_FMT: &str = "%Y-%m-%d %H:%M:%S.%NZ";
const SQLITE_DATETIME_FMT_LEGACY: &str = "%Y-%m-%d %H:%M:%S:%N %z"; const SQLITE_DATETIME_FMT_LEGACY: &str = "%Y-%m-%d %H:%M:%S:%N %z";
impl ToSql for OffsetDateTime { impl ToSql for OffsetDateTime {
#[inline] #[inline]
fn to_sql(&self) -> Result<ToSqlOutput<'_>> { fn to_sql(&self) -> Result<ToSqlOutput<'_>> {
let time_string = self.to_offset(UtcOffset::UTC).format(SQLITE_DATETIME_FMT); // FIXME keep original offset
let time_string = self.to_offset(UtcOffset::UTC).format(SQLITE_DATETIME_Z_FMT);
Ok(ToSqlOutput::from(time_string)) Ok(ToSqlOutput::from(time_string))
} }
} }
@ -20,11 +22,18 @@ impl FromSql for OffsetDateTime {
value.as_str().and_then(|s| { value.as_str().and_then(|s| {
match s.len() { match s.len() {
19 => PrimitiveDateTime::parse(s, CURRENT_TIMESTAMP_FMT).map(|d| d.assume_utc()), 19 => PrimitiveDateTime::parse(s, CURRENT_TIMESTAMP_FMT).map(|d| d.assume_utc()),
_ => PrimitiveDateTime::parse(s, SQLITE_DATETIME_FMT) _ => {
.map(|d| d.assume_utc()) let format = if s.ends_with('Z') {
.or_else(|err| { SQLITE_DATETIME_Z_FMT
OffsetDateTime::parse(s, SQLITE_DATETIME_FMT_LEGACY).map_err(|_| err) } else {
}), SQLITE_DATETIME_FMT
};
PrimitiveDateTime::parse(s, format)
.map(|d| d.assume_utc())
.or_else(|err| {
OffsetDateTime::parse(s, SQLITE_DATETIME_FMT_LEGACY).map_err(|_| err)
})
}
} }
.map_err(|err| FromSqlError::Other(Box::new(err))) .map_err(|err| FromSqlError::Other(Box::new(err)))
}) })
@ -71,6 +80,21 @@ mod test {
Ok(()) Ok(())
} }
#[test]
fn test_string_values() -> Result<()> {
let db = checked_memory_handle()?;
for s in [
"2013-10-07 08:23:19.120",
"2013-10-07 08:23:19.120Z",
//"2013-10-07T08:23:19.120Z", // TODO
"2013-10-07 04:23:19.120-04:00", // FIXME offset is lost!!!
] {
let result: Result<OffsetDateTime> = db.query_row("SELECT ?", [s], |r| r.get(0));
assert!(result.is_ok());
}
Ok(())
}
#[test] #[test]
fn test_sqlite_functions() -> Result<()> { fn test_sqlite_functions() -> Result<()> {
let db = checked_memory_handle()?; let db = checked_memory_handle()?;