Merge pull request #116 from haskellari/aeson-2.2

Support aeson-2.2

Author: phadej

.github/workflows/haskell-ci.yml

@@ -8,9 +8,9 @@
 #
 # For more information, see https://github.com/haskell-CI/haskell-ci
 #
-# version: 0.16
+# version: 0.16.6
 #
-# REGENDATA ("0.16",["github","cabal.project"])
+# REGENDATA ("0.16.6",["github","cabal.project"])
 #
 name: Haskell-CI
 on:
@@ -38,19 +38,19 @@ jobs:
     strategy:
       matrix:
         include:
-          - compiler: ghc-9.6.1
+          - compiler: ghc-9.6.2
             compilerKind: ghc
-            compilerVersion: 9.6.1
+            compilerVersion: 9.6.2
             setup-method: ghcup
             allow-failure: false
-          - compiler: ghc-9.4.4
+          - compiler: ghc-9.4.5
             compilerKind: ghc
-            compilerVersion: 9.4.4
+            compilerVersion: 9.4.5
             setup-method: ghcup
             allow-failure: false
-          - compiler: ghc-9.2.7
+          - compiler: ghc-9.2.8
             compilerKind: ghc
-            compilerVersion: 9.2.7
+            compilerVersion: 9.2.8
             setup-method: ghcup
             allow-failure: false
           - compiler: ghc-9.0.2

CHANGES.md

@@ -1,3 +1,7 @@
+### Version 0.6.5.1 (2023-07-09)
+
+  * Support `aeson-2.2.0.0`
+
 ### Version 0.6.5 (2022-10-30)
 
   * Add `withConnect`

postgresql-simple.cabal

@@ -1,7 +1,6 @@
 cabal-version:      1.12
 name:               postgresql-simple
-version:            0.6.5
-x-revision:         1
+version:            0.6.5.1
 synopsis:           Mid-Level PostgreSQL client library
 description:
   Mid-Level PostgreSQL client library, forked from mysql-simple.
@@ -34,9 +33,9 @@ tested-with:
    || ==8.8.4
    || ==8.10.7
    || ==9.0.2
-   || ==9.2.7
-   || ==9.4.4
-   || ==9.6.1
+   || ==9.2.8
+   || ==9.4.5
+   || ==9.6.2
 
 library
   default-language:   Haskell2010
@@ -92,7 +91,7 @@ library
 
   -- Other dependencies
   build-depends:
-      aeson               >=1.4.1.0    && <1.6 || >=2.0.0.0 && <2.2
+      aeson               >=1.4.1.0    && <1.6 || >=2.0.0.0 && <2.3
     , attoparsec          >=0.13.2.2   && <0.15
     , bytestring-builder  >=0.10.8.1.0 && <0.11
     , case-insensitive    >=1.2.0.11   && <1.3

src/Database/PostgreSQL/Simple/FromField.hs

@@ -120,8 +120,6 @@ import           Control.Applicative ( Const(Const), (<|>), (<$>), pure, (*>), (
 import           Control.Concurrent.MVar (MVar, newMVar)
 import           Control.Exception (Exception)
 import qualified Data.Aeson as JSON
-import qualified Data.Aeson.Internal as JSON
-import qualified Data.Aeson.Parser as JSON (value')
 import           Data.Attoparsec.ByteString.Char8 hiding (Result)
 import           Data.ByteString (ByteString)
 import qualified Data.ByteString.Char8 as B
@@ -156,6 +154,12 @@ import qualified Data.UUID.Types as UUID
 import           Data.Scientific (Scientific)
 import           GHC.Real (infinity, notANumber)
 
+#if MIN_VERSION_aeson(2,1,2)
+import qualified Data.Aeson.Types as JSON
+#else
+import qualified Data.Aeson.Internal as JSON
+#endif
+
 -- | Exception thrown if conversion from a SQL value to a Haskell
 -- value fails.
 data ResultError = Incompatible { errSQLType :: String
@@ -574,7 +578,7 @@ instance FromField UUID where
 -- | json, jsonb
 instance FromField JSON.Value where
     fromField f mbs = parseBS =<< fromFieldJSONByteString f mbs
-      where parseBS bs = case parseOnly (JSON.value' <* endOfInput) bs of
+      where parseBS bs = case JSON.eitherDecodeStrict' bs of
                    Left  err -> returnError ConversionFailed f err
                    Right val -> pure val