From f5d678d13dffc92b96a396780a41907e0c12ff78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9ophile=20Choutri?= Date: Fri, 19 Jan 2024 10:10:46 +0100 Subject: [PATCH 1/5] Use latest major versions of dependencies * bytestring 0.12 * postgresql-simpe 0.7 * text 2.1 --- pg-entity.cabal | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pg-entity.cabal b/pg-entity.cabal index dc7c0f4..98bb0f0 100644 --- a/pg-entity.cabal +++ b/pg-entity.cabal @@ -105,14 +105,14 @@ library hs-source-dirs: src build-depends: , base >=4.12 && <5.0 - , bytestring ^>=0.11 + , bytestring ^>=0.12 , colourista ^>=0.1 , parsec ^>=3.1 , pg-transact ^>=0.3 - , postgresql-simple ^>=0.6 + , postgresql-simple ^>=0.7 , resource-pool ^>=0.4 , template-haskell >=2.15.0.0 && <2.22.0.0.0 - , text ^>=2.0 + , text ^>=2.1 , text-display ^>=0.0 , text-manipulate ^>=0.3 , time ^>=1.12 From 8fd116fa73f3534b7c8df47ff7ae13b78ec792a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9ophile=20Choutri?= Date: Fri, 19 Jan 2024 10:13:43 +0100 Subject: [PATCH 2/5] Add changelog and bump version --- CHANGELOG.md | 6 +++++- pg-entity.cabal | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e0b90f6..cac6ce1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ # Revision history for Entity -## 0.0.4.4 -- 2024-12-23 +## 0.0.5.0 -- 2024-01-19 + +* Update version of `bytestring` to 0.12, `text` to 2.1 and `postgresql-simple` to 0.7 ([#72](https://github.com/tchoutri/pg-entity/pull/72)) + +## 0.0.4.4 -- 2023-12-23 * Remove extraneous quoting of table name in _selectWithFields ## 0.0.4.3 -- 2023-06-26 diff --git a/pg-entity.cabal b/pg-entity.cabal index 98bb0f0..231454b 100644 --- a/pg-entity.cabal +++ b/pg-entity.cabal @@ -5,7 +5,7 @@ description: A PostgreSQL layer to safely expand your SQL queries with a lightweight eDSL. Read the tutorial at https://hackage.haskell.org/package/pg-entity/src/docs/book/index.html -version: 0.0.4.4 +version: 0.0.5.0 homepage: https://hackage.haskell.org/package/pg-entity/src/docs/book/index.html @@ -16,7 +16,7 @@ category: Database license: MIT build-type: Simple tested-with: - GHC ==8.8.4 || ==8.10.7 || ==9.0.2 || ==9.2.8 || ==9.4.8 + GHC ==8.8.4 || ==8.10.7 || ==9.0.2 || ==9.2.8 || ==9.4.8 || ==9.6.4 extra-source-files: CHANGELOG.md From ed96b4bbd2df831d7c6b99a4dc22c09cff1e73d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9ophile=20Choutri?= Date: Fri, 19 Jan 2024 10:16:35 +0100 Subject: [PATCH 3/5] fix CI --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c1f8756..c90ca88 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,10 +21,10 @@ jobs: version: 0.1.6.0 tests: name: ${{ matrix.ghc }} on ${{ matrix.os }} - needs: generateMatrix + needs: generate-matrix runs-on: ${{ matrix.os }} strategy: - matrix: ${{ fromJSON(needs.generateMatrix.outputs.matrix) }} + matrix: ${{ fromJSON(needs.generate-matrix.outputs.matrix) }} # Service containers to run with `container-job` services: # Label used to access the service container From a0dbf8b58d4afdd9b5808e890eddaa25990d4b01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9ophile=20Choutri?= Date: Fri, 19 Jan 2024 10:18:56 +0100 Subject: [PATCH 4/5] fix CI? pretty please? --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c90ca88..68aef5c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,9 +14,9 @@ jobs: steps: - name: Extract the tested GHC versions id: set-matrix - uses: kleidukos/get-tested@0.1.6.0 + uses: kleidukos/get-tested@v0.1.6.0 with: - cabal-file: get-tested.cabal + cabal-file: pg-entity.cabal ubuntu: true version: 0.1.6.0 tests: From 2b6759c0033c59245bc66cc82db1a38fdb67f8a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9ophile=20Choutri?= Date: Fri, 19 Jan 2024 10:34:47 +0100 Subject: [PATCH 5/5] Fix imports of MTL --- docs/src/Tutorial.hs | 2 +- pg-entity.cabal | 1 - test/Utils.hs | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/src/Tutorial.hs b/docs/src/Tutorial.hs index c3d43ce..d46afe2 100644 --- a/docs/src/Tutorial.hs +++ b/docs/src/Tutorial.hs @@ -28,7 +28,7 @@ import Database.PostgreSQL.Simple.ToField import Database.PostgreSQL.Transact (DBT) import GHC.Generics -import Control.Monad.Error +import Control.Monad.IO.Class (MonadIO (..)) import qualified Data.Time as Time import qualified Data.UUID.V4 as UUID import Database.PostgreSQL.Entity diff --git a/pg-entity.cabal b/pg-entity.cabal index 231454b..da8ed6a 100644 --- a/pg-entity.cabal +++ b/pg-entity.cabal @@ -116,7 +116,6 @@ library , text-display ^>=0.0 , text-manipulate ^>=0.3 , time ^>=1.12 - , uuid ^>=1.3 , vector ^>=0.13 if flag(prod) diff --git a/test/Utils.hs b/test/Utils.hs index 865c340..4aae2bd 100644 --- a/test/Utils.hs +++ b/test/Utils.hs @@ -4,6 +4,7 @@ module Utils where import Control.Exception.Safe +import Control.Monad (void) import Control.Monad.IO.Class import Control.Monad.Reader import Data.ByteString (ByteString)