persistent 1.2.3.2 → 1.2.3.3

raw patch · 2 files changed

+22/−2 lines, 2 filesdep +scientificdep ~monad-logger

Dependencies added: scientific

Dependency ranges changed: monad-logger

Files

• Database/Persist/Types/Base.hs +19/−1
• persistent.cabal +3/−1

@@ -1,3 +1,4 @@+{-# LANGUAGE CPP #-} {-# LANGUAGE TypeFamilies #-} {-# LANGUAGE DeriveFunctor #-} {-# LANGUAGE ExistentialQuantification #-}@@ -25,6 +26,9 @@ import Data.Map (Map) import qualified Data.HashMap.Strict as HM import Data.Word (Word32)+#if MIN_VERSION_aeson(0, 7, 0)+import qualified Data.Scientific+#endif  -- | A 'Checkmark' should be used as a field type whenever a -- uniqueness constraint should guarantee that a certain kind of@@ -215,7 +219,13 @@     toJSON (PersistText t) = A.String $ T.cons 's' t     toJSON (PersistByteString b) = A.String $ T.cons 'b' $ TE.decodeUtf8 $ B64.encode b     toJSON (PersistInt64 i) = A.Number $ fromIntegral i-    toJSON (PersistDouble d) = A.Number $ AN.D d+    toJSON (PersistDouble d) = A.Number $+#if MIN_VERSION_aeson(0, 7, 0)+        Data.Scientific.fromFloatDigits+#else+        AN.D+#endif+        d     toJSON (PersistRational r) = A.String $ T.pack $ 'r' : show r     toJSON (PersistBool b) = A.Bool b     toJSON (PersistTimeOfDay t) = A.String $ T.pack $ 't' : show t@@ -248,8 +258,16 @@             case reads $ T.unpack t of                 (x, _):_ -> return x                 [] -> fail "Could not read"++#if MIN_VERSION_aeson(0, 7, 0)+    parseJSON (A.Number n) = return $+        if fromInteger (floor n) == n+            then PersistInt64 $ floor n+            else PersistDouble $ fromRational $ toRational n+#else     parseJSON (A.Number (AN.I i)) = return $ PersistInt64 $ fromInteger i     parseJSON (A.Number (AN.D d)) = return $ PersistDouble d+#endif     parseJSON (A.Bool b) = return $ PersistBool b     parseJSON A.Null = return $ PersistNull     parseJSON (A.Array a) = fmap PersistList (mapM A.parseJSON $ V.toList a)

@@ -1,5 +1,5 @@ name:            persistent-version:         1.2.3.2+version:         1.2.3.3 license:         MIT license-file:    LICENSE author:          Michael Snoyman <michael@snoyman.com>@@ -43,6 +43,7 @@                    , blaze-html               >= 0.5                    , blaze-markup             >= 0.5.1                    , silently+                   , scientific      exposed-modules: Database.Persist                      Database.Persist.Quasi@@ -94,6 +95,7 @@                    , conduit                    , monad-control                    , blaze-html+                   , scientific      cpp-options: -DTEST