Skip to content

Commit

Permalink
Merge patch into master
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions[bot] authored Jan 6, 2025
2 parents cf1cf4c + a37951c commit b183d4f
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 4 deletions.
1 change: 1 addition & 0 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ packages: .
allow-newer:
, *:base
, *:template-haskell
, *:ghc-prim
14 changes: 13 additions & 1 deletion conflicts-test/Main.hs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ module Main where

import Control.Concurrent.Async qualified as F
import Hasql.Connection qualified as A
import Hasql.Connection.Setting qualified as H
import Hasql.Connection.Setting.Connection qualified as I
import Hasql.Connection.Setting.Connection.Param qualified as J
import Hasql.Session qualified as B
import Hasql.Transaction qualified as C
import Hasql.Transaction.Sessions qualified as G
Expand All @@ -22,7 +25,16 @@ main =
$ A.acquire connectionSettings
where
connectionSettings =
A.settings "localhost" 5432 "postgres" "postgres" "postgres"
[ H.connection
( I.params
[ J.host "localhost",
J.port 5432,
J.user "postgres",
J.password "postgres",
J.dbname "postgres"
]
)
]
release (connection1, connection2) =
do
transaction connection1 E.dropSchema
Expand Down
6 changes: 3 additions & 3 deletions hasql-transaction.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 3.0
name: hasql-transaction
version: 1.1.1.2
version: 1.1.1.3
category: Hasql, Database, PostgreSQL
synopsis:
Composable abstraction over retryable transactions for Hasql
Expand Down Expand Up @@ -95,7 +95,7 @@ library
bytestring >=0.10 && <0.13,
bytestring-tree-builder >=0.2.7.8 && <0.3,
contravariant >=1.3 && <2,
hasql >=1.7 && <1.9,
hasql >=1.7 && <1.10,
mtl >=2.2 && <3,
transformers >=0.5 && <0.7,

Expand All @@ -115,6 +115,6 @@ test-suite conflicts-test

build-depends:
async >=2.1 && <3,
hasql,
hasql >=1.9,
hasql-transaction,
rerebase >=1.11 && <2,

0 comments on commit b183d4f

Please sign in to comment.