- Notifications
You must be signed in to change notification settings - Fork515
feat: support jiff v0.2#1217
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.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
Uh oh!
There was an error while loading.Please reload this page.
Merged
Changes fromall commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
2 changes: 2 additions & 0 deletionspostgres-types/Cargo.toml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
139 changes: 139 additions & 0 deletionspostgres-types/src/jiff_02.rs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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!(); | ||
| } |
2 changes: 2 additions & 0 deletionspostgres-types/src/lib.rs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
1 change: 1 addition & 0 deletionspostgres/Cargo.toml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
2 changes: 2 additions & 0 deletionstokio-postgres/Cargo.toml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
175 changes: 175 additions & 0 deletionstokio-postgres/tests/test/types/jiff_02.rs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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; | ||
| } |
2 changes: 2 additions & 0 deletionstokio-postgres/tests/test/types/mod.rs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.