Merge pull request #67 from brandonchinn178/updates

Update for GHC 9.8

Author: brandonchinn178

.github/workflows/ci.yml

@@ -57,22 +57,15 @@ jobs:
     strategy:
       matrix:
         ghc_version:
-          - '8.10'
-          - '9.0'
           - '9.4'
           - '9.6'
+          - '9.8'
         persistent_version:
-          - '2.13'
           - '2.14'
         include:
-          - ghc_version: '8.10.1'
-            persistent_version: '2.13'
+          - ghc_version: '9.4.4'
+            persistent_version: '2.14'
             oldest: true
-        exclude:
-          - ghc_version: '9.4'
-            persistent_version: '2.13'
-          - ghc_version: '9.6'
-            persistent_version: '2.13'
 
     name: compat_test (ghc-${{ matrix.ghc_version }}, persistent-${{ matrix.persistent_version }})
     runs-on: ubuntu-latest
@@ -94,27 +87,30 @@ jobs:
             --test-options='--color=always'
             --test-show-details=streaming
             --constraint='persistent ^>= ${{ matrix.persistent_version }}'
-            --constraint='persistent < 2.13.3.4 || >= 2.14.0.2'
+            --constraint='persistent >= 2.14.0.2'
       -
-        # TODO: remove
-        if: ${{ matrix.ghc_version == '9.6' }}
-        run:
-          cabal configure
-            --enable-append
-            --allow-newer='persistent:template-haskell'
-            --allow-newer='unliftio-pool:transformers'
-            --allow-newer='explainable-predicates:base'
-            --allow-newer='explainable-predicates:template-haskell'
+        # https://github.com/bitemyapp/esqueleto/pull/381
+        if: ${{ matrix.ghc_version == '9.8' }}
+        name: Patch esqueleto
+        run: |
+          cabal configure --enable-append --allow-newer esqueleto:text
+          cat >> cabal.project.local <<EOF
+          source-repository-package
+            type: git
+            location: https://github.com/MercuryTechnologies/esqueleto.git
+            tag: 94d27de57072a823d97bd9868b33c45545c067c4
+          EOF
       -
         if: ${{ matrix.oldest }}
         name: Use oldest dependencies
         run:
           cabal configure
             --enable-append --prefer-oldest
-            --constraint 'conduit >= 1.3.1'
+            --constraint 'array installed'
+            --constraint 'time installed'
+            --constraint 'persistent-sqlite > 2.13.0.3'
             --constraint 'silently >= 0.0.3'
             --constraint 'string-conversions >= 0.4'
-            --constraint 'unix-time >= 0.3.8'
       -
         name: Get build plan
         run: cabal build --dry-run

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Unreleased
 
+# v0.5.1
+
+* Add GHC 9.8 support
+* Drop support for GHC < 9.4
+
 # v0.5.0.1
 
 * Add GHC 9.4 support

package.yaml

@@ -1,5 +1,5 @@
 name: persistent-mtl
-version: 0.5.0.1
+version: 0.5.1
 maintainer: Brandon Chinn <[email protected]>
 synopsis: Monad transformer for the persistent API
 description: |
@@ -28,7 +28,7 @@ library:
     - persistent >= 2.13 && < 2.15
     - resource-pool < 1
     - resourcet < 1.4
-    - text < 2.1
+    - text < 2.2
     - transformers < 0.7
     - unliftio < 0.3
     - unliftio-core < 0.3
@@ -37,7 +37,6 @@ library:
   when:
     # https://gitlab.haskell.org/ghc/ghc/-/issues/20836
     - condition: >
-        impl(ghc >= 9.2.0) && impl(ghc < 9.3) ||
         impl(ghc >= 9.4.0) && impl(ghc < 9.4.3)
       buildable: false
 

persistent-mtl.cabal

@@ -1,11 +1,11 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack
 
 name:           persistent-mtl
-version:        0.5.0.1
+version:        0.5.1
 synopsis:       Monad transformer for the persistent API
 description:    A monad transformer and mtl-style type class for using the
                 persistent API directly in your monad transformer stack.
@@ -53,13 +53,13 @@ library
     , persistent >=2.13 && <2.15
     , resource-pool <1
     , resourcet <1.4
-    , text <2.1
+    , text <2.2
     , transformers <0.7
     , unliftio <0.3
     , unliftio-core <0.3
     , unliftio-pool <1
   default-language: Haskell2010
-  if impl(ghc >= 9.2.0) && impl(ghc < 9.3) || impl(ghc >= 9.4.0) && impl(ghc < 9.4.3)
+  if impl(ghc >= 9.4.0) && impl(ghc < 9.4.3)
 
     buildable: False
 

stack.yaml

@@ -1,9 +1,4 @@
-resolver: lts-19.33
-
-extra-deps:
-  - tasty-autocollect-0.3.0.0
-  # https://github.com/yesodweb/persistent/issues/1406#issuecomment-1226741099
-  - persistent-2.13.3.3
+resolver: lts-22.3
 
 ghc-options:
   '$locals': -Werror

stack.yaml.lock

@@ -3,24 +3,10 @@
 # For more information, please see the documentation at:
 #   https://docs.haskellstack.org/en/stable/lock_files
 
-packages:
-- completed:
-    hackage: tasty-autocollect-0.3.0.0@sha256:9026c5a96bb871513a4213ae3c9105538f12bb5ad6400fe05a56c69e6fc85424,4734
-    pantry-tree:
-      sha256: e796c1754a91aec1953da308cf5d9751a6b2bd219666fb2fe89672a244d7ba13
-      size: 3903
-  original:
-    hackage: tasty-autocollect-0.3.0.0
-- completed:
-    hackage: persistent-2.13.3.3@sha256:28aa9bebabb4a2b91e86ddc4cf994bd8a4b5b61ed807c163a44523b218577311,7050
-    pantry-tree:
-      sha256: 0113b5721e15e0c1cac9a135c77e659521a4217878ef9eabc237e68a80ac3671
-      size: 6052
-  original:
-    hackage: persistent-2.13.3.3
+packages: []
 snapshots:
 - completed:
-    sha256: 6d1532d40621957a25bad5195bfca7938e8a06d923c91bc52aa0f3c41181f2d4
-    size: 619204
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/19/33.yaml
-  original: lts-19.33
+    sha256: 53a2800f7fe0c4628af0e7d5e985707dd3af9863ac3983a43c835dbaa8ed5f35
+    size: 714094
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/3.yaml
+  original: lts-22.3

test/IntegrationTest.hs

@@ -1,4 +1,5 @@
 {- AUTOCOLLECT.TEST -}
+{-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE NamedFieldPuns #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE ScopedTypeVariables #-}
@@ -698,20 +699,20 @@ testPersistentAPI backendType =
         result <- runTestApp backendType $ do
           insertMany_ [person "Alice", person "Bob"]
           withRawQuery "SELECT name FROM person" [] $
-            Conduit.mapC (fromPersistValue' @Text . head) .| Conduit.sinkList
+            Conduit.mapC (getFirstPersistValue @Text) .| Conduit.sinkList
 
         result @?= ["Alice", "Bob"]
     , testCase "rawQueryRes" $ do
         result <- runTestApp backendType $ do
           insertMany_ [person "Alice", person "Bob"]
           acquire <- rawQueryRes "SELECT name FROM person" []
           Acquire.with acquire $ \conduit ->
-            runConduit $ conduit .| Conduit.mapC (fromPersistValue' @Text . head) .| Conduit.sinkList
+            runConduit $ conduit .| Conduit.mapC (getFirstPersistValue @Text) .| Conduit.sinkList
         result @?= ["Alice", "Bob"]
     , testCase "rawQuery" $ do
         result <- runTestApp backendType $ do
           insertMany_ [person "Alice", person "Bob"]
-          runConduit $ rawQuery "SELECT name FROM person" [] .| Conduit.mapC (fromPersistValue' @Text . head) .| Conduit.sinkList
+          runConduit $ rawQuery "SELECT name FROM person" [] .| Conduit.mapC (getFirstPersistValue @Text) .| Conduit.sinkList
         result @?= ["Alice", "Bob"]
     , testCase "rawExecute" $ do
         result <- runTestApp backendType $ do
@@ -792,8 +793,13 @@ testInterop backendType =
 
 {- Persistent helpers -}
 
-fromPersistValue' :: (PersistField a) => PersistValue -> a
-fromPersistValue' = either (error . Text.unpack) id . fromPersistValue
+getFirstPersistValue :: (PersistField a) => [PersistValue] -> a
+getFirstPersistValue = \case
+  [] -> error "Unexpectedly got no values"
+  v : _ -> fromPersistValueOrFail v
+
+fromPersistValueOrFail :: (PersistField a) => PersistValue -> a
+fromPersistValueOrFail = either (error . Text.unpack) id . fromPersistValue
 
 {- Meta SQL helpers -}
 

test/MockedTest.hs

@@ -12,6 +12,7 @@ import Conduit (runConduit, runResourceT, (.|))
 import qualified Conduit
 import qualified Data.Acquire as Acquire
 import qualified Data.Map.Strict as Map
+import Data.Maybe (listToMaybe)
 import Database.Persist.Sql (
   Entity (..),
   Single (..),
@@ -48,8 +49,8 @@ test =
         case result of
           Right _ -> assertFailure "runMockSqlQueryT did not fail"
           Left e -> do
-            let msg = head $ lines $ show (e :: SomeException)
-            msg @?= "Could not find mock for query: SelectList{..}<Person>"
+            let msg = listToMaybe $ lines $ show (e :: SomeException)
+            msg @?= Just "Could not find mock for query: SelectList{..}<Person>"
     , testCase "it continues after a mock doesn't match" $ do
         result <-
           runMockSqlQueryT