Diesel 2.0.0 upgrade (#2452)

[lemmy.git] / crates / db_schema / src / impls / comment_reply.rs

diff --git a/crates/db_schema/src/impls/comment_reply.rs b/crates/db_schema/src/impls/comment_reply.rs
index 271e5e7184bc9d0eeeebdbebf3ebd6db0bb5b3ac..8fed2ce47f03f24ccc2a7c61809938491880e737 100644 (file)
--- a/crates/db_schema/src/impls/comment_reply.rs
+++ b/crates/db_schema/src/impls/comment_reply.rs
@@ -8,12 +8,12 @@ use diesel::{dsl::*, result::Error, *};
 impl Crud for CommentReply {
   type Form = CommentReplyForm;
   type IdType = CommentReplyId;
-  fn read(conn: &PgConnection, comment_reply_id: CommentReplyId) -> Result<Self, Error> {
+  fn read(conn: &mut PgConnection, comment_reply_id: CommentReplyId) -> Result<Self, Error> {
     use crate::schema::comment_reply::dsl::*;
     comment_reply.find(comment_reply_id).first::<Self>(conn)
   }
 
-  fn create(conn: &PgConnection, comment_reply_form: &CommentReplyForm) -> Result<Self, Error> {
+  fn create(conn: &mut PgConnection, comment_reply_form: &CommentReplyForm) -> Result<Self, Error> {
     use crate::schema::comment_reply::dsl::*;
     // since the return here isnt utilized, we dont need to do an update
     // but get_result doesnt return the existing row here
@@ -26,7 +26,7 @@ impl Crud for CommentReply {
   }
 
   fn update(
-    conn: &PgConnection,
+    conn: &mut PgConnection,
     comment_reply_id: CommentReplyId,
     comment_reply_form: &CommentReplyForm,
   ) -> Result<Self, Error> {
@@ -39,7 +39,7 @@ impl Crud for CommentReply {
 
 impl CommentReply {
   pub fn update_read(
-    conn: &PgConnection,
+    conn: &mut PgConnection,
     comment_reply_id: CommentReplyId,
     new_read: bool,
   ) -> Result<CommentReply, Error> {
@@ -50,7 +50,7 @@ impl CommentReply {
   }
 
   pub fn mark_all_as_read(
-    conn: &PgConnection,
+    conn: &mut PgConnection,
     for_recipient_id: PersonId,
   ) -> Result<Vec<CommentReply>, Error> {
     use crate::schema::comment_reply::dsl::*;
@@ -63,7 +63,10 @@ impl CommentReply {
     .get_results::<Self>(conn)
   }
 
-  pub fn read_by_comment(conn: &PgConnection, for_comment_id: CommentId) -> Result<Self, Error> {
+  pub fn read_by_comment(
+    conn: &mut PgConnection,
+    for_comment_id: CommentId,
+  ) -> Result<Self, Error> {
     use crate::schema::comment_reply::dsl::*;
     comment_reply
       .filter(comment_id.eq(for_comment_id))
@@ -89,7 +92,7 @@ mod tests {
   #[test]
   #[serial]
   fn test_crud() {
-    let conn = establish_unpooled_connection();
+    let conn = &mut establish_unpooled_connection();
 
     let new_person = PersonForm {
       name: "terrylake".into(),
@@ -97,7 +100,7 @@ mod tests {
       ..PersonForm::default()
     };
 
-    let inserted_person = Person::create(&conn, &new_person).unwrap();
+    let inserted_person = Person::create(conn, &new_person).unwrap();
 
     let recipient_form = PersonForm {
       name: "terrylakes recipient".into(),
@@ -105,7 +108,7 @@ mod tests {
       ..PersonForm::default()
     };
 
-    let inserted_recipient = Person::create(&conn, &recipient_form).unwrap();
+    let inserted_recipient = Person::create(conn, &recipient_form).unwrap();
 
     let new_community = CommunityForm {
       name: "test community lake".to_string(),
@@ -114,7 +117,7 @@ mod tests {
       ..CommunityForm::default()
     };
 
-    let inserted_community = Community::create(&conn, &new_community).unwrap();
+    let inserted_community = Community::create(conn, &new_community).unwrap();
 
     let new_post = PostForm {
       name: "A test post".into(),
@@ -123,7 +126,7 @@ mod tests {
       ..PostForm::default()
     };
 
-    let inserted_post = Post::create(&conn, &new_post).unwrap();
+    let inserted_post = Post::create(conn, &new_post).unwrap();
 
     let comment_form = CommentForm {
       content: "A test comment".into(),
@@ -132,7 +135,7 @@ mod tests {
       ..CommentForm::default()
     };
 
-    let inserted_comment = Comment::create(&conn, &comment_form, None).unwrap();
+    let inserted_comment = Comment::create(conn, &comment_form, None).unwrap();
 
     let comment_reply_form = CommentReplyForm {
       recipient_id: inserted_recipient.id,
@@ -140,7 +143,7 @@ mod tests {
       read: None,
     };
 
-    let inserted_reply = CommentReply::create(&conn, &comment_reply_form).unwrap();
+    let inserted_reply = CommentReply::create(conn, &comment_reply_form).unwrap();
 
     let expected_reply = CommentReply {
       id: inserted_reply.id,
@@ -150,14 +153,13 @@ mod tests {
       published: inserted_reply.published,
     };
 
-    let read_reply = CommentReply::read(&conn, inserted_reply.id).unwrap();
-    let updated_reply =
-      CommentReply::update(&conn, inserted_reply.id, &comment_reply_form).unwrap();
-    Comment::delete(&conn, inserted_comment.id).unwrap();
-    Post::delete(&conn, inserted_post.id).unwrap();
-    Community::delete(&conn, inserted_community.id).unwrap();
-    Person::delete(&conn, inserted_person.id).unwrap();
-    Person::delete(&conn, inserted_recipient.id).unwrap();
+    let read_reply = CommentReply::read(conn, inserted_reply.id).unwrap();
+    let updated_reply = CommentReply::update(conn, inserted_reply.id, &comment_reply_form).unwrap();
+    Comment::delete(conn, inserted_comment.id).unwrap();
+    Post::delete(conn, inserted_post.id).unwrap();
+    Community::delete(conn, inserted_community.id).unwrap();
+    Person::delete(conn, inserted_person.id).unwrap();
+    Person::delete(conn, inserted_recipient.id).unwrap();
 
     assert_eq!(expected_reply, read_reply);
     assert_eq!(expected_reply, inserted_reply);