ISAR/rusqlite
3
0
Fork 0
mirror of https://github.com/isar/rusqlite.git synced 2025-01-20 16:20:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use format_description macro

Browse Source
This commit is contained in:
gwenn 2021-06-14 21:29:24 +02:00
parent fc9f03c1ca
commit b14e326181
2 changed files with 22 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -97,7 +97,7 @@ modern-full = [
bundled-full = ["modern-full", "bundled"] bundled-full = ["modern-full", "bundled"]
[dependencies] [dependencies]
time = { version = "0.3.0-alpha-1", features = ["formatting", "parsing"], optional = true } time = { version = "0.3.0-alpha-1", features = ["formatting", "macros", "parsing"], optional = true }
bitflags = "1.2" bitflags = "1.2"
hashlink = "0.7" hashlink = "0.7"
chrono = { version = "0.4", optional = true } chrono = { version = "0.4", optional = true }

125
src/types/time.rs
View File

@ -2,108 +2,25 @@
use crate::types::{FromSql, FromSqlError, FromSqlResult, ToSql, ToSqlOutput, ValueRef}; use crate::types::{FromSql, FromSqlError, FromSqlResult, ToSql, ToSqlOutput, ValueRef};
use crate::{Error, Result}; use crate::{Error, Result};
use time::format_description::well_known::Rfc3339; use time::format_description::well_known::Rfc3339;
use time::format_description::{modifier, Component, FormatItem}; use time::format_description::FormatItem;
use time::macros::format_description;
use time::{OffsetDateTime, PrimitiveDateTime, UtcOffset}; use time::{OffsetDateTime, PrimitiveDateTime, UtcOffset};
const DATE_FORMAT: &[FormatItem<'_>] = &[ const PRIMITIVE_SHORT_DATE_TIME_FORMAT: &[FormatItem<'_>] =
FormatItem::Component(Component::Year(modifier::Year { format_description!("[year]-[month]-[day] [hour]:[minute]:[second]");
repr: modifier::YearRepr::Full, const PRIMITIVE_DATE_TIME_FORMAT: &[FormatItem<'_>] =
iso_week_based: false, format_description!("[year]-[month]-[day] [hour]:[minute]:[second].[subsecond]");
sign_is_mandatory: false, const PRIMITIVE_DATE_TIME_Z_FORMAT: &[FormatItem<'_>] =
padding: modifier::Padding::Zero, format_description!("[year]-[month]-[day] [hour]:[minute]:[second].[subsecond]Z");
})), const OFFSET_SHORT_DATE_TIME_FORMAT: &[FormatItem<'_>] = format_description!(
FormatItem::Literal(b"-"), "[year]-[month]-[day] [hour]:[minute]:[second][offset_hour sign:mandatory]:[offset_minute]"
FormatItem::Component(Component::Month(modifier::Month { );
repr: modifier::MonthRepr::Numerical, const OFFSET_DATE_TIME_FORMAT: &[FormatItem<'_>] = format_description!(
padding: modifier::Padding::Zero, "[year]-[month]-[day] [hour]:[minute]:[second].[subsecond][offset_hour sign:mandatory]:[offset_minute]"
})), );
FormatItem::Literal(b"-"), const LEGACY_DATE_TIME_FORMAT: &[FormatItem<'_>] = format_description!(
FormatItem::Component(Component::Day(modifier::Day { "[year]-[month]-[day] [hour]:[minute]:[second]:[subsecond] [offset_hour sign:mandatory]:[offset_minute]"
padding: modifier::Padding::Zero, );
})),
];
const SHORT_TIME_FORMAT: &[FormatItem<'_>] = &[
FormatItem::Component(Component::Hour(modifier::Hour {
padding: modifier::Padding::Zero,
is_12_hour_clock: false,
})),
FormatItem::Literal(b":"),
FormatItem::Component(Component::Minute(modifier::Minute {
padding: modifier::Padding::Zero,
})),
FormatItem::Literal(b":"),
FormatItem::Component(Component::Second(modifier::Second {
padding: modifier::Padding::Zero,
})),
];
const TIME_FORMAT: &[FormatItem<'_>] = &[
FormatItem::Compound(SHORT_TIME_FORMAT),
FormatItem::Literal(b"."),
FormatItem::Component(Component::Subsecond(modifier::Subsecond {
digits: modifier::SubsecondDigits::OneOrMore, // TODO SQLite supports ZeroOrMore
})),
];
const LEGACY_TIME_FORMAT: &[FormatItem<'_>] = &[
FormatItem::Compound(SHORT_TIME_FORMAT),
FormatItem::Literal(b":"), // legacy
FormatItem::Component(Component::Subsecond(modifier::Subsecond {
digits: modifier::SubsecondDigits::OneOrMore,
})),
];
const OFFSET_FORMAT: &[FormatItem<'_>] = &[
FormatItem::Component(Component::OffsetHour(modifier::OffsetHour {
sign_is_mandatory: true,
padding: modifier::Padding::Zero,
})),
FormatItem::Literal(b":"),
FormatItem::Component(Component::OffsetMinute(modifier::OffsetMinute {
padding: modifier::Padding::Zero,
})),
];
const PRIMITIVE_SHORT_DATE_TIME_FORMAT: &[FormatItem<'_>] = &[
FormatItem::Compound(DATE_FORMAT),
FormatItem::Literal(b" "), // TODO "T"
FormatItem::Compound(SHORT_TIME_FORMAT),
];
const PRIMITIVE_DATE_TIME_FORMAT: &[FormatItem<'_>] = &[
FormatItem::Compound(DATE_FORMAT),
FormatItem::Literal(b" "), // TODO "T"
FormatItem::Compound(TIME_FORMAT),
];
const PRIMITIVE_DATE_TIME_Z_FORMAT: &[FormatItem<'_>] = &[
FormatItem::Compound(DATE_FORMAT),
FormatItem::Literal(b" "), // TODO "T"
FormatItem::Compound(TIME_FORMAT),
FormatItem::Literal(b"Z"), // TODO "T"
];
const OFFSET_SHORT_DATE_TIME_FORMAT: &[FormatItem<'_>] = &[
FormatItem::Compound(DATE_FORMAT),
FormatItem::Literal(b" "), // TODO "T"
FormatItem::Compound(SHORT_TIME_FORMAT),
//FormatItem::Literal(b" "), optional
FormatItem::Compound(OFFSET_FORMAT),
];
const OFFSET_DATE_TIME_FORMAT: &[FormatItem<'_>] = &[
FormatItem::Compound(DATE_FORMAT),
FormatItem::Literal(b" "), // TODO "T"
FormatItem::Compound(TIME_FORMAT),
// FormatItem::Literal(b" "), optional
FormatItem::Compound(OFFSET_FORMAT),
];
const LEGACY_DATE_TIME_FORMAT: &[FormatItem<'_>] = &[
FormatItem::Compound(DATE_FORMAT),
FormatItem::Literal(b" "), // TODO "T"
FormatItem::Compound(LEGACY_TIME_FORMAT),
FormatItem::Literal(b" "),
FormatItem::Compound(OFFSET_FORMAT),
];
impl ToSql for OffsetDateTime { impl ToSql for OffsetDateTime {
#[inline] #[inline]
@ -151,8 +68,8 @@ impl FromSql for OffsetDateTime {
#[cfg(test)] #[cfg(test)]
mod test { mod test {
use crate::{Connection, Result}; use crate::{Connection, Result};
use time::OffsetDateTime;
use time::format_description::well_known::Rfc3339; use time::format_description::well_known::Rfc3339;
use time::OffsetDateTime;
fn checked_memory_handle() -> Result<Connection> { fn checked_memory_handle() -> Result<Connection> {
let db = Connection::open_in_memory()?; let db = Connection::open_in_memory()?;
@ -195,16 +112,16 @@ mod test {
for (s, t) in vec![ for (s, t) in vec![
( (
"2013-10-07 08:23:19.120", "2013-10-07 08:23:19.120",
Ok(OffsetDateTime::parse("2013-10-07T08:23:19.120Z", &Rfc3339).unwrap()) Ok(OffsetDateTime::parse("2013-10-07T08:23:19.120Z", &Rfc3339).unwrap()),
), ),
( (
"2013-10-07 08:23:19.120Z", "2013-10-07 08:23:19.120Z",
Ok(OffsetDateTime::parse("2013-10-07T08:23:19.120Z", &Rfc3339).unwrap()) Ok(OffsetDateTime::parse("2013-10-07T08:23:19.120Z", &Rfc3339).unwrap()),
), ),
//"2013-10-07T08:23:19.120Z", // TODO //"2013-10-07T08:23:19.120Z", // TODO
( (
"2013-10-07 04:23:19.120-04:00", "2013-10-07 04:23:19.120-04:00",
Ok(OffsetDateTime::parse("2013-10-07T04:23:19.120-04:00", &Rfc3339).unwrap()) Ok(OffsetDateTime::parse("2013-10-07T04:23:19.120-04:00", &Rfc3339).unwrap()),
), ),
] { ] {
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));