diff --git a/diesel/src/pg/types/date_and_time/chrono.rs b/diesel/src/pg/types/date_and_time/chrono.rs index 7a50741a4af5..6dc9bef95485 100644 --- a/diesel/src/pg/types/date_and_time/chrono.rs +++ b/diesel/src/pg/types/date_and_time/chrono.rs @@ -65,7 +65,7 @@ impl ToSql for NaiveDateTime { impl FromSql for DateTime { fn from_sql(bytes: PgValue<'_>) -> deserialize::Result { let naive_date_time = >::from_sql(bytes)?; - Ok(DateTime::from_utc(naive_date_time, Utc)) + Ok(Utc.from_utc_datetime(&naive_date_time)) } } diff --git a/diesel/src/sqlite/types/date_and_time/chrono.rs b/diesel/src/sqlite/types/date_and_time/chrono.rs index 5b57bea681fe..3877253a8744 100644 --- a/diesel/src/sqlite/types/date_and_time/chrono.rs +++ b/diesel/src/sqlite/types/date_and_time/chrono.rs @@ -195,7 +195,7 @@ impl FromSql for DateTime { // Fallback on assuming Utc let naive_date_time = >::from_sql(value)?; - Ok(DateTime::from_utc(naive_date_time, Utc)) + Ok(Utc.from_utc_datetime(&naive_date_time)) } } diff --git a/diesel_cli/tests/migration_generate.rs b/diesel_cli/tests/migration_generate.rs index 68ea79808485..85126edc6e5e 100644 --- a/diesel_cli/tests/migration_generate.rs +++ b/diesel_cli/tests/migration_generate.rs @@ -27,7 +27,7 @@ Creating migrations.\\d{4}-\\d{2}-\\d{2}-\\d{6}_hello.down.sql\ let captured_timestamps = Regex::new(r"(?P[\d-]*)_hello").unwrap(); let mut stamps_found = 0; for caps in captured_timestamps.captures_iter(result.stdout()) { - let timestamp = Utc.datetime_from_str(&caps["stamp"], TIMESTAMP_FORMAT); + let timestamp = NaiveDateTime::parse_from_str(&caps["stamp"], TIMESTAMP_FORMAT); assert!( timestamp.is_ok(), "Found invalid timestamp format: {:?}", diff --git a/diesel_tests/tests/schema_inference.rs b/diesel_tests/tests/schema_inference.rs index 501ab81d46f4..d8501d19f9c6 100644 --- a/diesel_tests/tests/schema_inference.rs +++ b/diesel_tests/tests/schema_inference.rs @@ -229,7 +229,7 @@ mod postgres { ts: (Bound::Included(dt), Bound::Unbounded), tstz: ( Bound::Unbounded, - Bound::Excluded(DateTime::::from_utc(dt, Utc)), + Bound::Excluded(Utc.from_utc_datetime(&dt)), ), date: (Bound::Included(dt.date()), Bound::Unbounded), }; diff --git a/diesel_tests/tests/types_roundtrip.rs b/diesel_tests/tests/types_roundtrip.rs index 1e10305ee303..746d50812beb 100644 --- a/diesel_tests/tests/types_roundtrip.rs +++ b/diesel_tests/tests/types_roundtrip.rs @@ -367,7 +367,7 @@ mod pg_types { } pub fn mk_datetime(data: (i64, u32)) -> DateTime { - DateTime::from_utc(mk_pg_naive_datetime(data), Utc) + Utc.from_utc_datetime(&mk_pg_naive_datetime(data)) } }