Skip to content

Apply timezone when mapping from Timestamp to chrono Date and DateTime #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Apply timezone when mapping from Timestamp to chrono Date and DateTime #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 24 additions & 4 deletions src/sql_type/chrono.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,24 @@ where
impl FromSql for DateTime<Utc> {
fn from_sql(val: &SqlValue) -> Result<DateTime<Utc>> {
let ts = val.to_timestamp()?;
datetime_from_sql(&Utc, &ts)
if ts.with_tz() {
datetime_from_sql(&fixed_offset_from_sql(&ts)?, &ts)
.map(|val| val.with_timezone(&Utc))
} else {
datetime_from_sql(&Utc, &ts)
}
}
}

impl FromSql for DateTime<Local> {
fn from_sql(val: &SqlValue) -> Result<DateTime<Local>> {
let ts = val.to_timestamp()?;
datetime_from_sql(&Local, &ts)
if ts.with_tz() {
datetime_from_sql(&fixed_offset_from_sql(&ts)?, &ts)
.map(|val| val.with_timezone(&Local))
} else {
datetime_from_sql(&Local, &ts)
}
}
}

Expand Down Expand Up @@ -144,15 +154,25 @@ where
impl FromSql for Date<Utc> {
fn from_sql(val: &SqlValue) -> Result<Date<Utc>> {
let ts = val.to_timestamp()?;
date_from_sql(&Utc, &ts)
if ts.with_tz() {
date_from_sql(&fixed_offset_from_sql(&ts)?, &ts)
.map(|val| val.with_timezone(&Utc))
} else {
date_from_sql(&Utc, &ts)
}
}
}

#[allow(deprecated)]
impl FromSql for Date<Local> {
fn from_sql(val: &SqlValue) -> Result<Date<Local>> {
let ts = val.to_timestamp()?;
date_from_sql(&Local, &ts)
if ts.with_tz() {
date_from_sql(&fixed_offset_from_sql(&ts)?, &ts)
.map(|val| val.with_timezone(&Local))
} else {
date_from_sql(&Local, &ts)
}
}
}

Expand Down
26 changes: 18 additions & 8 deletions tests/from_to_sql.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -887,17 +887,27 @@ mod chrono {
&dttm
);

// TIMESTAMP WITH TIME ZONE -> DateTime<Utc> TZ is ignored.
let dttm = Utc.ymd(2012, 3, 4).and_hms_nano(5, 6, 7, 123456789);
// TIMESTAMP WITH TIME ZONE -> DateTime<Utc> TZ is mapped.
let dttm = Utc.ymd(2012, 3, 4).and_hms_nano(4, 6, 7, 123456789);
test_from_sql!(&conn,
"TO_TIMESTAMP_TZ('2012-03-04 05:06:07.123456789 +01:00', 'YYYY-MM-DD HH24:MI:SS.FF9 TZH:TZM')",
&OracleType::TimestampTZ(9), &dttm);

// TIMESTAMP WITH TIME ZONE -> DateTime<Local> TZ is ignored.
// TIMESTAMP WITH TIME ZONE -> DateTime<Local> TZ is mapped.
let dttm = Local.ymd(2012, 3, 4).and_hms_nano(5, 6, 7, 123456789);
test_from_sql!(&conn,
"TO_TIMESTAMP_TZ('2012-03-04 05:06:07.123456789 +01:00', 'YYYY-MM-DD HH24:MI:SS.FF9 TZH:TZM')",
&OracleType::TimestampTZ(9), &dttm);
let tz_offset = dttm.offset().fix().local_minus_utc();
let tz_sign = if tz_offset >= 0 { '+' } else { '-' };
let tz_hour = tz_offset.abs() / 3600;
let tz_min = tz_offset.abs() % 3600 / 60;
test_from_sql!(
&conn,
&format!(
"TO_TIMESTAMP_TZ('2012-03-04 05:06:07.123456789 {}{:02}:{:02}', 'YYYY-MM-DD HH24:MI:SS.FF9 TZH:TZM')",
tz_sign, tz_hour, tz_min
),
&OracleType::TimestampTZ(9),
&dttm
);

// TIMESTAMP WITH TIME ZONE -> DateTime<Fixed_Utc> TZ is set.
let dttm = fixed_cet.ymd(2012, 3, 4).and_hms_nano(5, 6, 7, 123456789);
Expand Down Expand Up @@ -1015,13 +1025,13 @@ mod chrono {
&dttm
);

// TIMESTAMP WITH TIME ZONE -> Date<Utc> TZ is ignored.
// TIMESTAMP WITH TIME ZONE -> Date<Utc> TZ is mapped.
let dttm = Utc.ymd(2012, 3, 4);
test_from_sql!(&conn,
"TO_TIMESTAMP_TZ('2012-03-04 05:06:07.123456789 +01:00', 'YYYY-MM-DD HH24:MI:SS.FF9 TZH:TZM')",
&OracleType::TimestampTZ(9), &dttm);

// TIMESTAMP WITH TIME ZONE -> Date<Local> TZ is ignored.
// TIMESTAMP WITH TIME ZONE -> Date<Local> TZ is mapped.
let dttm = Local.ymd(2012, 3, 4);
test_from_sql!(&conn,
"TO_TIMESTAMP_TZ('2012-03-04 05:06:07.123456789 +01:00', 'YYYY-MM-DD HH24:MI:SS.FF9 TZH:TZM')",
Expand Down