diff --git a/ChangeLog.md b/ChangeLog.md --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,5 +1,10 @@ # Changelog for persistent +# 2.15.1.0 + +* [#1519](https://github.com/yesodweb/persistent/pull/1519/files/9865a295f4545d30e55aacb6efc25f27f758e8ad#diff-5af2883367baae8f7f266df6a89fc2d1defb7572d94ed069e05c8135a883bc45) + * Add `keyAndEntityFieldsDatabase`. This was intended to be added in 2.14.7.0 but was not properly re-exported. + # 2.15.0.1 * [#1575](https://github.com/yesodweb/persistent/pull/1575) diff --git a/Database/Persist/EntityDef.hs b/Database/Persist/EntityDef.hs --- a/Database/Persist/EntityDef.hs +++ b/Database/Persist/EntityDef.hs @@ -24,6 +24,7 @@ , entityPrimary , entitiesPrimary , keyAndEntityFields + , keyAndEntityFieldsDatabase -- * Setters , setEntityId , setEntityIdDef diff --git a/Database/Persist/EntityDef/Internal.hs b/Database/Persist/EntityDef/Internal.hs --- a/Database/Persist/EntityDef/Internal.hs +++ b/Database/Persist/EntityDef/Internal.hs @@ -11,6 +11,7 @@ , entityPrimary , entitiesPrimary , keyAndEntityFields + , keyAndEntityFieldsDatabase , toEmbedEntityDef , EntityIdDef(..) ) where diff --git a/Database/Persist/Types.hs b/Database/Persist/Types.hs --- a/Database/Persist/Types.hs +++ b/Database/Persist/Types.hs @@ -75,6 +75,7 @@ , WhyNullable(..) , fieldAttrsContainsNullable , keyAndEntityFields + , keyAndEntityFieldsDatabase , noCascade , parseFieldAttrs ) diff --git a/Database/Persist/Types/Base.hs b/Database/Persist/Types/Base.hs --- a/Database/Persist/Types/Base.hs +++ b/Database/Persist/Types/Base.hs @@ -223,7 +223,7 @@ -- -- For fields on the Haskell type use 'keyAndEntityFieldsDatabase' -- --- @since 2.14.6.0 +-- @since 2.15.1.0 keyAndEntityFieldsDatabase :: EntityDef -> NonEmpty FieldDef keyAndEntityFieldsDatabase ent = keyWithFields (entityId ent) fields diff --git a/persistent.cabal b/persistent.cabal --- a/persistent.cabal +++ b/persistent.cabal @@ -1,5 +1,5 @@ name: persistent -version: 2.15.0.1 +version: 2.15.1.0 license: MIT license-file: LICENSE author: Michael Snoyman