Diesel 2.0.0 upgrade (#2452)

[lemmy.git] / crates / db_schema / src / aggregates / comment_aggregates.rs

diff --git a/crates/db_schema/src/aggregates/comment_aggregates.rs b/crates/db_schema/src/aggregates/comment_aggregates.rs
index 679efeac0f2cd73f23e62ff07e4ecdfd7dcf5aae..c24e0b94a508afe9a3f91db916d0f996d1d6476e 100644 (file)
--- a/crates/db_schema/src/aggregates/comment_aggregates.rs
+++ b/crates/db_schema/src/aggregates/comment_aggregates.rs
@@ -6,7 +6,7 @@ use crate::{
 use diesel::{result::Error, *};
 
 impl CommentAggregates {
-  pub fn read(conn: &PgConnection, comment_id: CommentId) -> Result<Self, Error> {
+  pub fn read(conn: &mut PgConnection, comment_id: CommentId) -> Result<Self, Error> {
     comment_aggregates::table
       .filter(comment_aggregates::comment_id.eq(comment_id))
       .first::<Self>(conn)
@@ -31,7 +31,7 @@ mod tests {
   #[test]
   #[serial]
   fn test_crud() {
-    let conn = establish_unpooled_connection();
+    let conn = &mut establish_unpooled_connection();
 
     let new_person = PersonForm {
       name: "thommy_comment_agg".into(),
@@ -39,7 +39,7 @@ mod tests {
       ..PersonForm::default()
     };
 
-    let inserted_person = Person::create(&conn, &new_person).unwrap();
+    let inserted_person = Person::create(conn, &new_person).unwrap();
 
     let another_person = PersonForm {
       name: "jerry_comment_agg".into(),
@@ -47,7 +47,7 @@ mod tests {
       ..PersonForm::default()
     };
 
-    let another_inserted_person = Person::create(&conn, &another_person).unwrap();
+    let another_inserted_person = Person::create(conn, &another_person).unwrap();
 
     let new_community = CommunityForm {
       name: "TIL_comment_agg".into(),
@@ -56,7 +56,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(),
@@ -65,7 +65,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(),
@@ -74,7 +74,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 child_comment_form = CommentForm {
       content: "A test comment".into(),
@@ -84,7 +84,7 @@ mod tests {
     };
 
     let _inserted_child_comment =
-      Comment::create(&conn, &child_comment_form, Some(&inserted_comment.path)).unwrap();
+      Comment::create(conn, &child_comment_form, Some(&inserted_comment.path)).unwrap();
 
     let comment_like = CommentLikeForm {
       comment_id: inserted_comment.id,
@@ -93,9 +93,9 @@ mod tests {
       score: 1,
     };
 
-    CommentLike::like(&conn, &comment_like).unwrap();
+    CommentLike::like(conn, &comment_like).unwrap();
 
-    let comment_aggs_before_delete = CommentAggregates::read(&conn, inserted_comment.id).unwrap();
+    let comment_aggs_before_delete = CommentAggregates::read(conn, inserted_comment.id).unwrap();
 
     assert_eq!(1, comment_aggs_before_delete.score);
     assert_eq!(1, comment_aggs_before_delete.upvotes);
@@ -109,35 +109,35 @@ mod tests {
       score: -1,
     };
 
-    CommentLike::like(&conn, &comment_dislike).unwrap();
+    CommentLike::like(conn, &comment_dislike).unwrap();
 
-    let comment_aggs_after_dislike = CommentAggregates::read(&conn, inserted_comment.id).unwrap();
+    let comment_aggs_after_dislike = CommentAggregates::read(conn, inserted_comment.id).unwrap();
 
     assert_eq!(0, comment_aggs_after_dislike.score);
     assert_eq!(1, comment_aggs_after_dislike.upvotes);
     assert_eq!(1, comment_aggs_after_dislike.downvotes);
 
     // Remove the first comment like
-    CommentLike::remove(&conn, inserted_person.id, inserted_comment.id).unwrap();
-    let after_like_remove = CommentAggregates::read(&conn, inserted_comment.id).unwrap();
+    CommentLike::remove(conn, inserted_person.id, inserted_comment.id).unwrap();
+    let after_like_remove = CommentAggregates::read(conn, inserted_comment.id).unwrap();
     assert_eq!(-1, after_like_remove.score);
     assert_eq!(0, after_like_remove.upvotes);
     assert_eq!(1, after_like_remove.downvotes);
 
     // Remove the parent post
-    Post::delete(&conn, inserted_post.id).unwrap();
+    Post::delete(conn, inserted_post.id).unwrap();
 
     // Should be none found, since the post was deleted
-    let after_delete = CommentAggregates::read(&conn, inserted_comment.id);
+    let after_delete = CommentAggregates::read(conn, inserted_comment.id);
     assert!(after_delete.is_err());
 
     // This should delete all the associated rows, and fire triggers
-    Person::delete(&conn, another_inserted_person.id).unwrap();
-    let person_num_deleted = Person::delete(&conn, inserted_person.id).unwrap();
+    Person::delete(conn, another_inserted_person.id).unwrap();
+    let person_num_deleted = Person::delete(conn, inserted_person.id).unwrap();
     assert_eq!(1, person_num_deleted);
 
     // Delete the community
-    let community_num_deleted = Community::delete(&conn, inserted_community.id).unwrap();
+    let community_num_deleted = Community::delete(conn, inserted_community.id).unwrap();
     assert_eq!(1, community_num_deleted);
   }
 }