Merge pull request #42 from Holmusk/nitin/update-ghc-version

Changes include:
- Update GHC versions in CI
- Allow resource-pool 0.4.0.0

Co-authored-by: Jan Hrček <honza.hrk@gmail.com>

Author: nitinprakash96

.github/workflows/haskell-ci.yml

@@ -14,12 +14,12 @@ jobs:
       matrix:
         os:
           - ubuntu-latest
-        cabal: [3.6]
+        cabal: [3.10.1.0]
         ghc:
           - 8.10.7
           - 9.0.2
-          - 9.2.4
-          - 9.4.2
+          - 9.2.8
+          - 9.4.5
     services:
       postgres:
         image: postgres:15
@@ -51,15 +51,19 @@ jobs:
         run: cabal test --enable-tests
 
   stack:
-    name: ${{ matrix.stack-yaml }}
-    runs-on: ubuntu-latest
+    name: ${{ matrix.os }} / ${{ matrix.stack-yaml }}
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
+        os:
+          - ubuntu-latest
         stack:
-          - 2.7.5
+          - 2.11.1
         stack-yaml:
           - stack-8.10.7.yaml
           - stack-9.0.2.yaml
+          - stack-9.2.8.yaml
+          - stack-9.4.5.yaml
     services:
       postgres:
         image: postgres:15

postgresql-simple-named.cabal

@@ -88,7 +88,7 @@ test-suite postgresql-simple-named-test
                      , hspec >= 2.5
                      , postgresql-simple-named
                      , postgresql-simple >= 0.5 && < 0.7
-                     , resource-pool ^>= 0.2.3.2
+                     , resource-pool ^>= 0.2.3.2 || ^>= 0.4.0.0
                      , transformers
 
   ghc-options:         -threaded -rtsopts -with-rtsopts=-N

stack-9.0.2.yaml

@@ -1 +1 @@
-resolver: lts-19.31
+resolver: lts-19.33

stack-9.2.8.yaml

@@ -0,0 +1 @@
+resolver: lts-20.26

stack-9.4.5.yaml

@@ -0,0 +1 @@
+resolver: lts-21.0

test/Spec.hs

@@ -77,7 +77,7 @@ unitTests dbPool = describe "Testing: postgresql-simple-named" $ do
         -> Sql.Query
         -> [NamedParam]
         -> IO (Either PgNamedError TestValue)
-    callQuery f q params = runNamedQuery $ Pool.withResource dbPool (\conn -> f conn q params)
+    callQuery f q params = Pool.withResource dbPool (\conn -> runNamedQuery $ f conn q params)
 
 runNamedQuery :: ExceptT PgNamedError IO [TestValue] -> IO (Either PgNamedError TestValue)
 runNamedQuery = fmap (second head) . runExceptT