Skip to content
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

Jump to bottom

Fix new deprecated functions from chrono 0.4.35 #3953

Merged
merged 1 commit into from
Mar 7, 2024
Merged

Fix new deprecated functions from chrono 0.4.35 #3953

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
5 changes: 3 additions & 2 deletions diesel/src/mysql/types/date_and_time/chrono.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ impl ToSql<Timestamp, Mysql> for NaiveDateTime {
hour: self.hour() as libc::c_uint,
minute: self.minute() as libc::c_uint,
second: self.second() as libc::c_uint,
#[allow(deprecated)] // otherwise we would need to bump our minimal chrono version
second_part: libc::c_ulong::from(self.timestamp_subsec_micros()),
neg: false,
time_type: MysqlTimestampType::MYSQL_TIMESTAMP_DATETIME,
Expand Down Expand Up @@ -162,11 +163,11 @@ mod tests {
#[test]
fn times_relative_to_now_encode_correctly() {
let connection = &mut connection();
let time = Utc::now().naive_utc() + Duration::days(1);
let time = Utc::now().naive_utc() + Duration::try_days(1).unwrap();
let query = select(now.lt(time));
assert!(query.get_result::<bool>(connection).unwrap());

let time = Utc::now().naive_utc() - Duration::days(1);
let time = Utc::now().naive_utc() - Duration::try_days(1).unwrap();
let query = select(now.gt(time));
assert!(query.get_result::<bool>(connection).unwrap());
}
Expand Down
8 changes: 5 additions & 3 deletions diesel/src/pg/types/date_and_time/chrono.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,9 @@ impl ToSql<Date, Pg> for NaiveDate {
impl FromSql<Date, Pg> for NaiveDate {
fn from_sql(bytes: PgValue<'_>) -> deserialize::Result<Self> {
let PgDate(offset) = FromSql::<Date, Pg>::from_sql(bytes)?;
match pg_epoch_date().checked_add_signed(Duration::days(i64::from(offset))) {
#[allow(deprecated)] // otherwise we would need to bump our minimal chrono version
let duration = Duration::days(i64::from(offset));
match pg_epoch_date().checked_add_signed(duration) {
Some(date) => Ok(date),
None => {
let error_message = format!(
Expand Down Expand Up @@ -205,11 +207,11 @@ mod tests {
#[test]
fn times_relative_to_now_encode_correctly() {
let connection = &mut connection();
let time = Utc::now().naive_utc() + Duration::seconds(60);
let time = Utc::now().naive_utc() + Duration::try_seconds(60).unwrap();
let query = select(now.at_time_zone("utc").lt(time));
assert!(query.get_result::<bool>(connection).unwrap());

let time = Utc::now().naive_utc() - Duration::seconds(60);
let time = Utc::now().naive_utc() - Duration::try_seconds(60).unwrap();
let query = select(now.at_time_zone("utc").gt(time));
assert!(query.get_result::<bool>(connection).unwrap());
}
Expand Down
5 changes: 3 additions & 2 deletions diesel/src/sqlite/types/date_and_time/chrono.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ fn parse_julian(julian_days: f64) -> Option<NaiveDateTime> {
let timestamp = (julian_days - EPOCH_IN_JULIAN_DAYS) * SECONDS_IN_DAY;
let seconds = timestamp as i64;
let nanos = (timestamp.fract() * 1E9) as u32;
#[allow(deprecated)] // otherwise we would need to bump our minimal chrono version
NaiveDateTime::from_timestamp_opt(seconds, nanos)
}

Expand Down Expand Up @@ -325,11 +326,11 @@ mod tests {
#[test]
fn times_relative_to_now_encode_correctly() {
let connection = &mut connection();
let time = Utc::now().naive_utc() + Duration::seconds(60);
let time = Utc::now().naive_utc() + Duration::try_seconds(60).unwrap();
let query = select(now.lt(time));
assert_eq!(Ok(true), query.get_result(connection));

let time = Utc::now().naive_utc() - Duration::seconds(600);
let time = Utc::now().naive_utc() - Duration::try_seconds(600).unwrap();
let query = select(now.gt(time));
assert_eq!(Ok(true), query.get_result(connection));
}
Expand Down
20 changes: 11 additions & 9 deletions diesel_tests/tests/types_roundtrip.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@ mod mysql_types {
t.hour(),
t.minute(),
t.second(),
t.timestamp_subsec_micros() as _,
t.and_utc().timestamp_subsec_micros() as _,
false,
MysqlTimestampType::MYSQL_TIMESTAMP_DATETIME,
0,
Expand All @@ -481,7 +481,7 @@ mod mysql_types {
t.hour(),
t.minute(),
t.second(),
t.timestamp_subsec_micros() as _,
t.and_utc().timestamp_subsec_micros() as _,
false,
MysqlTimestampType::MYSQL_TIMESTAMP_DATETIME,
0,
Expand All @@ -508,10 +508,12 @@ mod mysql_types {
.unwrap();

if seconds != 0 {
seconds = earliest_mysql_date.timestamp()
+ ((latest_mysql_date.timestamp() - earliest_mysql_date.timestamp()) % seconds);
seconds = earliest_mysql_date.and_utc().timestamp()
+ ((latest_mysql_date.and_utc().timestamp()
- earliest_mysql_date.and_utc().timestamp())
% seconds);
} else {
seconds = earliest_mysql_date.timestamp();
seconds = earliest_mysql_date.and_utc().timestamp();
}

let r = mk_naive_datetime((seconds, nanos));
Expand Down Expand Up @@ -607,7 +609,7 @@ pub fn mk_naive_datetime((mut secs, mut nano): (i64, u32)) -> NaiveDateTime {
break;
}

NaiveDateTime::from_timestamp_opt(secs, nano).unwrap()
DateTime::from_timestamp(secs, nano).unwrap().naive_utc()
}

pub fn mk_naive_time((mut seconds, mut nano): (u32, u32)) -> NaiveTime {
Expand Down Expand Up @@ -647,7 +649,7 @@ pub fn mk_naive_date(days: u32) -> NaiveDate {
let num_days_representable = latest_chrono_date
.signed_duration_since(earliest_pg_date)
.num_days();
earliest_pg_date + Duration::days(days as i64 % num_days_representable)
earliest_pg_date + Duration::try_days(days as i64 % num_days_representable).unwrap()
}

#[cfg(feature = "mysql")]
Expand All @@ -657,7 +659,7 @@ pub fn mk_naive_date(days: u32) -> NaiveDate {
let num_days_representable = latest_mysql_date
.signed_duration_since(earliest_mysql_date)
.num_days();
earliest_mysql_date + Duration::days(days as i64 % num_days_representable)
earliest_mysql_date + Duration::try_days(days as i64 % num_days_representable).unwrap()
}

#[cfg(feature = "sqlite")]
Expand All @@ -667,7 +669,7 @@ pub fn mk_naive_date(days: u32) -> NaiveDate {
let num_days_representable = latest_sqlite_date
.signed_duration_since(earliest_sqlite_date)
.num_days();
earliest_sqlite_date + Duration::days(days as i64 % num_days_representable)
earliest_sqlite_date + Duration::try_days(days as i64 % num_days_representable).unwrap()
}

#[derive(Debug, Clone, Copy)]
Expand Down
Loading