619bee4 · typeable/aeson

git.iko.soy/typeable/aeson

Add show, postgres to ZonedTime parser

commit619bee4dee7fe0a458d611fe488def1951652047 authorMatthias Fischmann <mf@zerobuzz.net> dateTue 1 Jul 2014, 08:10 (12 years ago) parent6ba8069

2 files changed+6−2

unifiedsplit

Data/Aeson/Types/Instances.hs+3−1

@@ -518,7 +518,9 @@ instance FromJSON ZonedTime where

518518 Nothing -> empty

519519 tryFormats = foldr1 (<|>) . map tryFormat

520520 alternateFormats =

521− "%FT%T%QZ" :

521+ "%FT%T%QZ" : -- (javascript new Date().toISOString())

522+ "%F %T%Q%z" : -- (postgres)

523+ "%F %T%Q %Z" : -- (time's Show format)

522524 "%FT%T%Q%z" :

523525 "%Y-%mT%T%Q" :

524526 "%Y-%mT%R" :

tests/Properties.hs+3−1

@@ -73,7 +73,9 @@ toFromJSON x = case fromJSON . toJSON $ x of

7373

7474zonedTimeToJSON :: ZonedTime -> Bool

7575zonedTimeToJSON t = and $

76− toFromJSON' "%FT%T%QZ" t (clearTimeZone t) :

76+ toFromJSON' "%FT%T%QZ" t (clearTimeZone t) : -- (javascript new Date().toISOString())

77+ toFromJSON' "%F %T%Q%z" t t : -- (postgres)

78+ toFromJSON' "%F %T%Q %Z" t t : -- (time's Show format)

7779 toFromJSON' "%FT%T%Q%z" t t :

7880 toFromJSON' "%Y-%mT%T%Q" t (clearTimeZone . clearDay $ t) :

7981 toFromJSON' "%Y-%mT%R" t (clearTimeZone . clearDay . clearSeconds $ t) :