X-Git-Url: http://these/git/?a=blobdiff_plain;f=crates%2Fdb_views_actor%2Fsrc%2Fperson_block_view.rs;h=90d56ccd7ba5615f8351b08b72eced64542fe18d;hb=c9f140742925d6da20103124b49f2b58a35fc2b8;hp=19ff26337fa07089b2485f86cd53ba1017af2c43;hpb=4e6409f325bca5b2727b19c24d77ffa2b59109b1;p=lemmy.git diff --git a/crates/db_views_actor/src/person_block_view.rs b/crates/db_views_actor/src/person_block_view.rs index 19ff2633..90d56ccd 100644 --- a/crates/db_views_actor/src/person_block_view.rs +++ b/crates/db_views_actor/src/person_block_view.rs @@ -2,21 +2,23 @@ use crate::structs::PersonBlockView; use diesel::{result::Error, *}; use lemmy_db_schema::{ newtypes::PersonId, - schema::{person, person_alias_1, person_block}, - source::person::{Person, PersonAlias1, PersonSafe, PersonSafeAlias1}, + schema::{person, person_block}, + source::person::{Person, PersonSafe}, traits::{ToSafe, ViewToVec}, }; -type PersonBlockViewTuple = (PersonSafe, PersonSafeAlias1); +type PersonBlockViewTuple = (PersonSafe, PersonSafe); impl PersonBlockView { - pub fn for_person(conn: &PgConnection, person_id: PersonId) -> Result, Error> { + pub fn for_person(conn: &mut PgConnection, person_id: PersonId) -> Result, Error> { + let person_alias_1 = diesel::alias!(person as person1); + let res = person_block::table .inner_join(person::table) - .inner_join(person_alias_1::table) // TODO I dont know if this will be smart abt the column + .inner_join(person_alias_1) .select(( Person::safe_columns_tuple(), - PersonAlias1::safe_columns_tuple(), + person_alias_1.fields(Person::safe_columns_tuple()), )) .filter(person_block::person_id.eq(person_id)) .order_by(person_block::published)