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 
Reveal bugs
This commit is contained in:
gwenn 2021-06-12 12:04:10 +02:00
parent 78e4036f90
commit 5baaa9a224
1 changed files with 66 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
src/types/time.rs
View File

@ -1,18 +1,15 @@
//! [`ToSql`] and [`FromSql`] implementation for [`time::OffsetDateTime`]. //! [`ToSql`] and [`FromSql`] implementation for [`time::OffsetDateTime`].
use crate::types::{FromSql, FromSqlError, FromSqlResult, ToSql, ToSqlOutput, ValueRef}; use crate::types::{FromSql, FromSqlError, FromSqlResult, ToSql, ToSqlOutput, ValueRef};
use crate::Result; use crate::Result;
use time::{OffsetDateTime, PrimitiveDateTime, UtcOffset}; use time::{Format, OffsetDateTime, PrimitiveDateTime, UtcOffset};
const CURRENT_TIMESTAMP_FMT: &str = "%Y-%m-%d %H:%M:%S";
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";
impl ToSql for OffsetDateTime { impl ToSql for OffsetDateTime {
#[inline] #[inline]
fn to_sql(&self) -> Result<ToSqlOutput<'_>> { fn to_sql(&self) -> Result<ToSqlOutput<'_>> {
// FIXME keep original offset // FIXME keep original offset
let time_string = self.to_offset(UtcOffset::UTC).format(SQLITE_DATETIME_Z_FMT); let time_string = self
.to_offset(UtcOffset::UTC)
.format("%Y-%m-%d %H:%M:%S.%NZ");
Ok(ToSqlOutput::from(time_string)) Ok(ToSqlOutput::from(time_string))
} }
} }
@ -21,18 +18,33 @@ impl FromSql for OffsetDateTime {
fn column_result(value: ValueRef<'_>) -> FromSqlResult<Self> { fn column_result(value: ValueRef<'_>) -> FromSqlResult<Self> {
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()), len if len <= 10 => PrimitiveDateTime::parse(s, "%Y-%m-%d").map(|d| d.assume_utc()),
len if len <= 19 => {
// TODO YYYY-MM-DDTHH:MM:SS
PrimitiveDateTime::parse(s, "%Y-%m-%d %H:%M:%S").map(|d| d.assume_utc())
}
_ if s.ends_with('Z') => {
// TODO YYYY-MM-DDTHH:MM:SS.SSS
// FIXME time bug: %N specifier doesn't parse millis correctly (https://github.com/time-rs/time/issues/329)
PrimitiveDateTime::parse(s, "%Y-%m-%d %H:%M:%S.%NZ").map(|d| d.assume_utc())
}
_ if s.as_bytes()[10] == b'T' => {
// YYYY-MM-DDTHH:MM:SS.SSS[+-]HH:MM
OffsetDateTime::parse(s, Format::Rfc3339)
}
_ if s.as_bytes()[19] == b':' => {
// legacy
// FIXME time bug: %N specifier doesn't parse millis correctly (https://github.com/time-rs/time/issues/329)
OffsetDateTime::parse(s, "%Y-%m-%d %H:%M:%S:%N %z")
}
_ => { _ => {
let format = if s.ends_with('Z') { // FIXME time bug: %N specifier doesn't parse millis correctly (https://github.com/time-rs/time/issues/329)
SQLITE_DATETIME_Z_FMT // FIXME time bug: %z does not support ':' (https://github.com/time-rs/time/issues/241)
} else { OffsetDateTime::parse(s, "%Y-%m-%d %H:%M:%S.%N%z").or_else(|err| {
SQLITE_DATETIME_FMT PrimitiveDateTime::parse(s, "%Y-%m-%d %H:%M:%S.%N")
}; .map(|d| d.assume_utc())
PrimitiveDateTime::parse(s, format) .map_err(|_| err)
.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)))
@ -44,7 +56,7 @@ impl FromSql for OffsetDateTime {
mod test { mod test {
use crate::{Connection, Result}; use crate::{Connection, Result};
use std::time::Duration; use std::time::Duration;
use time::OffsetDateTime; use time::{date, offset, OffsetDateTime, Time};
fn checked_memory_handle() -> Result<Connection> { fn checked_memory_handle() -> Result<Connection> {
let db = Connection::open_in_memory()?; let db = Connection::open_in_memory()?;
@ -83,14 +95,44 @@ mod test {
#[test] #[test]
fn test_string_values() -> Result<()> { fn test_string_values() -> Result<()> {
let db = checked_memory_handle()?; let db = checked_memory_handle()?;
for s in [ for (s, t) in vec![
"2013-10-07 08:23:19.120", (
"2013-10-07 08:23:19.120Z", "2013-10-07 08:23:19.120",
Ok(date!(2013 - 10 - 07)
.with_time(
Time::/*FIXME time bug try_from_hms_milli*/try_from_hms_nano(
8, 23, 19, 120,
)
.unwrap(),
)
.assume_utc()),
),
(
"2013-10-07 08:23:19.120Z",
Ok(date!(2013 - 10 - 07)
.with_time(
Time::/*FIXME time bug try_from_hms_milli*/try_from_hms_nano(
8, 23, 19, 120,
)
.unwrap(),
)
.assume_utc()),
),
//"2013-10-07T08:23:19.120Z", // TODO //"2013-10-07T08:23:19.120Z", // TODO
"2013-10-07 04:23:19.120-04:00", // FIXME offset is lost!!! (
"2013-10-07 04:23:19.120-04:00",
Ok(date!(2013 - 10 - 07)
.with_time(
Time::/*FIXME time bug try_from_hms_milli*/try_from_hms_nano(
4, 23, 19, 120,
)
.unwrap(),
)
.assume_offset(offset!(-4))),
),
] { ] {
let result: Result<OffsetDateTime> = db.query_row("SELECT ?", [s], |r| r.get(0)); let result: Result<OffsetDateTime> = db.query_row("SELECT ?", [s], |r| r.get(0));
assert!(result.is_ok()); assert_eq!(result, t);
} }
Ok(()) Ok(())
} }