Add mpsAvoidHsKeyword in MkPersistSettings (#1480)

* Add `mpsAvoidHsKeyword`

* Bump to 2.14.6.0

---------

Co-authored-by: Matt Parsons <parsonsmatt@gmail.com>

persistent/ChangeLog.md

@@ -8,7 +8,9 @@
     * Always generates `SymbolToField "id"` instance
 * [#1509](https://github.com/yesodweb/persistent/pull/1509)
     * Provide `ViaPersistEntity` for defining `PathMultiPiece` for entity keys.
-
+* [#1480](https://github.com/yesodweb/persistent/pull/1480)
+  * Add `mpsAvoidHsKeyword` in `MkPersistSettings`
+  * 
 ## 2.14.5.2
 
 * [#1513](https://github.com/yesodweb/persistent/pull/1513)

persistent/Database/Persist/TH.hs

@@ -44,6 +44,7 @@ module Database.Persist.TH
     , mpsGeneric
     , mpsPrefixFields
     , mpsFieldLabelModifier
+    , mpsAvoidHsKeyword
     , mpsConstraintLabelModifier
     , mpsEntityHaddocks
     , mpsEntityJSON
@@ -1062,6 +1063,12 @@ data MkPersistSettings = MkPersistSettings
     -- Note: this setting is ignored if mpsPrefixFields is set to False.
     --
     -- @since 2.11.0.0
+    , mpsAvoidHsKeyword :: Text -> Text
+    -- ^ Customise function for field accessors applied only when the field name matches any of Haskell keywords.
+    --
+    -- Default: suffix "_".
+    --
+    -- @since 2.14.6.0
     , mpsConstraintLabelModifier :: Text -> Text -> Text
     -- ^ Customise the Constraint names using the entity and field name. The
     -- result should be a valid haskell type (start with an upper cased letter).
@@ -1165,6 +1172,7 @@ mkPersistSettings backend = MkPersistSettings
     , mpsGeneric = False
     , mpsPrefixFields = True
     , mpsFieldLabelModifier = (++)
+    , mpsAvoidHsKeyword = (++ "_")
     , mpsConstraintLabelModifier = (++)
     , mpsEntityHaddocks = False
     , mpsEntityJSON = Just EntityJSON
@@ -3148,7 +3156,7 @@ mkRecordName mps prefix entNameHS fieldNameHS =
         unFieldNameHS fieldNameHS
 
     avoidKeyword :: Text -> Text
-    avoidKeyword name = if name `Set.member` haskellKeywords then name ++ "_" else name
+    avoidKeyword name = if name `Set.member` haskellKeywords then mpsAvoidHsKeyword mps name else name
 
 haskellKeywords :: Set.Set Text
 haskellKeywords = Set.fromList