Diesel 2.0.0 upgrade (#2452)

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

diff --git a/crates/db_views_moderator/src/mod_ban_view.rs b/crates/db_views_moderator/src/mod_ban_view.rs
index 43e577a31ed44ff5b205a6b71fb5d02a0f910211..94bfbc8d5812156f61638e2ca76610fc094c057e 100644 (file)
--- a/crates/db_views_moderator/src/mod_ban_view.rs
+++ b/crates/db_views_moderator/src/mod_ban_view.rs
@@ -2,19 +2,20 @@ use crate::structs::{ModBanView, ModlogListParams};
 use diesel::{result::Error, *};
 use lemmy_db_schema::{
   newtypes::PersonId,
-  schema::{mod_ban, person, person_alias_1},
+  schema::{mod_ban, person},
   source::{
     moderator::ModBan,
-    person::{Person, PersonAlias1, PersonSafe, PersonSafeAlias1},
+    person::{Person, PersonSafe},
   },
   traits::{ToSafe, ViewToVec},
   utils::limit_and_offset,
 };
 
-type ModBanViewTuple = (ModBan, Option<PersonSafe>, PersonSafeAlias1);
+type ModBanViewTuple = (ModBan, Option<PersonSafe>, PersonSafe);
 
 impl ModBanView {
-  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>();
@@ -24,11 +25,11 @@ impl ModBanView {
       .and(show_mod_names_expr.or(person::id.eq(admin_person_id_join)));
     let mut query = mod_ban::table
       .left_join(person::table.on(admin_names_join))
-      .inner_join(person_alias_1::table.on(mod_ban::other_person_id.eq(person_alias_1::id)))
+      .inner_join(person_alias_1.on(mod_ban::other_person_id.eq(person_alias_1.field(person::id))))
       .select((
         mod_ban::all_columns,
         Person::safe_columns_tuple().nullable(),
-        PersonAlias1::safe_columns_tuple(),
+        person_alias_1.fields(Person::safe_columns_tuple()),
       ))
       .into_boxed();
 
@@ -37,7 +38,7 @@ impl ModBanView {
     };
 
     if let Some(other_person_id) = params.other_person_id {
-      query = query.filter(person_alias_1::id.eq(other_person_id));
+      query = query.filter(person_alias_1.field(person::id).eq(other_person_id));
     };
 
     let (limit, offset) = limit_and_offset(params.page, params.limit)?;