From ed5085ef75fb52f3de50d35c31488a863ee22f0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Th=C3=A9riault?=
 <raphael_theriault@outlook.com>
Date: Mon, 9 Mar 2020 15:07:56 -0400
Subject: [PATCH] Fix deletion routes

---
 src/queries.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/queries.rs b/src/queries.rs
index 24f4ac4..6b80bf4 100644
--- a/src/queries.rs
+++ b/src/queries.rs
@@ -65,10 +65,10 @@ macro_rules! find {
 
 /// DELETE an entry
 macro_rules! delete {
-    ($n:ident) => {
+    ($n:ident, $t:ty) => {
         pub fn delete(d_id: i32) -> diesel::result::QueryResult<()> {
             let conn: &SqliteConnection = &crate::globals::POOL.get().unwrap();
-            diesel::delete($n.find(d_id)).execute(conn)?;
+            diesel::delete(&$n.find(d_id).first::<$t>(conn)?).execute(conn)?;
             Ok(())
         }
     };
@@ -142,7 +142,7 @@ pub mod files {
         fs_del(d_id)?;
 
         let conn: &SqliteConnection = &POOL.get().unwrap();
-        diesel::delete(files.find(d_id)).execute(conn)?;
+        diesel::delete(&files.find(d_id).first::<File>(conn)?).execute(conn)?;
         Ok(())
     }
 }
@@ -158,7 +158,7 @@ pub mod links {
     use diesel::{prelude::*, result::QueryResult};
 
     find!(links, Link);
-    delete!(links);
+    delete!(links, Link);
 
     /// SELECT multiple link entries
     pub fn select(filters: SelectFilters) -> QueryResult<Vec<Link>> {
@@ -193,7 +193,7 @@ pub mod texts {
     use diesel::{prelude::*, result::QueryResult};
 
     find!(texts, Text);
-    delete!(texts);
+    delete!(texts, Text);
 
     /// SELECT multiple text entries
     pub fn select(filters: SelectFilters) -> QueryResult<Vec<Text>> {