Merge patch into master

nikita-volkov · May 8, 2024 · b9fef25 · b9fef25
2 parents 38ad8ed + a476d7a
commit b9fef25
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 16 deletions.
diff --git 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,
@@ -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
@@ -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
@@ -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
@@ -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)