git.iko.soy/typeable/swagger2
on master help sign in
Fix ToSchema & ToParamSchema instances for NominalDiffTime
88b35bfGregor Kleen
src/Data/Swagger/Internal/ParamSchema.hs+2−2
compare with master
unifiedsplit
@@ -31,7 +31,7 @@ import "unordered-containers" Data.HashSet (HashSet)
31import Data.Monoid
31import Data.Monoid
32import Data.Set (Set)
32import Data.Set (Set)
33import Data.Scientific
33import Data.Scientific
34−import Data.Fixed (HasResolution(..), Fixed)
34+import Data.Fixed (HasResolution(..), Fixed, Pico)
35import qualified Data.Text as T
35import qualified Data.Text as T
36import qualified Data.Text.Lazy as TL
36import qualified Data.Text.Lazy as TL
37import Data.Time
37import Data.Time
@@ -203,7 +203,7 @@ instance ToParamSchema UTCTime where
203 toParamSchema _ = timeParamSchema "yyyy-mm-ddThh:MM:ssZ"
203 toParamSchema _ = timeParamSchema "yyyy-mm-ddThh:MM:ssZ"
204
204
205instance ToParamSchema NominalDiffTime where
205instance ToParamSchema NominalDiffTime where
206− toParamSchema _ = toParamSchema (Proxy :: Proxy Integer)
206+ toParamSchema _ = toParamSchema (Proxy :: Proxy Pico)
207
207
208instance ToParamSchema T.Text where
208instance ToParamSchema T.Text where
209 toParamSchema _ = toParamSchema (Proxy :: Proxy String)
209 toParamSchema _ = toParamSchema (Proxy :: Proxy String)
src/Data/Swagger/Internal/Schema.hs+2−2
@@ -47,7 +47,7 @@ import Data.IntMap (IntMap)
47import Data.Map (Map)
47import Data.Map (Map)
48import Data.Proxy
48import Data.Proxy
49import Data.Scientific (Scientific)
49import Data.Scientific (Scientific)
50−import Data.Fixed (Fixed, HasResolution)
50+import Data.Fixed (Fixed, HasResolution, Pico)
51import Data.Set (Set)
51import Data.Set (Set)
52import qualified Data.Text as T
52import qualified Data.Text as T
53import qualified Data.Text.Lazy as TL
53import qualified Data.Text.Lazy as TL
@@ -483,7 +483,7 @@ instance ToSchema ZonedTime where
483 & example ?~ toJSON (ZonedTime (LocalTime (fromGregorian 2016 7 22) (TimeOfDay 7 40 0)) (hoursToTimeZone 3))
483 & example ?~ toJSON (ZonedTime (LocalTime (fromGregorian 2016 7 22) (TimeOfDay 7 40 0)) (hoursToTimeZone 3))
484
484
485instance ToSchema NominalDiffTime where
485instance ToSchema NominalDiffTime where
486− declareNamedSchema _ = declareNamedSchema (Proxy :: Proxy Integer)
486+ declareNamedSchema _ = declareNamedSchema (Proxy :: Proxy Pico)
487
487
488-- |
488-- |
489-- >>> toSchema (Proxy :: Proxy UTCTime) ^. format
489-- >>> toSchema (Proxy :: Proxy UTCTime) ^. format