fix: tests for delete

jayy-lmao · Nov 6, 2024 · 9ab34aa · 9ab34aa
1 parent 1f7a9d8
commit 9ab34aa
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 21 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,11 +3,15 @@ name: Rust CI
 on: [push, pull_request]
 
 jobs:
+
+
   setup:
     name: Set up and Cache
     runs-on: ubuntu-latest
     outputs:
       cache-hit: ${{ steps.cache.outputs.cache-hit }}
+    env:
+      CARGO_TERM_COLOR: always
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -30,6 +34,8 @@ jobs:
     name: Run Unit Tests
     runs-on: ubuntu-latest
     needs: setup
+    env:
+      CARGO_TERM_COLOR: always
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -49,6 +55,8 @@ jobs:
     name: Run integration tests 
     runs-on: ubuntu-latest
     needs: setup
+    env:
+      CARGO_TERM_COLOR: always
     steps:
       - name: Checkout code
         uses: actions/checkout@v3

diff --git a/src/modules/delete_query_builder/delete_query_builder.rs b/src/modules/delete_query_builder/delete_query_builder.rs
@@ -245,14 +245,14 @@ pub fn get_query_builder(input: &DeriveInput) -> proc_macro2::TokenStream {
                 pub async fn delete<'e, E: sqlx::PgExecutor<'e>>(
                     self,
                     executor: E,
-                ) -> Result<#struct_name, sqlx::Error> {
+                ) -> Result<(), sqlx::Error> {
                     sqlx::query!(
-                        #struct_name,
                         #query,
                         #(#unique_query_args_2)*
                     )
                         .execute(executor)
-                        .await
+                        .await?;
+                    Ok(())
             }
         }
         }
@@ -273,14 +273,14 @@ pub fn get_query_builder(input: &DeriveInput) -> proc_macro2::TokenStream {
                     pub async fn delete<'e, E: sqlx::PgExecutor<'e>>(
                         self,
                         executor: E,
-                    ) -> Result<#struct_name, sqlx::Error> {
+                    ) -> Result<(), sqlx::Error> {
                         sqlx::query!(
-                            #struct_name,
                             #query,
                             #(#key_query_args_2)*
                         )
                             .execute(executor)
-                            .await
+                            .await?;
+                        Ok(())
                 }
             }
         }

diff --git a/src/modules/delete_query_builder/test_delete_query_builder.rs b/src/modules/delete_query_builder/test_delete_query_builder.rs
@@ -70,22 +70,24 @@ impl UserDbSetDeleteQueryBuilder<Set, NotSet> {
     pub async fn delete<'e, E: sqlx::PgExecutor<'e>>(
         self,
         executor: E,
-    ) -> Result<User, sqlx::Error> {
-        sqlx::query!(User, "DELETE FROM users WHERE id = $1", self.id,)
+    ) -> Result<(), sqlx::Error> {
+        sqlx::query!("DELETE FROM users WHERE id = $1", self.id,)
             .execute(executor)
-            .await
+            .await?;
+        Ok(())
     }
 }
 impl UserDbSetDeleteQueryBuilder<NotSet, Set> {
     pub async fn delete<'e, E: sqlx::PgExecutor<'e>>(
         self,
         executor: E,
-    ) -> Result<User, sqlx::Error> {
+    ) -> Result<(), sqlx::Error> {
         sqlx::query!(
-            User, "DELETE FROM users WHERE (email = $1 OR $1 is null)", self.email,
+             "DELETE FROM users WHERE (email = $1 OR $1 is null)", self.email,
         )
             .execute(executor)
-            .await
+            .await?;
+            Ok(())
     }
 }
 
@@ -150,12 +152,13 @@ impl TagDbSetDeleteQueryBuilder<Set> {
     pub async fn delete<'e, E: sqlx::PgExecutor<'e>>(
         self,
         executor: E,
-    ) -> Result<Tag, sqlx::Error> {
+    ) -> Result<(), sqlx::Error> {
         sqlx::query!(
-            Tag, "DELETE FROM tags WHERE (tag_name = $1 OR $1 is null)", self.tag_name,
+             "DELETE FROM tags WHERE (tag_name = $1 OR $1 is null)", self.tag_name,
         )
             .execute(executor)
-            .await
+            .await?;
+        Ok(())
     }
 }
 
@@ -234,14 +237,14 @@ impl FavouritedProductDbSetDeleteQueryBuilder<Set, Set, NotSet> {
     pub async fn delete<'e, E: sqlx::PgExecutor<'e>>(
         self,
         executor: E,
-    ) -> Result<FavouritedProduct, sqlx::Error> {
+    ) -> Result<(), sqlx::Error> {
         sqlx::query!(
-            FavouritedProduct,
             "DELETE FROM favourite_products WHERE product_id = $1 AND user_id = $2", self
             .product_id, self.user_id,
         )
             .execute(executor)
-            .await
+            .await?;
+        Ok(())
     }
 }
 

diff --git a/tests/.sqlx/query-f27ad459b51bdb3c78cda0a9c13b34e5b408bfec6c24f3044a8aae19117af6a1.json b/tests/.sqlx/query-f27ad459b51bdb3c78cda0a9c13b34e5b408bfec6c24f3044a8aae19117af6a1.json
diff --git a/tests/src/lib.rs b/tests/src/lib.rs
@@ -102,7 +102,7 @@ async fn test_fetch_users_by_name() -> Result<(), String> {
 
     let users = UserDbSet::many()
         .name_eq("bob".to_string())
-        .fetch(pool)
+        .fetch_all(pool)
         .await
         .expect("Could not fetch users");
 
@@ -117,7 +117,7 @@ async fn test_fetch_users_by_name_and_details() -> Result<(), String> {
     let users = UserDbSet::many()
         .name_eq("bob".to_string())
         .details_eq("the best bob".to_string())
-        .fetch(pool)
+        .fetch_all(pool)
         .await
         .expect("Could not fetch users");
 
@@ -130,7 +130,7 @@ async fn test_fetch_all_users() -> Result<(), String> {
     let pool = get_db_pool().await;
 
     let users = UserDbSet::many()
-        .fetch(pool)
+        .fetch_all(pool)
         .await
         .expect("Could not fetch users");