Skip to content

fix(join!): joining with tables having composite primary keys #21

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

Merged
paolobarbolini merged 1 commit into from
Aug 26, 2025
Merged

fix(join!): joining with tables having composite primary keys #21

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 benzina-derive/src/join/utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ impl<T: ToTokens> ToTokens for Identifiable<T> {
fn to_tokens(&self, tokens: &mut TokenStream) {
let Self { table } = self;
tokens.extend(quote! {
::benzina::__private::std::clone::Clone::clone(
<_ as ::benzina::__private::diesel::associations::Identifiable>::id(&#table)
::benzina::__private::deep_clone::DeepClone::deep_clone(
&(<_ as ::benzina::__private::diesel::associations::Identifiable>::id(&#table),)
)
});
}
Expand Down
50 changes: 50 additions & 0 deletions benzina/src/__private.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,53 @@ pub type IndexMap<K, V> = indexmap::IndexMap<K, V, Hasher>;
pub fn new_indexmap<K, V>() -> IndexMap<K, V> {
IndexMap::with_hasher(Hasher::default())
}

pub mod deep_clone {
pub trait DeepClone {
type Output;

fn deep_clone(&self) -> Self::Output;
}

impl<T: Clone> DeepClone for &T {
type Output = T;

fn deep_clone(&self) -> Self::Output {
(*self).clone()
}
}

#[rustfmt::skip]
mod impls {
use super::DeepClone;

macro_rules! impl_deep_clone_for_tuples {
($(($T:ident, $idx:tt)),+) => {
impl<$($T: DeepClone),+> DeepClone for ($($T),+,) {
type Output = ($(<$T as DeepClone>::Output),+,);

fn deep_clone(&self) -> Self::Output {
($((&self).$idx.deep_clone()),+,)
}
}
};
}

impl_deep_clone_for_tuples!((T1, 0));
impl_deep_clone_for_tuples!((T1, 0), (T2, 1));
impl_deep_clone_for_tuples!((T1, 0), (T2, 1), (T3, 2));
impl_deep_clone_for_tuples!((T1, 0), (T2, 1), (T3, 2), (T4, 3));
impl_deep_clone_for_tuples!((T1, 0), (T2, 1), (T3, 2), (T4, 3), (T5, 4));
impl_deep_clone_for_tuples!((T1, 0), (T2, 1), (T3, 2), (T4, 3), (T5, 4), (T6, 5));
impl_deep_clone_for_tuples!((T1, 0), (T2, 1), (T3, 2), (T4, 3), (T5, 4), (T6, 5), (T7, 6));
impl_deep_clone_for_tuples!((T1, 0), (T2, 1), (T3, 2), (T4, 3), (T5, 4), (T6, 5), (T7, 6), (T8, 7));
impl_deep_clone_for_tuples!((T1, 0), (T2, 1), (T3, 2), (T4, 3), (T5, 4), (T6, 5), (T7, 6), (T8, 7), (T9, 8));
impl_deep_clone_for_tuples!((T1, 0), (T2, 1), (T3, 2), (T4, 3), (T5, 4), (T6, 5), (T7, 6), (T8, 7), (T9, 8), (T10, 9));
impl_deep_clone_for_tuples!((T1, 0), (T2, 1), (T3, 2), (T4, 3), (T5, 4), (T6, 5), (T7, 6), (T8, 7), (T9, 8), (T10, 9), (T11, 10));
impl_deep_clone_for_tuples!((T1, 0), (T2, 1), (T3, 2), (T4, 3), (T5, 4), (T6, 5), (T7, 6), (T8, 7), (T9, 8), (T10, 9), (T11, 10), (T12, 11));
impl_deep_clone_for_tuples!((T1, 0), (T2, 1), (T3, 2), (T4, 3), (T5, 4), (T6, 5), (T7, 6), (T8, 7), (T9, 8), (T10, 9), (T11, 10), (T12, 11), (T13, 12));
impl_deep_clone_for_tuples!((T1, 0), (T2, 1), (T3, 2), (T4, 3), (T5, 4), (T6, 5), (T7, 6), (T8, 7), (T9, 8), (T10, 9), (T11, 10), (T12, 11), (T13, 12), (T14, 13));
impl_deep_clone_for_tuples!((T1, 0), (T2, 1), (T3, 2), (T4, 3), (T5, 4), (T6, 5), (T7, 6), (T8, 7), (T9, 8), (T10, 9), (T11, 10), (T12, 11), (T13, 12), (T14, 13), (T15, 14));
impl_deep_clone_for_tuples!((T1, 0), (T2, 1), (T3, 2), (T4, 3), (T5, 4), (T6, 5), (T7, 6), (T8, 7), (T9, 8), (T10, 9), (T11, 10), (T12, 11), (T13, 12), (T14, 13), (T15, 14), (T16, 15));
}
}