Skip to content

Commit cd11fbb

Browse files
authored
Fix export of keyAndEntityFieldsDatabase (#1579)
1 parent 91af69d commit cd11fbb

5 files changed

Lines changed: 9 additions & 1 deletion

File tree

persistent/ChangeLog.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Changelog for persistent
22

3+
# 2.15.1.0
4+
5+
* [#1519](https://github.com/yesodweb/persistent/pull/1519/files/9865a295f4545d30e55aacb6efc25f27f758e8ad#diff-5af2883367baae8f7f266df6a89fc2d1defb7572d94ed069e05c8135a883bc45)
6+
* Add `keyAndEntityFieldsDatabase`. This was intended to be added in 2.14.7.0 but was not properly re-exported.
7+
38
# 2.15.0.0
49

510
* [#1569](https://github.com/yesodweb/persistent/pull/1569)

persistent/Database/Persist/EntityDef.hs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ module Database.Persist.EntityDef
2424
, entityPrimary
2525
, entitiesPrimary
2626
, keyAndEntityFields
27+
, keyAndEntityFieldsDatabase
2728
-- * Setters
2829
, setEntityId
2930
, setEntityIdDef

persistent/Database/Persist/EntityDef/Internal.hs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ module Database.Persist.EntityDef.Internal
1111
, entityPrimary
1212
, entitiesPrimary
1313
, keyAndEntityFields
14+
, keyAndEntityFieldsDatabase
1415
, toEmbedEntityDef
1516
, EntityIdDef(..)
1617
) where

persistent/Database/Persist/Types.hs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ import Database.Persist.Types.Base
7575
, WhyNullable(..)
7676
, fieldAttrsContainsNullable
7777
, keyAndEntityFields
78+
, keyAndEntityFieldsDatabase
7879
, noCascade
7980
, parseFieldAttrs
8081
)

persistent/Database/Persist/Types/Base.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ keyAndEntityFields ent =
223223
--
224224
-- For fields on the Haskell type use 'keyAndEntityFieldsDatabase'
225225
--
226-
-- @since 2.14.6.0
226+
-- @since 2.15.1.0
227227
keyAndEntityFieldsDatabase :: EntityDef -> NonEmpty FieldDef
228228
keyAndEntityFieldsDatabase ent =
229229
keyWithFields (entityId ent) fields

0 commit comments

Comments
 (0)