Merge pull request #1334 from amitaibu/deleteRecordByIds

Add `deleteRecordByIds`
digitallyinduced · Jan 24, 2022 · dc0cdb0 · dc0cdb0
2 parents e5ff578 + 5b525d3
commit dc0cdb0
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 14 deletions.
diff --git a/Guide/database.markdown b/Guide/database.markdown
@@ -567,6 +567,8 @@ do
     deleteRecord user
 ```
 
+Or pass only the ID with `[`deleteRecordById`](https://ihp.digitallyinduced.com/api-docs/IHP-ModelSupport.html#v:deleteRecordById).
+
 This will execute:
 
 ```sql
@@ -583,10 +585,14 @@ do
     deleteRecords users
 ```
 
+Or pass only the ID with `[`deleteRecordByIds`](https://ihp.digitallyinduced.com/api-docs/IHP-ModelSupport.html#v:deleteRecordByIds).
+
 This will execute:
 
 ```sql
 DELETE FROM users WHERE id IN (...)
+
+
 ```
 
 ### Deleting all records

diff --git a/IHP/ModelSupport.hs b/IHP/ModelSupport.hs
@@ -578,14 +578,9 @@ logQuery query parameters time = do
 -- DELETE FROM projects WHERE id = '..'
 --
 -- Use 'deleteRecords' if you want to delete multiple records.
-deleteRecord :: forall model. (?modelContext :: ModelContext, Table model) => model -> IO ()
-deleteRecord model = do
-    let condition = primaryKeyCondition model
-    let whereConditions = condition |> map (\(field, _) -> field <> " = ?") |> intercalate " AND "
-    let theQuery = "DELETE FROM " <> tableName @model <> " WHERE " <> whereConditions
-    let theParameters = map snd condition
-    sqlExec (PG.Query . cs $! theQuery) theParameters
-    pure ()
+deleteRecord :: forall record id. (?modelContext :: ModelContext, Show id, Table record, HasField "id" record id, ToField id) => record -> IO ()
+deleteRecord record =
+    deleteRecordById @record (get #id record)
 {-# INLINABLE deleteRecord #-}
 
 -- | Like 'deleteRecord' but using an Id
@@ -594,10 +589,10 @@ deleteRecord model = do
 -- >>> delete projectId
 -- DELETE FROM projects WHERE id = '..'
 --
-deleteRecordById :: forall model id. (?modelContext :: ModelContext, Show id, Table model, HasField "id" model id, ToField id) => id -> IO ()
+deleteRecordById :: forall record id. (?modelContext :: ModelContext, Show id, Table record, ToField id) => id -> IO ()
 deleteRecordById id = do
-    let theQuery = "DELETE FROM " <> tableName @model <> " WHERE id = ?"
-    let theParameters = (PG.Only id)
+    let theQuery = "DELETE FROM " <> tableName @record <> " WHERE id = ?"
+    let theParameters = PG.Only id
     sqlExec (PG.Query . cs $! theQuery) theParameters
     pure ()
 {-# INLINABLE deleteRecordById #-}
@@ -608,12 +603,23 @@ deleteRecordById id = do
 -- >>> deleteRecords projects
 -- DELETE FROM projects WHERE id IN (..)
 deleteRecords :: forall record id. (?modelContext :: ModelContext, Show id, Table record, HasField "id" record id, ToField id) => [record] -> IO ()
-deleteRecords records = do
+deleteRecords records =
+    deleteRecordByIds @record (ids records)
+{-# INLINABLE deleteRecords #-}
+
+-- | Like 'deleteRecordById' but for a list of Ids.
+--
+-- >>> let projectIds :: [ Id Project ] = ...
+-- >>> delete projectIds
+-- DELETE FROM projects WHERE id IN ('..')
+--
+deleteRecordByIds :: forall record id. (?modelContext :: ModelContext, Show id, Table record, ToField id) => [id] -> IO ()
+deleteRecordByIds ids = do
     let theQuery = "DELETE FROM " <> tableName @record <> " WHERE id IN ?"
-    let theParameters = PG.Only (PG.In (ids records))
+    let theParameters = (PG.Only (PG.In ids))
     sqlExec (PG.Query . cs $! theQuery) theParameters
     pure ()
-{-# INLINABLE deleteRecords #-}
+{-# INLINABLE deleteRecordByIds #-}
 
 -- | Runs a @DELETE@ query to delete all rows in a table.
 --