persistent-template 2.5.1.2 → 2.5.1.3
raw patch · 3 files changed
+9/−5 lines, 3 filesPVP ok
version bump matches the API change (PVP)
API changes (from Hackage documentation)
Files
- ChangeLog.md +4/−0
- Database/Persist/TH.hs +4/−4
- persistent-template.cabal +1/−1
ChangeLog.md view
@@ -1,3 +1,7 @@+## 2.5.1.3++* fix GHC 7.8 bug when a field name is "type"+ ## 2.5.1.2 * fix a bad Eq instance /= definition for Key when mpsGenetric=True
Database/Persist/TH.hs view
@@ -86,7 +86,7 @@ -- <https://github.com/yesodweb/persistent/issues/412> unHaskellNameForJSON :: HaskellName -> Text unHaskellNameForJSON = fixTypeUnderscore . unHaskellName- where fixTypeUnderscore "type_" = "type"+ where fixTypeUnderscore "type" = "type_" fixTypeUnderscore name = name -- | Converts a quasi-quoted syntax into a list of entity definitions, to be@@ -1528,7 +1528,7 @@ obj <- newName "obj" mzeroE <- [|mzero|] - xs <- mapM (newName . unpack . unHaskellName . fieldHaskell)+ xs <- mapM (newName . unpack . unHaskellNameForJSON . fieldHaskell) $ entityFields def let conName = mkName $ unpack $ unHaskellName $ entityHaskell def@@ -1539,7 +1539,7 @@ (objectE `AppE` ListE pairs) pairs = zipWith toPair (entityFields def) xs toPair f x = InfixE- (Just (packE `AppE` LitE (StringL $ unpack $ unHaskellNameForJSON $ fieldHaskell f)))+ (Just (packE `AppE` LitE (StringL $ unpack $ unHaskellName $ fieldHaskell f))) dotEqualE (Just $ VarE x) fromJSONI = typeInstanceD ''FromJSON (mpsGeneric mps) typ [parseJSON']@@ -1556,7 +1556,7 @@ toPull f = InfixE (Just $ VarE obj) (if maybeNullable f then dotColonQE else dotColonE)- (Just $ AppE packE $ LitE $ StringL $ unpack $ unHaskellNameForJSON $ fieldHaskell f)+ (Just $ AppE packE $ LitE $ StringL $ unpack $ unHaskellName $ fieldHaskell f) case mpsEntityJSON mps of Nothing -> return [toJSONI, fromJSONI] Just entityJSON -> do
persistent-template.cabal view
@@ -1,5 +1,5 @@ name: persistent-template-version: 2.5.1.2+version: 2.5.1.3 license: MIT license-file: LICENSE author: Michael Snoyman <michael@snoyman.com>