Diesel 2.0.0 upgrade (#2452)

[lemmy.git] / crates / db_views_moderator / src / mod_ban_from_community_view.rs

diff --git a/crates/db_views_moderator/src/mod_ban_from_community_view.rs b/crates/db_views_moderator/src/mod_ban_from_community_view.rs
index 9c5cc7f7734e64ef706b73c4d3c8e3f1270f4eca..bf885dbc16f1db432b4404cab88f644d56f0e2fd 100644 (file)
--- a/crates/db_views_moderator/src/mod_ban_from_community_view.rs
+++ b/crates/db_views_moderator/src/mod_ban_from_community_view.rs
@@ -2,11 +2,11 @@ use crate::structs::{ModBanFromCommunityView, ModlogListParams};
 use diesel::{result::Error, *};
 use lemmy_db_schema::{
   newtypes::PersonId,
-  schema::{community, mod_ban_from_community, person, person_alias_1},
+  schema::{community, mod_ban_from_community, person},
   source::{
     community::{Community, CommunitySafe},
     moderator::ModBanFromCommunity,
-    person::{Person, PersonAlias1, PersonSafe, PersonSafeAlias1},
+    person::{Person, PersonSafe},
   },
   traits::{ToSafe, ViewToVec},
   utils::limit_and_offset,
@@ -16,11 +16,12 @@ type ModBanFromCommunityViewTuple = (
   ModBanFromCommunity,
   Option<PersonSafe>,
   CommunitySafe,
-  PersonSafeAlias1,
+  PersonSafe,
 );
 
 impl ModBanFromCommunityView {
-  pub fn list(conn: &PgConnection, params: ModlogListParams) -> Result<Vec<Self>, Error> {
+  pub fn list(conn: &mut PgConnection, params: ModlogListParams) -> Result<Vec<Self>, Error> {
+    let person_alias_1 = diesel::alias!(person as person1);
     let admin_person_id_join = params.mod_person_id.unwrap_or(PersonId(-1));
     let show_mod_names = !params.hide_modlog_names;
     let show_mod_names_expr = show_mod_names.as_sql::<diesel::sql_types::Bool>();
@@ -32,13 +33,14 @@ impl ModBanFromCommunityView {
       .left_join(person::table.on(admin_names_join))
       .inner_join(community::table)
       .inner_join(
-        person_alias_1::table.on(mod_ban_from_community::other_person_id.eq(person_alias_1::id)),
+        person_alias_1
+          .on(mod_ban_from_community::other_person_id.eq(person_alias_1.field(person::id))),
       )
       .select((
         mod_ban_from_community::all_columns,
         Person::safe_columns_tuple().nullable(),
         Community::safe_columns_tuple(),
-        PersonAlias1::safe_columns_tuple(),
+        person_alias_1.fields(Person::safe_columns_tuple()),
       ))
       .into_boxed();