Skip to content

Commit e2f9201

Browse files
authored
Merge pull request #725 from paul-rouse/master
Fix haddocks: postfix comments on GADT fields don't work - use prefix…
2 parents 24cf0e4 + 81ba831 commit e2f9201

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

persistent-mysql/ChangeLog.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 2.6.2.1
2+
3+
* Fix haddock documentation [#725](https://github.com/yesodweb/persistent/pull/725)
4+
15
## 2.6.2
26

37
* Extend the `SomeField` type to allow `insertManyOnDuplicateKeyUpdate` to conditionally copy values.

persistent-mysql/Database/Persist/MySQL.hs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1048,12 +1048,13 @@ insertOnDuplicateKeyUpdate record =
10481048
-- | This type is used to determine how to update rows using MySQL's
10491049
-- @INSERT ON DUPLICATE KEY UPDATE@ functionality, exposed via
10501050
-- 'insertManyOnDuplicateKeyUpdate' in the library.
1051+
--
1052+
-- @since 2.6.2
10511053
data SomeField record where
1054+
-- | Copy the field directly from the record.
10521055
SomeField :: EntityField record typ -> SomeField record
1053-
-- ^ Copy the field directly from the record.
1056+
-- | Only copy the field if it is not equal to the provided value.
10541057
CopyUnlessEq :: PersistField typ => EntityField record typ -> typ -> SomeField record
1055-
-- ^ Only copy the field if it is not equal to the provided value.
1056-
-- @since 2.6.2
10571058

10581059
-- | Copy the field into the database only if the value in the
10591060
-- corresponding record is non-@NULL@.

persistent-mysql/persistent-mysql.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: persistent-mysql
2-
version: 2.6.2
2+
version: 2.6.2.1
33
license: MIT
44
license-file: LICENSE
55
author: Felipe Lessa <[email protected]>, Michael Snoyman

0 commit comments

Comments
 (0)