From 04a0ec883a48897d8260dc58da3226a3b511741d Mon Sep 17 00:00:00 2001 From: Paul Rouse Date: Wed, 25 Oct 2017 10:36:47 +0100 Subject: [PATCH 1/2] Fix haddocks: postfix comments on GADT fields don't work - use prefix instead --- persistent-mysql/Database/Persist/MySQL.hs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/persistent-mysql/Database/Persist/MySQL.hs b/persistent-mysql/Database/Persist/MySQL.hs index b222d8902..94e830ddc 100644 --- a/persistent-mysql/Database/Persist/MySQL.hs +++ b/persistent-mysql/Database/Persist/MySQL.hs @@ -1048,12 +1048,13 @@ insertOnDuplicateKeyUpdate record = -- | This type is used to determine how to update rows using MySQL's -- @INSERT ON DUPLICATE KEY UPDATE@ functionality, exposed via -- 'insertManyOnDuplicateKeyUpdate' in the library. +-- +-- @since 2.6.2 data SomeField record where + -- | Copy the field directly from the record. SomeField :: EntityField record typ -> SomeField record - -- ^ Copy the field directly from the record. + -- | Only copy the field if it is not equal to the provided value. CopyUnlessEq :: PersistField typ => EntityField record typ -> typ -> SomeField record - -- ^ Only copy the field if it is not equal to the provided value. - -- @since 2.6.2 -- | Copy the field into the database only if the value in the -- corresponding record is non-@NULL@. From 81ba831bd42a3ccba33c67cab0b923a0f8010fc2 Mon Sep 17 00:00:00 2001 From: Paul Rouse Date: Wed, 25 Oct 2017 11:26:12 +0100 Subject: [PATCH 2/2] Version bump: 2.6.2.1 --- persistent-mysql/ChangeLog.md | 4 ++++ persistent-mysql/persistent-mysql.cabal | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/persistent-mysql/ChangeLog.md b/persistent-mysql/ChangeLog.md index 23d94b512..a296c2b65 100644 --- a/persistent-mysql/ChangeLog.md +++ b/persistent-mysql/ChangeLog.md @@ -1,3 +1,7 @@ +## 2.6.2.1 + +* Fix haddock documentation [#725](https://github.com/yesodweb/persistent/pull/725) + ## 2.6.2 * Extend the `SomeField` type to allow `insertManyOnDuplicateKeyUpdate` to conditionally copy values. diff --git a/persistent-mysql/persistent-mysql.cabal b/persistent-mysql/persistent-mysql.cabal index 75cfbd1a8..ef41a1b8b 100644 --- a/persistent-mysql/persistent-mysql.cabal +++ b/persistent-mysql/persistent-mysql.cabal @@ -1,5 +1,5 @@ name: persistent-mysql -version: 2.6.2 +version: 2.6.2.1 license: MIT license-file: LICENSE author: Felipe Lessa , Michael Snoyman