Merge patch into master

nikita-volkov · Oct 16, 2023 · dfca262 · dfca262
2 parents 6270c62 + a370d72
commit dfca262
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml
@@ -11,8 +11,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - ghc: 8.10.1
+          - ghc: 8.8.1
             ghc-options: ""
+            ignore-haddock: "true"
           - ghc: latest
 
     runs-on: ubuntu-latest
@@ -38,3 +39,4 @@ jobs:
         with:
           ghc: ${{matrix.ghc}}
           ghc-options: ${{matrix.ghc-options}}
+          ignore-haddock: ${{matrix.ignore-haddock}}
diff --git a/hasql.cabal b/hasql.cabal
@@ -1,6 +1,6 @@
 cabal-version:      3.0
 name:               hasql
-version:            1.6.3.2
+version:            1.6.3.3
 category:           Hasql, Database, PostgreSQL
 synopsis:           An efficient PostgreSQL driver with a flexible mapping API
 description:
@@ -99,7 +99,7 @@ library
   build-depends:
     , aeson >=2 && <3
     , attoparsec >=0.10 && <0.15
-    , base >=4.12 && <5
+    , base >=4.13 && <5
     , bytestring >=0.10 && <0.12
     , bytestring-strict-builder >=0.4.5.1 && <0.5
     , contravariant >=1.3 && <2

diff --git a/profiling/Main.hs b/profiling/Main.hs
@@ -25,7 +25,7 @@ main =
             host = "localhost"
             port = 5432
             user = "postgres"
-            password = ""
+            password = "postgres"
             database = "postgres"
 
 -- * Sessions

diff --git a/tasty/Main/Connection.hs b/tasty/Main/Connection.hs
@@ -16,7 +16,7 @@ with handler =
             host = "localhost"
             port = 5432
             user = "postgres"
-            password = ""
+            password = "postgres"
             database = "postgres"
     use connection =
       lift $ handler connection

diff --git a/tasty/Main/DSL.hs b/tasty/Main/DSL.hs
@@ -32,7 +32,7 @@ session session =
             host = "localhost"
             port = 5432
             user = "postgres"
-            password = ""
+            password = "postgres"
             database = "postgres"
     use connection =
       ExceptT

diff --git a/threads-test/Main.hs b/threads-test/Main.hs
@@ -18,7 +18,7 @@ main =
             $ Hasql.Connection.acquire connectionSettings
           where
             connectionSettings =
-              Hasql.Connection.settings "localhost" 5432 "postgres" "" "postgres"
+              Hasql.Connection.settings "localhost" 5432 "postgres" "postgres" "postgres"
     use (connection1, connection2) =
       do
         beginVar <- newEmptyMVar