X-Git-Url: http://these/git/?a=blobdiff_plain;f=crates%2Fdb_schema%2Fsrc%2Faggregates%2Fsite_aggregates.rs;h=fa60b15dccc3fe202f93b68369d0c9f34cd3b32a;hb=c9f140742925d6da20103124b49f2b58a35fc2b8;hp=86a46e83f0e63263470aa25fe6b0c9a143c0725b;hpb=4e6409f325bca5b2727b19c24d77ffa2b59109b1;p=lemmy.git

diff --git a/crates/db_schema/src/aggregates/site_aggregates.rs b/crates/db_schema/src/aggregates/site_aggregates.rs
index 86a46e83..fa60b15d 100644
--- a/crates/db_schema/src/aggregates/site_aggregates.rs
+++ b/crates/db_schema/src/aggregates/site_aggregates.rs
@@ -2,7 +2,7 @@ use crate::{aggregates::structs::SiteAggregates, schema::site_aggregates};
 use diesel::{result::Error, *};
 
 impl SiteAggregates {
-  pub fn read(conn: &PgConnection) -> Result<Self, Error> {
+  pub fn read(conn: &mut PgConnection) -> Result<Self, Error> {
     site_aggregates::table.first::<Self>(conn)
   }
 }
@@ -26,7 +26,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_site_agg".into(),
@@ -34,7 +34,7 @@ mod tests {
       ..PersonForm::default()
     };
 
-    let inserted_person = Person::create(&conn, &new_person).unwrap();
+    let inserted_person = Person::create(conn, &new_person).unwrap();
 
     let site_form = SiteForm {
       name: "test_site".into(),
@@ -42,7 +42,7 @@ mod tests {
       ..Default::default()
     };
 
-    let inserted_site = Site::create(&conn, &site_form).unwrap();
+    let inserted_site = Site::create(conn, &site_form).unwrap();
 
     let new_community = CommunityForm {
       name: "TIL_site_agg".into(),
@@ -51,7 +51,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(),
@@ -61,8 +61,8 @@ mod tests {
     };
 
     // Insert two of those posts
-    let inserted_post = Post::create(&conn, &new_post).unwrap();
-    let _inserted_post_again = Post::create(&conn, &new_post).unwrap();
+    let inserted_post = Post::create(conn, &new_post).unwrap();
+    let _inserted_post_again = Post::create(conn, &new_post).unwrap();
 
     let comment_form = CommentForm {
       content: "A test comment".into(),
@@ -72,7 +72,7 @@ mod tests {
     };
 
     // Insert two of those comments
-    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(),
@@ -82,9 +82,9 @@ 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 site_aggregates_before_delete = SiteAggregates::read(&conn).unwrap();
+    let site_aggregates_before_delete = SiteAggregates::read(conn).unwrap();
 
     assert_eq!(1, site_aggregates_before_delete.users);
     assert_eq!(1, site_aggregates_before_delete.communities);
@@ -92,25 +92,25 @@ mod tests {
     assert_eq!(2, site_aggregates_before_delete.comments);
 
     // Try a post delete
-    Post::delete(&conn, inserted_post.id).unwrap();
-    let site_aggregates_after_post_delete = SiteAggregates::read(&conn).unwrap();
+    Post::delete(conn, inserted_post.id).unwrap();
+    let site_aggregates_after_post_delete = SiteAggregates::read(conn).unwrap();
     assert_eq!(1, site_aggregates_after_post_delete.posts);
     assert_eq!(0, site_aggregates_after_post_delete.comments);
 
     // This shouuld delete all the associated rows, and fire triggers
-    let person_num_deleted = Person::delete(&conn, 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);
 
     // Site should still exist, it can without a site creator.
-    let after_delete_creator = SiteAggregates::read(&conn);
+    let after_delete_creator = SiteAggregates::read(conn);
     assert!(after_delete_creator.is_ok());
 
-    Site::delete(&conn, inserted_site.id).unwrap();
-    let after_delete_site = SiteAggregates::read(&conn);
+    Site::delete(conn, inserted_site.id).unwrap();
+    let after_delete_site = SiteAggregates::read(conn);
     assert!(after_delete_site.is_err());
   }
 }