persistent-iproute 0.2.4 → 0.2.5

raw patch · 2 files changed

+37/−11 lines, 2 filesdep ~persistentPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: persistent

API changes (from Hackage documentation)

Files

• Database/Persist/Instances/IP.hs +36/−10
• persistent-iproute.cabal +1/−1

@@ -6,9 +6,8 @@ import Control.Applicative (pure, (<$>)) #endif import Data.Aeson.IP ()-import Data.ByteString.Char8 (pack,unpack)+import Data.ByteString.Char8 (ByteString, pack,unpack) import Data.IP (IPRange, IP)-import Data.Maybe (fromMaybe) import qualified Data.Text as T import Database.Persist import Database.Persist.Sql@@ -16,11 +15,36 @@ import Web.HttpApiData (ToHttpApiData(..),FromHttpApiData(..)) import Web.PathPieces (PathPiece(..)) +note :: Maybe b -> T.Text -> Either T.Text b+{-# INLINE note #-}+note x y = maybe (Left y) Right x++ctor :: ByteString -> PersistValue+{-# INLINE ctor #-}++ctorName :: T.Text+{-# INLINE ctorName #-}++unCtor :: PersistValue -> Maybe ByteString+{-# INLINE unCtor #-}++#if MIN_VERSION_persistent(2,11,0)+ctor = PersistLiteralEscaped+ctorName = "PersistLiteralEscaped"+unCtor x = case x of {PersistLiteralEscaped y -> Just y; _ -> Nothing}+#else+ctor = PersistDbSpecific+ctorName = "PersistDbSpecific"+unCtor x = case x of {PersistDbSpecific y -> Just y; _ -> Nothing}+#endif+ instance PersistField IP where-    toPersistValue = PersistDbSpecific . pack . show+    toPersistValue = ctor . pack . show -    fromPersistValue (PersistDbSpecific v) = fromMaybe (Left "Unable to parse IP") (pure <$> readMaybe (unpack v))-    fromPersistValue _ = Left "IP must be converted from PersistDbSpecific"+    fromPersistValue pval = do+        ipBS <- unCtor pval `note` mconcat ["IP must be converted from ", ctorName]+        let ipStr = unpack ipBS+        readMaybe ipStr `note` mconcat ["Unable to parse IP: ", T.pack ipStr]  instance PersistFieldSql IP where #ifdef USE_IP4R@@ -30,10 +54,12 @@ #endif  instance PersistField IPRange where-    toPersistValue = PersistDbSpecific . pack . show+    toPersistValue = ctor . pack . show -    fromPersistValue (PersistDbSpecific v) = fromMaybe (Left "Unable to parse IPRange") (pure <$> readMaybe (unpack v))-    fromPersistValue _ = Left "IPRange must be converted from PersistDbSpecific"+    fromPersistValue pval = do+        iprBS <- unCtor pval `note` mconcat ["IPRange must be converted from ", ctorName]+        let iprStr = unpack iprBS+        readMaybe iprStr `note` mconcat ["Unable to parse IPRange: ", T.pack iprStr]  instance PersistFieldSql IPRange where #ifdef USE_IP4R@@ -62,9 +88,9 @@ instance FromHttpApiData IP where     parseUrlPiece txt         | Just ip <- readMaybe $ T.unpack txt = Right ip-        | otherwise = Left "Unable to parse IP"+        | otherwise = Left $ mconcat ["Unable to parse IP: ", txt]  instance FromHttpApiData IPRange where     parseUrlPiece txt         | Just ipr <- readMaybe . T.unpack $ T.replace "%2F" "/" txt = Right ipr-        | otherwise = Left "Unable to parse IPRange"+        | otherwise = Left $ mconcat ["Unable to parse IPRange: ", txt]

@@ -1,5 +1,5 @@ name:                persistent-iproute-version:             0.2.4+version:             0.2.5 synopsis:            Persistent instances for types in iproute description:         Persistent instances and operators for types in iproute to use with PostgreSQL. license:             BSD3