Merge pull request #3781 from weiznich/fix/chrono

Remove usage of deprecated chrono functions

Author: pksunkara

diesel/src/pg/types/date_and_time/chrono.rs

@@ -65,7 +65,7 @@ impl ToSql<Timestamptz, Pg> for NaiveDateTime {
 impl FromSql<Timestamptz, Pg> for DateTime<Utc> {
     fn from_sql(bytes: PgValue<'_>) -> deserialize::Result<Self> {
         let naive_date_time = <NaiveDateTime as FromSql<Timestamptz, Pg>>::from_sql(bytes)?;
-        Ok(DateTime::from_utc(naive_date_time, Utc))
+        Ok(Utc.from_utc_datetime(&naive_date_time))
     }
 }
 

diesel/src/sqlite/types/date_and_time/chrono.rs

@@ -195,7 +195,7 @@ impl FromSql<TimestamptzSqlite, Sqlite> for DateTime<Utc> {
         // Fallback on assuming Utc
         let naive_date_time =
             <NaiveDateTime as FromSql<TimestamptzSqlite, Sqlite>>::from_sql(value)?;
-        Ok(DateTime::from_utc(naive_date_time, Utc))
+        Ok(Utc.from_utc_datetime(&naive_date_time))
     }
 }
 

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<stamp>[\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: {:?}",

diesel_tests/tests/schema_inference.rs

@@ -229,7 +229,7 @@ mod postgres {
             ts: (Bound::Included(dt), Bound::Unbounded),
             tstz: (
                 Bound::Unbounded,
-                Bound::Excluded(DateTime::<Utc>::from_utc(dt, Utc)),
+                Bound::Excluded(Utc.from_utc_datetime(&dt)),
             ),
             date: (Bound::Included(dt.date()), Bound::Unbounded),
         };

diesel_tests/tests/types_roundtrip.rs

@@ -367,7 +367,7 @@ mod pg_types {
     }
 
     pub fn mk_datetime(data: (i64, u32)) -> DateTime<Utc> {
-        DateTime::from_utc(mk_pg_naive_datetime(data), Utc)
+        Utc.from_utc_datetime(&mk_pg_naive_datetime(data))
     }
 }