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

implements std::ops::Range to Multirange toSql #4182

Merged
merged 1 commit into from
Aug 23, 2024
Merged

implements std::ops::Range to Multirange toSql #4182

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
4 changes: 2 additions & 2 deletions diesel/src/pg/types/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,8 +178,8 @@ pub mod sql_types {
///
/// ### [`ToSql`] impls
///
/// - [`Vec<(Bound<T>, Bound<T>)>`][Vec] for any `T` which implements `ToSql<ST>`
/// - [`&[T]`][slice] for any `T` which implements `ToSql<ST>`
/// - [`Vec<T>`][Vec] for any `T` which `Range<T>` implements `ToSql<ST>`
/// - [`&[T]`][slice] for any `T` which `Range<T>` implements `ToSql<ST>`
///
/// ### [`FromSql`] impls
///
Expand Down
153 changes: 110 additions & 43 deletions diesel/src/pg/types/multirange.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,27 @@ macro_rules! multirange_as_expression {
};
}

multirange_as_expression!(&'a [(Bound<T>, Bound<T>)], Multirange<ST>);
multirange_as_expression!(&'a [(Bound<T>, Bound<T>)], Nullable<Multirange<ST>>);
multirange_as_expression!(&'a &'b [(Bound<T>, Bound<T>)], Multirange<ST>);
multirange_as_expression!(&'a &'b [(Bound<T>, Bound<T>)], Nullable<Multirange<ST>>);
multirange_as_expression!(Vec<(Bound<T>, Bound<T>)>, Multirange<ST>);
multirange_as_expression!(Vec<(Bound<T>, Bound<T>)>, Nullable<Multirange<ST>>);
multirange_as_expression!(&'a Vec<(Bound<T>, Bound<T>)>, Multirange<ST>);
multirange_as_expression!(&'a Vec<(Bound<T>, Bound<T>)>, Nullable<Multirange<ST>>);
multirange_as_expression!(&'a &'b Vec<(Bound<T>, Bound<T>)>, Multirange<ST>);
multirange_as_expression!(&'a &'b Vec<(Bound<T>, Bound<T>)>, Nullable<Multirange<ST>>);
macro_rules! multirange_as_expressions {
($ty:ty) => {
multirange_as_expression!(&'a [$ty], Multirange<ST>);
multirange_as_expression!(&'a [$ty], Nullable<Multirange<ST>>);
multirange_as_expression!(&'a &'b [$ty], Multirange<ST>);
multirange_as_expression!(&'a &'b [$ty], Nullable<Multirange<ST>>);
multirange_as_expression!(Vec<$ty>, Multirange<ST>);
multirange_as_expression!(Vec<$ty>, Nullable<Multirange<ST>>);
multirange_as_expression!(&'a Vec<$ty>, Multirange<ST>);
multirange_as_expression!(&'a Vec<$ty>, Nullable<Multirange<ST>>);
multirange_as_expression!(&'a &'b Vec<$ty>, Multirange<ST>);
multirange_as_expression!(&'a &'b Vec<$ty>, Nullable<Multirange<ST>>);
};
}

multirange_as_expressions!((Bound<T>, Bound<T>));
multirange_as_expressions!(std::ops::Range<T>);
multirange_as_expressions!(std::ops::RangeInclusive<T>);
multirange_as_expressions!(std::ops::RangeToInclusive<T>);
multirange_as_expressions!(std::ops::RangeFrom<T>);
multirange_as_expressions!(std::ops::RangeTo<T>);

#[cfg(feature = "postgres_backend")]
impl<T, ST> FromSql<Multirange<ST>, Pg> for Vec<(Bound<T>, Bound<T>)>
Expand All @@ -74,59 +85,115 @@ where
}
}

#[cfg(feature = "postgres_backend")]
impl<T, ST> ToSql<Multirange<ST>, Pg> for [(Bound<T>, Bound<T>)]
fn to_sql<'c, ST, T, I>(iter: I, out: &mut Output<'_, '_, Pg>) -> serialize::Result
where
T: ToSql<ST, Pg>,
ST: 'static,
T: ToSql<ST, Pg> + 'c,
I: Iterator<Item = (Bound<&'c T>, Bound<&'c T>)> + ExactSizeIterator,
{
fn to_sql<'b>(&'b self, out: &mut Output<'b, '_, Pg>) -> serialize::Result {
out.write_u32::<NetworkEndian>(self.len().try_into()?)?;
out.write_u32::<NetworkEndian>(iter.len().try_into()?)?;

let mut buffer = Vec::new();
for value in self {
{
let mut inner_buffer = Output::new(ByteWrapper(&mut buffer), out.metadata_lookup());
ToSql::<Range<ST>, Pg>::to_sql(&value, &mut inner_buffer)?;
}
let buffer_len: i32 = buffer.len().try_into()?;
out.write_i32::<NetworkEndian>(buffer_len)?;
out.write_all(&buffer)?;
buffer.clear();
let mut buffer = Vec::new();
for value in iter {
{
let mut inner_buffer = Output::new(ByteWrapper(&mut buffer), out.metadata_lookup());
ToSql::<Range<ST>, Pg>::to_sql(&value, &mut inner_buffer)?;
}

Ok(IsNull::No)
let buffer_len: i32 = buffer.len().try_into()?;
out.write_i32::<NetworkEndian>(buffer_len)?;
out.write_all(&buffer)?;
buffer.clear();
}

Ok(IsNull::No)
}

#[cfg(feature = "postgres_backend")]
impl<T, ST> ToSql<Multirange<ST>, Pg> for Vec<(Bound<T>, Bound<T>)>
impl<T, ST> ToSql<Multirange<ST>, Pg> for [(Bound<T>, Bound<T>)]
where
T: ToSql<ST, Pg>,
[(Bound<T>, Bound<T>)]: ToSql<Multirange<ST>, Pg>,
{
fn to_sql<'b>(&'b self, out: &mut Output<'b, '_, Pg>) -> serialize::Result {
ToSql::<Multirange<ST>, Pg>::to_sql(self.as_slice(), out)
to_sql(self.iter().map(|r| (r.0.as_ref(), r.1.as_ref())), out)
}
}

impl<T, ST> ToSql<Nullable<Multirange<ST>>, Pg> for [(Bound<T>, Bound<T>)]
#[cfg(feature = "postgres_backend")]
impl<T, ST> ToSql<Multirange<ST>, Pg> for Vec<(Bound<T>, Bound<T>)>
where
ST: 'static,
[(Bound<T>, Bound<T>)]: ToSql<ST, Pg>,
T: ToSql<ST, Pg>,
[(Bound<T>, Bound<T>)]: ToSql<Multirange<ST>, Pg>,
{
fn to_sql<'b>(&'b self, out: &mut Output<'b, '_, Pg>) -> serialize::Result {
ToSql::<Multirange<ST>, Pg>::to_sql(self, out)
ToSql::<Multirange<ST>, Pg>::to_sql(self.as_slice(), out)
}
}

impl<T, ST> ToSql<Nullable<Multirange<ST>>, Pg> for Vec<(Bound<T>, Bound<T>)>
where
ST: 'static,
Vec<(Bound<T>, Bound<T>)>: ToSql<ST, Pg>,
T: ToSql<ST, Pg>,
{
fn to_sql<'b>(&'b self, out: &mut Output<'b, '_, Pg>) -> serialize::Result {
ToSql::<Multirange<ST>, Pg>::to_sql(self, out)
}
use std::ops::RangeBounds;
macro_rules! multirange_std_to_sql {
($ty:ty) => {
#[cfg(feature = "postgres_backend")]
impl<ST, T> ToSql<Multirange<ST>, Pg> for [$ty]
where
ST: 'static,
T: ToSql<ST, Pg>,
{
fn to_sql<'b>(&'b self, out: &mut Output<'b, '_, Pg>) -> serialize::Result {
to_sql(
self.into_iter().map(|r| (r.start_bound(), r.end_bound())),
out,
)
}
}

#[cfg(feature = "postgres_backend")]
impl<T, ST> ToSql<Multirange<ST>, Pg> for Vec<$ty>
where
T: ToSql<ST, Pg>,
[$ty]: ToSql<Multirange<ST>, Pg>,
{
fn to_sql<'b>(&'b self, out: &mut Output<'b, '_, Pg>) -> serialize::Result {
ToSql::<Multirange<ST>, Pg>::to_sql(self.as_slice(), out)
}
}
};
}

multirange_std_to_sql!(std::ops::Range<T>);
multirange_std_to_sql!(std::ops::RangeInclusive<T>);
multirange_std_to_sql!(std::ops::RangeFrom<T>);
multirange_std_to_sql!(std::ops::RangeTo<T>);
multirange_std_to_sql!(std::ops::RangeToInclusive<T>);

macro_rules! multirange_to_sql_nullable {
($ty:ty) => {
impl<T, ST> ToSql<Nullable<Multirange<ST>>, Pg> for [$ty]
where
ST: 'static,
[$ty]: ToSql<ST, Pg>,
T: ToSql<ST, Pg>,
{
fn to_sql<'b>(&'b self, out: &mut Output<'b, '_, Pg>) -> serialize::Result {
ToSql::<Multirange<ST>, Pg>::to_sql(self, out)
}
}

impl<T, ST> ToSql<Nullable<Multirange<ST>>, Pg> for Vec<$ty>
where
ST: 'static,
Vec<$ty>: ToSql<ST, Pg>,
T: ToSql<ST, Pg>,
{
fn to_sql<'b>(&'b self, out: &mut Output<'b, '_, Pg>) -> serialize::Result {
ToSql::<Multirange<ST>, Pg>::to_sql(self, out)
}
}
};
}

multirange_to_sql_nullable!((Bound<T>, Bound<T>));
multirange_to_sql_nullable!(std::ops::Range<T>);
multirange_to_sql_nullable!(std::ops::RangeInclusive<T>);
multirange_to_sql_nullable!(std::ops::RangeFrom<T>);
multirange_to_sql_nullable!(std::ops::RangeTo<T>);
multirange_to_sql_nullable!(std::ops::RangeToInclusive<T>);
7 changes: 7 additions & 0 deletions diesel_tests/tests/types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1534,6 +1534,13 @@ fn test_multirange_to_sql() {
Multirange<Int4>,
Vec<(Bound<i32>, Bound<i32>)>,
>(expected_value, value));

let expected_value = "'{[5,8)}'::int4multirange";
let value = vec![5..8];
assert!(query_to_sql_equality::<
Multirange<Int4>,
Vec<(std::ops::Range<i32>)>,
>(expected_value, value));
}

#[cfg(feature = "postgres")]
Expand Down
Loading