6d7f67e · typeable/postgresql-simple

git.iko.soy/typeable/postgresql-simple

Merge pull request #81 from snoyberg/master

bytestring 0.9 support #80

commit6d7f67e77af7e0e1c183e550175ca31d67bd7d5f authorLeon P Smith <leon@melding-monads.com> dateThu 12 Sep 2013, 05:20 (13 years ago) parent41b4cda d599c80

2 files changed+2−2

compare with master

unifiedsplit

postgresql-simple.cabal+1−1 src/Database/PostgreSQL/Simple/FromField.hs+1−1

postgresql-simple.cabal+1−1

@@ -57,7 +57,7 @@ Library

5757 base < 5,

5858 blaze-builder,

5959 blaze-textual,

60− bytestring >= 0.10,

60+ bytestring >= 0.9,

6161 containers,

6262 postgresql-libpq >= 0.6.2,

6363 template-haskell,

src/Database/PostgreSQL/Simple/FromField.hs+1−1

@@ -452,7 +452,7 @@ instance FromField JSON.Value where

452452 else case mbs of

453453 Nothing -> returnError UnexpectedNull f ""

454454 Just bs ->

455− case JSON.eitherDecode' $ LB.fromStrict bs of

455+ case JSON.eitherDecode' $ LB.fromChunks [bs] of

456456 Left err -> returnError ConversionFailed f err

457457 Right val -> pure val

458458