From 2dca80d678004c209765daf848d3ee629504a1a0 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Mon, 26 Sep 2022 11:25:18 -0400 Subject: [PATCH] Remove pointless language joins. (#2451) * Remove pointless language joins. * Fix test --- crates/db_views/src/comment_view.rs | 2 -- crates/db_views/src/post_view.rs | 15 --------------- crates/db_views/src/structs.rs | 1 - 3 files changed, 18 deletions(-) diff --git a/crates/db_views/src/comment_view.rs b/crates/db_views/src/comment_view.rs index c3597dc2..52f8e693 100644 --- a/crates/db_views/src/comment_view.rs +++ b/crates/db_views/src/comment_view.rs @@ -13,7 +13,6 @@ use lemmy_db_schema::{ community_block, community_follower, community_person_ban, - language, local_user_language, person, person_block, @@ -231,7 +230,6 @@ impl<'a> CommentQuery<'a> { .and(comment_like::person_id.eq(person_id_join)), ), ) - .inner_join(language::table) .left_join( local_user_language::table.on( comment::language_id diff --git a/crates/db_views/src/post_view.rs b/crates/db_views/src/post_view.rs index 3a4c87f5..778cf98a 100644 --- a/crates/db_views/src/post_view.rs +++ b/crates/db_views/src/post_view.rs @@ -8,7 +8,6 @@ use lemmy_db_schema::{ community_block, community_follower, community_person_ban, - language, local_user_language, person, person_block, @@ -20,7 +19,6 @@ use lemmy_db_schema::{ }, source::{ community::{Community, CommunityFollower, CommunityPersonBan, CommunitySafe}, - language::Language, local_user::LocalUser, person::{Person, PersonSafe}, person_block::PersonBlock, @@ -45,7 +43,6 @@ type PostViewTuple = ( Option, Option, Option, - Language, ); impl PostView { @@ -67,7 +64,6 @@ impl PostView { read, creator_blocked, post_like, - language, ) = post::table .find(post_id) .inner_join(person::table) @@ -120,7 +116,6 @@ impl PostView { .and(post_like::person_id.eq(person_id_join)), ), ) - .inner_join(language::table) .select(( post::all_columns, Person::safe_columns_tuple(), @@ -132,7 +127,6 @@ impl PostView { post_read::all_columns.nullable(), person_block::all_columns.nullable(), post_like::score.nullable(), - language::all_columns, )) .first::(conn)?; @@ -155,7 +149,6 @@ impl PostView { read: read.is_some(), creator_blocked: creator_blocked.is_some(), my_vote, - language, }) } } @@ -244,7 +237,6 @@ impl<'a> PostQuery<'a> { .and(post_like::person_id.eq(person_id_join)), ), ) - .inner_join(language::table) .left_join( local_user_language::table.on( post::language_id @@ -263,7 +255,6 @@ impl<'a> PostQuery<'a> { post_read::all_columns.nullable(), person_block::all_columns.nullable(), post_like::score.nullable(), - language::all_columns, )) .into_boxed(); @@ -421,7 +412,6 @@ impl ViewToVec for PostView { read: a.7.is_some(), creator_blocked: a.8.is_some(), my_vote: a.9, - language: a.10, }) .collect::>() } @@ -870,11 +860,6 @@ mod tests { read: false, saved: false, creator_blocked: false, - language: Language { - id: LanguageId(47), - code: "fr".to_string(), - name: "Français".to_string(), - }, } } } diff --git a/crates/db_views/src/structs.rs b/crates/db_views/src/structs.rs index 83f1e122..347f0129 100644 --- a/crates/db_views/src/structs.rs +++ b/crates/db_views/src/structs.rs @@ -85,7 +85,6 @@ pub struct PostView { pub read: bool, // Left join to PostRead pub creator_blocked: bool, // Left join to PersonBlock pub my_vote: Option, // Left join to PostLike - pub language: Language, } #[derive(Debug, PartialEq, Eq, Serialize, Deserialize, Clone)] -- 2.44.1