Repository: sfackler/rust-postgres (language: rust)

Issue:
Support jiff 0.2
It's released 2 days ago


Discussion / hints:

Fix patch:
diff --git a/postgres-types/Cargo.toml b/postgres-types/Cargo.toml
index 8d56f99ec..d6527f3b9 100644
--- a/postgres-types/Cargo.toml
+++ b/postgres-types/Cargo.toml
@@ -23,6 +23,7 @@ with-eui48-1 = ["eui48-1"]
 with-geo-types-0_6 = ["geo-types-06"]
 with-geo-types-0_7 = ["geo-types-0_7"]
 with-jiff-0_1 = ["jiff-01"]
+with-jiff-0_2 = ["jiff-02"]
 with-serde_json-1 = ["serde-1", "serde_json-1"]
 with-smol_str-01 = ["smol_str-01"]
 with-uuid-0_8 = ["uuid-08"]
@@ -50,6 +51,7 @@ eui48-1 = { version = "1.0", package = "eui48", optional = true, default-feature
 geo-types-06 = { version = "0.6", package = "geo-types", optional = true }
 geo-types-0_7 = { version = "0.7", package = "geo-types", optional = true }
 jiff-01 = { version = "0.1", package = "jiff", optional = true }
+jiff-02 = { version = "0.2", package = "jiff", optional = true }
 serde-1 = { version = "1.0", package = "serde", optional = true }
 serde_json-1 = { version = "1.0", package = "serde_json", optional = true }
 uuid-08 = { version = "0.8", package = "uuid", optional = true }
diff --git a/postgres-types/src/jiff_02.rs b/postgres-types/src/jiff_02.rs
new file mode 100644
index 000000000..1db8e7239
--- /dev/null
+++ b/postgres-types/src/jiff_02.rs
@@ -0,0 +1,139 @@
+use bytes::BytesMut;
+use jiff_02::{
+    civil::{Date, DateTime, Time},
+    Span, SpanRound, Timestamp, Unit,
+};
+use postgres_protocol::types;
+use std::error::Error;
+
+use crate::{FromSql, IsNull, ToSql, Type};
+
+const fn base() -> DateTime {
+    DateTime::constant(2000, 1, 1, 0, 0, 0, 0)
+}
+
+/// The number of seconds from the Unix epoch to 2000-01-01 00:00:00 UTC.
+const PG_EPOCH: i64 = 946684800;
+
+fn base_ts() -> Timestamp {
+    Timestamp::new(PG_EPOCH, 0).unwrap()
+}
+
+fn round_us<'a>() -> SpanRound<'a> {
+    SpanRound::new().largest(Unit::Microsecond)
+}
+
+fn decode_err<E>(_e: E) -> Box<dyn Error + Sync + Send>
+where
+    E: Error,
+{
+    "value too large to decode".into()
+}
+
+fn transmit_err<E>(_e: E) -> Box<dyn Error + Sync + Send>
+where
+    E: Error,
+{
+    "value too large to transmit".into()
+}
+
+impl<'a> FromSql<'a> for DateTime {
+    fn from_sql(_: &Type, raw: &[u8]) -> Result<DateTime, Box<dyn Error + Sync + Send>> {
+        let v = types::timestamp_from_sql(raw)?;
+        Span::new()
+            .try_microseconds(v)
+            .and_then(|s| base().checked_add(s))
+            .map_err(decode_err)
+    }
+
+    accepts!(TIMESTAMP);
+}
+
+impl ToSql for DateTime {
+    fn to_sql(&self, _: &Type, w: &mut BytesMut) -> Result<IsNull, Box<dyn Error + Sync + Send>> {
+        let v = dbg!(dbg!(self.since(base())).and_then(|s| s.round(round_us().relative(base()))))
+            .map_err(transmit_err)?
+            .get_microseconds();
+        types::timestamp_to_sql(v, w);
+        Ok(IsNull::No)
+    }
+
+    accepts!(TIMESTAMP);
+    to_sql_checked!();
+}
+
+impl<'a> FromSql<'a> for Timestamp {
+    fn from_sql(_: &Type, raw: &[u8]) -> Result<Timestamp, Box<dyn Error + Sync + Send>> {
+        let v = types::timestamp_from_sql(raw)?;
+        Span::new()
+            .try_microseconds(v)
+            .and_then(|s| base_ts().checked_add(s))
+            .map_err(decode_err)
+    }
+
+    accepts!(TIMESTAMPTZ);
+}
+
+impl ToSql for Timestamp {
+    fn to_sql(&self, _: &Type, w: &mut BytesMut) -> Result<IsNull, Box<dyn Error + Sync + Send>> {
+        let v = self
+            .since(base_ts())
+            .and_then(|s| s.round(round_us()))
+            .map_err(transmit_err)?
+            .get_microseconds();
+        types::timestamp_to_sql(v, w);
+        Ok(IsNull::No)
+    }
+
+    accepts!(TIMESTAMPTZ);
+    to_sql_checked!();
+}
+
+impl<'a> FromSql<'a> for Date {
+    fn from_sql(_: &Type, raw: &[u8]) -> Result<Date, Box<dyn Error + Sync + Send>> {
+        let v = types::date_from_sql(raw)?;
+        Span::new()
+            .try_days(v)
+            .and_then(|s| base().date().checked_add(s))
+            .map_err(decode_err)
+    }
+    accepts!(DATE);
+}
+
+impl ToSql for Date {
+    fn to_sql(&self, _: &Type, w: &mut BytesMut) -> Result<IsNull, Box<dyn Error + Sync + Send>> {
+        let v = self.since(base().date()).map_err(transmit_err)?.get_days();
+        types::date_to_sql(v, w);
+        Ok(IsNull::No)
+    }
+
+    accepts!(DATE);
+    to_sql_checked!();
+}
+
+impl<'a> FromSql<'a> for Time {
+    fn from_sql(_: &Type, raw: &[u8]) -> Result<Time, Box<dyn Error + Sync + Send>> {
+        let v = types::time_from_sql(raw)?;
+        Span::new()
+            .try_microseconds(v)
+            .and_then(|s| Time::midnight().checked_add(s))
+            .map_err(decode_err)
+    }
+
+    accepts!(TIME);
+}
+
+impl ToSql for Time {
+    fn to_sql(&self, _: &Type, w: &mut BytesMut) -> Result<IsNull, Box<dyn Error + Sync + Send>> {
+        let v = self
+            .since(Time::midnight())
+            .and_then(|s| s.round(round_us()))
+            .map_err(transmit_err)?
+            .get_microseconds();
+        types::time_to_sql(v, w);
+        Ok(IsNull::No)
+    }
+
+    accepts!(TIME);
+    to_sql_checked!();
+}
diff --git a/postgres-types/src/lib.rs b/postgres-types/src/lib.rs
index db044bcbd..51137b6b4 100644
--- a/postgres-types/src/lib.rs
+++ b/postgres-types/src/lib.rs
@@ -280,6 +280,8 @@ mod geo_types_06;
 mod geo_types_07;
 #[cfg(feature = "with-jiff-0_1")]
 mod jiff_01;
+#[cfg(feature = "with-jiff-0_2")]
+mod jiff_02;
 #[cfg(feature = "with-serde_json-1")]
 mod serde_json_1;
 #[cfg(feature = "with-smol_str-01")]
diff --git a/postgres/Cargo.toml b/postgres/Cargo.toml
index c5d055c31..06f6c7ff0 100644
--- a/postgres/Cargo.toml
+++ b/postgres/Cargo.toml
@@ -31,6 +31,7 @@ with-eui48-1 = ["tokio-postgres/with-eui48-1"]
 with-geo-types-0_6 = ["tokio-postgres/with-geo-types-0_6"]
 with-geo-types-0_7 = ["tokio-postgres/with-geo-types-0_7"]
 with-jiff-0_1 = ["tokio-postgres/with-jiff-0_1"]
+with-jiff-0_2 = ["tokio-postgres/with-jiff-0_2"]
 with-serde_json-1 = ["tokio-postgres/with-serde_json-1"]
 with-smol_str-01 = ["tokio-postgres/with-smol_str-01"]
 with-uuid-0_8 = ["tokio-postgres/with-uuid-0_8"]
diff --git a/tokio-postgres/Cargo.toml b/tokio-postgres/Cargo.toml
index e9cc5fcfc..cd2b699d4 100644
--- a/tokio-postgres/Cargo.toml
+++ b/tokio-postgres/Cargo.toml
@@ -37,6 +37,7 @@ with-eui48-1 = ["postgres-types/with-eui48-1"]
 with-geo-types-0_6 = ["postgres-types/with-geo-types-0_6"]
 with-geo-types-0_7 = ["postgres-types/with-geo-types-0_7"]
 with-jiff-0_1 = ["postgres-types/with-jiff-0_1"]
+with-jiff-0_2 = ["postgres-types/with-jiff-0_2"]
 with-serde_json-1 = ["postgres-types/with-serde_json-1"]
 with-smol_str-01 = ["postgres-types/with-smol_str-01"]
 with-uuid-0_8 = ["postgres-types/with-uuid-0_8"]
@@ -85,6 +86,7 @@ eui48-1 = { version = "1.0", package = "eui48", default-features = false }
 geo-types-06 = { version = "0.6", package = "geo-types" }
 geo-types-07 = { version = "0.7", package = "geo-types" }
 jiff-01 = { version = "0.1", package = "jiff" }
+jiff-02 = { version = "0.2", package = "jiff" }
 serde-1 = { version = "1.0", package = "serde" }
 serde_json-1 = { version = "1.0", package = "serde_json" }
 smol_str-01 = { version = "0.1", package = "smol_str" }


Test patch:
diff --git a/tokio-postgres/tests/test/types/jiff_02.rs b/tokio-postgres/tests/test/types/jiff_02.rs
new file mode 100644
index 000000000..d13185589
--- /dev/null
+++ b/tokio-postgres/tests/test/types/jiff_02.rs
@@ -0,0 +1,175 @@
+use jiff_02::{
+    civil::{Date as JiffDate, DateTime, Time},
+    Timestamp as JiffTimestamp,
+};
+use std::fmt;
+use tokio_postgres::{
+    types::{Date, FromSqlOwned, Timestamp},
+    Client,
+};
+
+use crate::connect;
+use crate::types::test_type;
+
+#[tokio::test]
+async fn test_datetime_params() {
+    fn make_check(s: &str) -> (Option<DateTime>, &str) {
+        (Some(s.trim_matches('\'').parse().unwrap()), s)
+    }
+    test_type(
+        "TIMESTAMP",
+        &[
+            make_check("'1970-01-01 00:00:00.010000000'"),
+            make_check("'1965-09-25 11:19:33.100314000'"),
+            make_check("'2010-02-09 23:11:45.120200000'"),
+            (None, "NULL"),
+        ],
+    )
+    .await;
+}
+
+#[tokio::test]
+async fn test_with_special_datetime_params() {
+    fn make_check(s: &str) -> (Timestamp<DateTime>, &str) {
+        (Timestamp::Value(s.trim_matches('\'').parse().unwrap()), s)
+    }
+    test_type(
+        "TIMESTAMP",
+        &[
+            make_check("'1970-01-01 00:00:00.010000000'"),
+            make_check("'1965-09-25 11:19:33.100314000'"),
+            make_check("'2010-02-09 23:11:45.120200000'"),
+            (Timestamp::PosInfinity, "'infinity'"),
+            (Timestamp::NegInfinity, "'-infinity'"),
+        ],
+    )
+    .await;
+}
+
+#[tokio::test]
+async fn test_timestamp_params() {
+    fn make_check(s: &str) -> (Option<JiffTimestamp>, &str) {
+        (Some(s.trim_matches('\'').parse().unwrap()), s)
+    }
+    test_type(
+        "TIMESTAMP WITH TIME ZONE",
+        &[
+            make_check("'1970-01-01 00:00:00.010000000Z'"),
+            make_check("'1965-09-25 11:19:33.100314000Z'"),
+            make_check("'2010-02-09 23:11:45.120200000Z'"),
+            (None, "NULL"),
+        ],
+    )
+    .await;
+}
+
+#[tokio::test]
+async fn test_with_special_timestamp_params() {
+    fn make_check(s: &str) -> (Timestamp<JiffTimestamp>, &str) {
+        (Timestamp::Value(s.trim_matches('\'').parse().unwrap()), s)
+    }
+    test_type(
+        "TIMESTAMP WITH TIME ZONE",
+        &[
+            make_check("'1970-01-01 00:00:00.010000000Z'"),
+            make_check("'1965-09-25 11:19:33.100314000Z'"),
+            make_check("'2010-02-09 23:11:45.120200000Z'"),
+            (Timestamp::PosInfinity, "'infinity'"),
+            (Timestamp::NegInfinity, "'-infinity'"),
+        ],
+    )
+    .await;
+}
+
+#[tokio::test]
+async fn test_date_params() {
+    fn make_check(s: &str) -> (Option<JiffDate>, &str) {
+        (Some(s.trim_matches('\'').parse().unwrap()), s)
+    }
+    test_type(
+        "DATE",
+        &[
+            make_check("'1970-01-01'"),
+            make_check("'1965-09-25'"),
+            make_check("'2010-02-09'"),
+            (None, "NULL"),
+        ],
+    )
+    .await;
+}
+
+#[tokio::test]
+async fn test_with_special_date_params() {
+    fn make_check(s: &str) -> (Date<JiffDate>, &str) {
+        (Date::Value(s.trim_matches('\'').parse().unwrap()), s)
+    }
+    test_type(
+        "DATE",
+        &[
+            make_check("'1970-01-01'"),
+            make_check("'1965-09-25'"),
+            make_check("'2010-02-09'"),
+            (Date::PosInfinity, "'infinity'"),
+            (Date::NegInfinity, "'-infinity'"),
+        ],
+    )
+    .await;
+}
+
+#[tokio::test]
+async fn test_time_params() {
+    fn make_check(s: &str) -> (Option<Time>, &str) {
+        (Some(s.trim_matches('\'').parse().unwrap()), s)
+    }
+    test_type(
+        "TIME",
+        &[
+            make_check("'00:00:00.010000000'"),
+            make_check("'11:19:33.100314000'"),
+            make_check("'23:11:45.120200000'"),
+            (None, "NULL"),
+        ],
+    )
+    .await;
+}
+
+#[tokio::test]
+async fn test_special_params_without_wrapper() {
+    async fn assert_overflows<T>(client: &mut Client, val: &str, sql_type: &str)
+    where
+        T: FromSqlOwned + fmt::Debug,
+    {
+        let err = client
+            .query_one(&*format!("SELECT {}::{}", val, sql_type), &[])
+            .await
+            .unwrap()
+            .try_get::<_, T>(0)
+            .unwrap_err();
+
+        assert_eq!(
+            err.to_string(),
+            "error deserializing column 0: value too large to decode"
+        );
+
+        let err = client
+            .query_one(&*format!("SELECT {}::{}", val, sql_type), &[])
+            .await
+            .unwrap()
+            .try_get::<_, T>(0)
+            .unwrap_err();
+
+        assert_eq!(
+            err.to_string(),
+            "error deserializing column 0: value too large to decode"
+        );
+    }
+
+    let mut client = connect("user=postgres").await;
+
+    assert_overflows::<DateTime>(&mut client, "'-infinity'", "timestamp").await;
+    assert_overflows::<DateTime>(&mut client, "'infinity'", "timestamp").await;
+    assert_overflows::<JiffTimestamp>(&mut client, "'-infinity'", "timestamptz").await;
+    assert_overflows::<JiffTimestamp>(&mut client, "'infinity'", "timestamptz").await;
+    assert_overflows::<JiffDate>(&mut client, "'-infinity'", "date").await;
+    assert_overflows::<JiffDate>(&mut client, "'infinity'", "date").await;
+}
diff --git a/tokio-postgres/tests/test/types/mod.rs b/tokio-postgres/tests/test/types/mod.rs
index 875164c3b..41c4a8899 100644
--- a/tokio-postgres/tests/test/types/mod.rs
+++ b/tokio-postgres/tests/test/types/mod.rs
@@ -25,6 +25,8 @@ mod geo_types_06;
 mod geo_types_07;
 #[cfg(feature = "with-jiff-0_1")]
 mod jiff_01;
+#[cfg(feature = "with-jiff-0_2")]
+mod jiff_02;
 #[cfg(feature = "with-serde_json-1")]
 mod serde_json_1;
 #[cfg(feature = "with-smol_str-01")]