From 7d7456d7879c07d5b6832b12329b97171b542554 Mon Sep 17 00:00:00 2001 From: Nikita Volkov Date: Wed, 8 May 2024 08:47:03 +0300 Subject: [PATCH 1/2] Fix the build and update the deps --- hasql-dynamic-statements.cabal | 8 ++------ library/Hasql/DynamicStatements/Prelude.hs | 2 -- library/Hasql/DynamicStatements/Statement.hs | 1 - test/Main.hs | 9 +++------ 4 files changed, 5 insertions(+), 15 deletions(-) diff --git a/hasql-dynamic-statements.cabal b/hasql-dynamic-statements.cabal index f04c8e3..59827ae 100644 --- a/hasql-dynamic-statements.cabal +++ b/hasql-dynamic-statements.cabal @@ -28,8 +28,6 @@ common base ApplicativeDo BangPatterns BlockArguments - ConstraintKinds - DataKinds DefaultSignatures DeriveDataTypeable DeriveFoldable @@ -60,6 +58,7 @@ common base StandaloneDeriving StrictData TupleSections + TypeApplications TypeFamilies TypeOperators @@ -94,7 +93,7 @@ library base >=4.14 && <5, bytestring >=0.10 && <0.13, containers >=0.6 && <0.8, - hasql >=1.6 && <1.7, + hasql >=1.7 && <1.8, hasql-implicits >=0.1.1.2 && <0.2, ptr >=0.16.7.2 && <0.17, @@ -104,11 +103,8 @@ test-suite test hs-source-dirs: test main-is: Main.hs build-depends: - QuickCheck >=2.8.1 && <3, hasql, hasql-dynamic-statements, - quickcheck-instances >=0.3.11 && <0.4, rerebase <2, tasty >=0.12 && <2, tasty-hunit >=0.9 && <0.11, - tasty-quickcheck >=0.9 && <0.11, diff --git a/library/Hasql/DynamicStatements/Prelude.hs b/library/Hasql/DynamicStatements/Prelude.hs index 78d4038..fbb2820 100644 --- a/library/Hasql/DynamicStatements/Prelude.hs +++ b/library/Hasql/DynamicStatements/Prelude.hs @@ -64,8 +64,6 @@ import System.IO.Unsafe as Exports import System.Mem as Exports import System.Mem.StableName as Exports import System.Timeout as Exports -import Text.ParserCombinators.ReadP as Exports (ReadP, ReadS, readP_to_S, readS_to_P) -import Text.ParserCombinators.ReadPrec as Exports (ReadPrec, readP_to_Prec, readPrec_to_P, readPrec_to_S, readS_to_Prec) import Text.Printf as Exports (hPrintf, printf) import Text.Read as Exports (Read (..), readEither, readMaybe) import Unsafe.Coerce as Exports diff --git a/library/Hasql/DynamicStatements/Statement.hs b/library/Hasql/DynamicStatements/Statement.hs index 5aa3f9e..e92cb14 100644 --- a/library/Hasql/DynamicStatements/Statement.hs +++ b/library/Hasql/DynamicStatements/Statement.hs @@ -3,7 +3,6 @@ module Hasql.DynamicStatements.Statement where import Hasql.Decoders qualified as Decoders import Hasql.DynamicStatements.Prelude import Hasql.DynamicStatements.Snippet.Defs qualified as SnippetDefs -import Hasql.Encoders qualified as Encoders import Hasql.Statement import Ptr.ByteString qualified as ByteString import Ptr.Poking qualified as Poking diff --git a/test/Main.hs b/test/Main.hs index 7a2dc97..f89ad8e 100644 --- a/test/Main.hs +++ b/test/Main.hs @@ -7,20 +7,17 @@ import Hasql.Decoders qualified as Decoders import Hasql.DynamicStatements.Session qualified as Session import Hasql.DynamicStatements.Snippet qualified as Snippet import Hasql.DynamicStatements.Statement qualified as Statement -import Hasql.Encoders qualified as Encoders import Hasql.Session qualified as Session import Hasql.Statement qualified as Statement -import Test.QuickCheck qualified as QuickCheck -import Test.QuickCheck.Instances import Test.Tasty import Test.Tasty.HUnit -import Test.Tasty.QuickCheck -import Test.Tasty.Runners import Prelude hiding (assert) +main :: IO () main = defaultMain tree +tree :: TestTree tree = testGroup "All tests" @@ -54,7 +51,7 @@ tree = ] ] -runSession :: Session.Session a -> IO (Either Connection.ConnectionError (Either Session.QueryError a)) +runSession :: Session.Session a -> IO (Either Connection.ConnectionError (Either Session.SessionError a)) runSession = withConnection . Session.run withConnection :: (Connection.Connection -> IO a) -> IO (Either Connection.ConnectionError a) From a476d7a55dc65f451c9b8efe15bec75ab1d172dc Mon Sep 17 00:00:00 2001 From: nikita-volkov Date: Wed, 8 May 2024 06:13:04 +0000 Subject: [PATCH 2/2] Set package version to 0.3.1.6 --- hasql-dynamic-statements.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hasql-dynamic-statements.cabal b/hasql-dynamic-statements.cabal index 59827ae..434b792 100644 --- a/hasql-dynamic-statements.cabal +++ b/hasql-dynamic-statements.cabal @@ -1,6 +1,6 @@ cabal-version: 3.0 name: hasql-dynamic-statements -version: 0.3.1.5 +version: 0.3.1.6 synopsis: Toolkit for constructing Hasql statements dynamically description: This library introduces into the Hasql ecosystem a new abstraction named Snippet,