Skip to content

Support hasql 1.9 #372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TeofilC merged 6 commits into from
May 9, 2025
Merged

Support hasql 1.9 #372

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2c00462
support hasql 1.9
kokobd May 6, 2025
a7cb536
update flake config
kokobd May 8, 2025
6a8d040
add the changelog
kokobd May 8, 2025
ff864ec
use language CPP instead of LANGUAGE
kokobd May 8, 2025
b9d31c9
only check x86_64-linux in CI
kokobd May 8, 2025
f95a0c0
Merge branch 'master' into hasql-1.9
kokobd May 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rel8.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ library
, comonad
, contravariant
, data-textual
, hasql >= 1.6.1.2 && < 1.9
, hasql >= 1.6.1.2 && < 1.10
, network-ip ^>= 0.3
, iproute ^>= 1.7
, opaleye ^>= 0.10.2.1
Expand Down
21 changes: 18 additions & 3 deletions tests/Main.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{-# language BangPatterns #-}
{-# language BlockArguments #-}
{-# LANGUAGE CPP #-}
{-# language DeriveAnyClass #-}
{-# language DeriveGeneric #-}
{-# language DerivingVia #-}
Expand Down Expand Up @@ -43,6 +44,7 @@ import Prelude hiding (truncate)

-- bytestring
import qualified Data.ByteString.Lazy
import Data.ByteString ( ByteString )

-- case-insensitive
import Data.CaseInsensitive ( mk )
Expand All @@ -52,7 +54,11 @@ import Data.Containers.ListUtils ( nubOrdOn )
import qualified Data.Map.Strict as Map

-- hasql
import Hasql.Connection ( Connection, acquire, release )
import Hasql.Connection ( Connection, ConnectionError, acquire, release )
#if MIN_VERSION_hasql(1,9,0)
import qualified Hasql.Connection.Setting
import qualified Hasql.Connection.Setting.Connection
#endif
import Hasql.Session ( sql, run )

-- hasql-transaction
Expand Down Expand Up @@ -156,7 +162,7 @@ tests =
startTestDatabase = do
db <- TmpPostgres.start >>= either throwIO return

bracket (either (error . show) return =<< acquire (TmpPostgres.toConnectionString db)) release \conn -> void do
bracket (either (error . show) return =<< acquireFromConnectionString (TmpPostgres.toConnectionString db)) release \conn -> void do
flip run conn do
sql "CREATE EXTENSION citext"
sql "CREATE TABLE test_table ( column1 text not null, column2 bool not null )"
Expand All @@ -170,8 +176,17 @@ tests =


connect :: TmpPostgres.DB -> IO Connection
connect = acquire . TmpPostgres.toConnectionString >=> either (maybe empty (fail . unpack . decodeUtf8)) pure
connect = acquireFromConnectionString . TmpPostgres.toConnectionString >=> either (maybe empty (fail . unpack . decodeUtf8)) pure

acquireFromConnectionString :: ByteString -> IO (Either ConnectionError Connection)
acquireFromConnectionString connectionString =
#if MIN_VERSION_hasql(1,9,0)
acquire
[ Hasql.Connection.Setting.connection . Hasql.Connection.Setting.Connection.string . decodeUtf8 $ connectionString
]
#else
acquire connectionString
#endif

databasePropertyTest
:: TestName
Expand Down