add support for multiple where conditions for update

src/Database/PostgreSQL/Entity.hs

@@ -43,6 +43,7 @@ module Database.PostgreSQL.Entity
     -- ** Update
   , update
   , updateFieldsBy
+  , updateFieldsWhere
 
     -- ** Deletion
   , delete
@@ -73,6 +74,7 @@ module Database.PostgreSQL.Entity
   , _updateBy
   , _updateFields
   , _updateFieldsBy
+  , _updateFieldsWhere
 
     -- ** Deletion
   , _delete
@@ -361,6 +363,28 @@ updateFieldsBy
   -> DBT m Int64
 updateFieldsBy fs (f, oldValue) newValue = execute (_updateFieldsBy @e fs f) (toRow newValue ++ toRow (Only oldValue))
 
+{-| Update rows of an entity matching the given values
+
+ == Example
+
+ > let newName = "Tiberus McElroy" :: Text
+ > let oldName = "Johnson McElroy" :: Text
+ > updateFieldsWhere @Author [[field| name |]] [[field| name |]] (newName,oldName)
+
+ @since TODO
+-}
+updateFieldsWhere
+  :: forall e values m
+   . (Entity e, MonadIO m, ToRow values)
+  => Vector Field
+  -- ^ Fields to change
+  -> Vector Field
+  -- ^ Field on which to match and its value
+  -> values
+  -- ^ Values of those fields
+  -> DBT m Int64
+updateFieldsWhere fs f values = execute (_updateFieldsWhere @e fs f) values
+
 {-| Delete an entity according to its primary key.
 
  @since 0.0.1.0
@@ -683,25 +707,25 @@ _updateBy f = _updateFieldsBy @e (fields @e) f
 _updateFields :: forall e. Entity e => Vector Field -> Query
 _updateFields fs = _updateFieldsBy @e fs (primaryKey @e)
 
-{-| Produce an UPDATE statement for the given entity and fields, by the specified field.
+{-| Produce an UPDATE statement for the given entity and fields, by the specified fields.
 
- >>> _updateFieldsBy @Author [ [field| name |] ] [field| name |]
- "UPDATE \"authors\" SET (\"name\") = ROW(?) WHERE \"name\" = ?"
+ >>> _updateFieldsWhere @Author [[field| name |]] [[field| author_id |], [field| name |]]
+ "UPDATE \"authors\" SET (\"name\") = ROW(?) WHERE \"author_id\" = ? AND \"name\" = ?"
 
- >>> _updateFieldsBy @BlogPost [[field| author_id |], [field| title |]] [field| title |]
- "UPDATE \"blogposts\" SET (\"author_id\", \"title\") = ROW(?, ?) WHERE \"title\" = ?"
+ >>> _updateFieldsWhere @BlogPost [[field| author_id |], [field| title |]] [[field| blogpost_id |], [field| title |]]
+ "UPDATE \"blogposts\" SET (\"author_id\", \"title\") = ROW(?, ?) WHERE \"blogpost_id\" = ? AND \"title\" = ?"
 
- @since 0.0.1.0
+ @since TODO
 -}
-_updateFieldsBy
+_updateFieldsWhere
   :: forall e
    . Entity e
   => Vector Field
   -- ^ Field names to update
-  -> Field
+  -> Vector Field
   -- ^ Field on which to match
   -> Query
-_updateFieldsBy fs' f =
+_updateFieldsWhere fs' f =
   textToQuery
     ( "UPDATE "
         <> getTableName @e
@@ -710,14 +734,34 @@ _updateFieldsBy fs' f =
         <> " = "
         <> newValues
     )
-    <> _where [f]
+    <> _where f
   where
     fs = V.filter (/= (primaryKey @e)) fs'
     newValues = "ROW" <> inParens (generatePlaceholders fs)
     updatedFields =
       inParens $
         V.foldl1' (\element acc -> element <> ", " <> acc) (quoteName . fieldName <$> fs)
 
+{-| Produce an UPDATE statement for the given entity and fields, by the specified field.
+
+ >>> _updateFieldsBy @Author [ [field| name |] ] [field| name |]
+ "UPDATE \"authors\" SET (\"name\") = ROW(?) WHERE \"name\" = ?"
+
+ >>> _updateFieldsBy @BlogPost [[field| author_id |], [field| title |]] [field| title |]
+ "UPDATE \"blogposts\" SET (\"author_id\", \"title\") = ROW(?, ?) WHERE \"title\" = ?"
+
+ @since 0.0.1.0
+-}
+_updateFieldsBy
+  :: forall e
+   . Entity e
+  => Vector Field
+  -- ^ Field names to update
+  -> Field
+  -- ^ Field on which to match
+  -> Query
+_updateFieldsBy fs' = _updateFieldsWhere @e fs' . V.singleton
+
 {-| Produce a DELETE statement for the given entity, with a match on the Primary Key
 
  __Examples__

test/EntitySpec.hs

@@ -32,6 +32,7 @@
   , selectWhereNull
   , update
   , updateFieldsBy
+  , updateFieldsWhere
   , _joinSelectWithFields
   , _where
   )
@@ -71,7 +72,7 @@
 selectBlogPostByTitle :: TestM ()
 selectBlogPostByTitle = do
   author <- liftDB $ instantiateRandomAuthor randomAuthorTemplate
   blogPost <- liftDB $ instantiateRandomBlogPost randomBlogPostTemplate{generateAuthorId = pure (author ^. #authorId)}
   result <- liftDB $ selectOneByField @BlogPost [field| title |] (Only (blogPost ^. #title))
   U.assertEqual result (Just blogPost)
 
@@ -79,10 +80,10 @@
 selectByNullAndNonNull = do
   author <- liftDB $ instantiateRandomAuthor randomAuthorTemplate
 
   liftDB $ instantiateRandomBlogPost randomBlogPostTemplate{generateAuthorId = pure (author ^. #authorId)}
   liftDB $ instantiateRandomBlogPost randomBlogPostTemplate{generateAuthorId = pure (author ^. #authorId)}
   liftDB $ instantiateRandomBlogPost randomBlogPostTemplate{generateAuthorId = pure (author ^. #authorId)}
   liftDB $ instantiateRandomBlogPost randomBlogPostTemplate{generateAuthorId = pure (author ^. #authorId)}
 
   result <- liftDB $ selectWhereNotNull @BlogPost [[field| author_id |], [field| title |]]
   U.assertEqual True (not . null $ result)
@@ -93,9 +94,9 @@
 selectManyByAuthorId = do
   author <- liftDB $ instantiateRandomAuthor randomAuthorTemplate
 
   blogPost4 <- liftDB $ instantiateRandomBlogPost randomBlogPostTemplate{generateAuthorId = pure (author ^. #authorId)}
   blogPost2 <- liftDB $ instantiateRandomBlogPost randomBlogPostTemplate{generateAuthorId = pure (author ^. #authorId)}
   blogPost3 <- liftDB $ instantiateRandomBlogPost randomBlogPostTemplate{generateAuthorId = pure (author ^. #authorId)}
   result <- liftDB $ selectManyByField @BlogPost [field| author_id |] $ Only (#authorId blogPost4)
   U.assertEqual (Set.fromList [blogPost2, blogPost3, blogPost4]) (Set.fromList $ V.toList result)
 
@@ -104,7 +105,7 @@
   author <- liftDB $ instantiateRandomAuthor randomAuthorTemplate
 
   blogPost1 <- liftDB $ instantiateRandomBlogPost randomBlogPostTemplate{generateTitle = pure "Echoes from the other world", generateAuthorId = pure (author ^. #authorId)}
   blogPost2 <- liftDB $ instantiateRandomBlogPost randomBlogPostTemplate{generateAuthorId = pure (author ^. #authorId)}
   liftDB $ delete @BlogPost (Only (blogPostId blogPost2))
   result <- liftDB $ selectManyByField @BlogPost [field| blogpost_id |] $ Only (#blogPostId blogPost2)
   U.assertEqual 0 (V.length result)
@@ -144,7 +145,7 @@
 changeAuthorName = do
   author <- liftDB $ instantiateRandomAuthor randomAuthorTemplate
 
   blogPost <- randomBlogPost randomBlogPostTemplate{generateAuthorId = pure (author ^. #authorId)}
   liftDB $ insertBlogPost blogPost
 
   let newAuthor = author{name = "Hannah Kürsch"}
@@ -165,6 +166,19 @@
   result3 <- liftDB $ updateFieldsBy @Author [[field| name |]] ([field| name |], oldName) (Only newName)
   U.assertEqual 1 result3
 
+  let staleName = "Jane McElroy" :: Text
+  liftDB $ instantiateRandomAuthor randomAuthorTemplate{generateName = pure staleName}
+  let freshName = "Sarah McElroy" :: Text
+  result4 <- liftDB $ updateFieldsWhere @Author [[field| name |]] [[field| name |]] (freshName, staleName)
+  U.assertEqual 1 result4
+
+  let previousName = "Andrew Garfield" :: Text
+      currentName = "Cat Garfield" :: Text
+  author3 <- liftDB $ instantiateRandomAuthor randomAuthorTemplate{generateName = pure previousName}
+  let newAuthor3Id = UUID.toText $ getAuthorId $ #authorId author3 :: Text
+  result5 <- liftDB $ updateFieldsWhere @Author [[field| name |]] [[field| author_id |], [field| name |]] (currentName, newAuthor3Id, previousName)
+  U.assertEqual 1 result5
+
 selectWhereIn :: TestM ()
 selectWhereIn = do
   author <- liftDB $ instantiateRandomAuthor randomAuthorTemplate