Merge patch into master

benchmarks/Main.hs

@@ -1,15 +1,14 @@
 module Main where
 
-import qualified Data.Vector as F
-import Gauge
-import Gauge.Main
+import Criterion
+import Criterion.Main
 import qualified Hasql.Connection as A
 import qualified Hasql.Decoders as D
-import qualified Hasql.Encoders as E
 import qualified Hasql.Session as B
 import qualified Hasql.Statement as C
 import Prelude
 
+main :: IO ()
 main =
   do
     Right connection <- acquireConnection

hasql.cabal

@@ -1,6 +1,6 @@
 cabal-version:      3.0
 name:               hasql
-version:            1.6.4
+version:            1.6.4.1
 category:           Hasql, Database, PostgreSQL
 synopsis:           An efficient PostgreSQL driver with a flexible mapping API
 description:
@@ -24,8 +24,7 @@ source-repository head
   type:     git
   location: git://github.com/nikita-volkov/hasql.git
 
-library
-  hs-source-dirs:     library
+common base
   default-extensions:
     NoImplicitPrelude
     NoMonomorphismRestriction
@@ -66,6 +65,19 @@ library
     UnboxedTuples
 
   default-language:   Haskell2010
+
+common executable
+  import:      base
+  ghc-options:
+    -O2 -threaded -with-rtsopts=-N -rtsopts -funbox-strict-fields
+
+common test
+  import:      base
+  ghc-options: -threaded -with-rtsopts=-N
+
+library
+  import:          base
+  hs-source-dirs:  library
   exposed-modules:
     Hasql.Connection
     Hasql.Decoders
@@ -74,26 +86,26 @@ library
     Hasql.Statement
 
   other-modules:
-    Hasql.Private.Commands
-    Hasql.Private.Connection
-    Hasql.Private.Decoders
-    Hasql.Private.Decoders.Array
-    Hasql.Private.Decoders.Composite
-    Hasql.Private.Decoders.Result
-    Hasql.Private.Decoders.Results
-    Hasql.Private.Decoders.Row
-    Hasql.Private.Decoders.Value
-    Hasql.Private.Encoders
-    Hasql.Private.Encoders.Array
-    Hasql.Private.Encoders.Params
-    Hasql.Private.Encoders.Value
-    Hasql.Private.Errors
-    Hasql.Private.IO
-    Hasql.Private.Prelude
-    Hasql.Private.PreparedStatementRegistry
-    Hasql.Private.PTI
-    Hasql.Private.Session
-    Hasql.Private.Settings
+    Hasql.Commands
+    Hasql.Connection.Core
+    Hasql.Decoders.All
+    Hasql.Decoders.Array
+    Hasql.Decoders.Composite
+    Hasql.Decoders.Result
+    Hasql.Decoders.Results
+    Hasql.Decoders.Row
+    Hasql.Decoders.Value
+    Hasql.Encoders.All
+    Hasql.Encoders.Array
+    Hasql.Encoders.Params
+    Hasql.Encoders.Value
+    Hasql.Errors
+    Hasql.IO
+    Hasql.Prelude
+    Hasql.PreparedStatementRegistry
+    Hasql.PTI
+    Hasql.Session.Core
+    Hasql.Settings
 
   build-depends:
     , aeson >=2 && <3
@@ -119,49 +131,10 @@ library
     , vector >=0.10 && <0.14
 
 test-suite tasty
-  type:               exitcode-stdio-1.0
-  hs-source-dirs:     tasty
-  main-is:            Main.hs
-  default-extensions:
-    NoImplicitPrelude
-    NoMonomorphismRestriction
-    Arrows
-    BangPatterns
-    ConstraintKinds
-    DataKinds
-    DefaultSignatures
-    DeriveDataTypeable
-    DeriveFoldable
-    DeriveFunctor
-    DeriveGeneric
-    DeriveTraversable
-    EmptyDataDecls
-    FlexibleContexts
-    FlexibleInstances
-    FunctionalDependencies
-    GADTs
-    GeneralizedNewtypeDeriving
-    LambdaCase
-    LiberalTypeSynonyms
-    MagicHash
-    MultiParamTypeClasses
-    MultiWayIf
-    OverloadedStrings
-    ParallelListComp
-    PatternGuards
-    QuasiQuotes
-    RankNTypes
-    RecordWildCards
-    RoleAnnotations
-    ScopedTypeVariables
-    StandaloneDeriving
-    TemplateHaskell
-    TupleSections
-    TypeFamilies
-    TypeOperators
-    UnboxedTuples
-
-  default-language:   Haskell2010
+  import:         base
+  type:           exitcode-stdio-1.0
+  hs-source-dirs: tasty
+  main-is:        Main.hs
   other-modules:
     Main.Connection
     Main.DSL
@@ -178,152 +151,31 @@ test-suite tasty
     , tasty-quickcheck >=0.9 && <0.11
 
 test-suite threads-test
-  type:               exitcode-stdio-1.0
-  hs-source-dirs:     threads-test
-  main-is:            Main.hs
-  default-extensions:
-    NoImplicitPrelude
-    NoMonomorphismRestriction
-    Arrows
-    BangPatterns
-    ConstraintKinds
-    DataKinds
-    DefaultSignatures
-    DeriveDataTypeable
-    DeriveFoldable
-    DeriveFunctor
-    DeriveGeneric
-    DeriveTraversable
-    EmptyDataDecls
-    FlexibleContexts
-    FlexibleInstances
-    FunctionalDependencies
-    GADTs
-    GeneralizedNewtypeDeriving
-    LambdaCase
-    LiberalTypeSynonyms
-    MagicHash
-    MultiParamTypeClasses
-    MultiWayIf
-    OverloadedStrings
-    ParallelListComp
-    PatternGuards
-    QuasiQuotes
-    RankNTypes
-    RecordWildCards
-    RoleAnnotations
-    ScopedTypeVariables
-    StandaloneDeriving
-    TemplateHaskell
-    TupleSections
-    TypeFamilies
-    TypeOperators
-    UnboxedTuples
-
-  default-language:   Haskell2010
-  other-modules:      Main.Statements
-  ghc-options:        -O2 -threaded -with-rtsopts=-N
+  import:         test
+  type:           exitcode-stdio-1.0
+  hs-source-dirs: threads-test
+  main-is:        Main.hs
+  other-modules:  Main.Statements
   build-depends:
     , hasql
     , rerebase
 
 benchmark benchmarks
-  type:               exitcode-stdio-1.0
-  hs-source-dirs:     benchmarks
-  main-is:            Main.hs
-  default-extensions:
-    NoImplicitPrelude
-    NoMonomorphismRestriction
-    Arrows
-    BangPatterns
-    ConstraintKinds
-    DataKinds
-    DefaultSignatures
-    DeriveDataTypeable
-    DeriveFoldable
-    DeriveFunctor
-    DeriveGeneric
-    DeriveTraversable
-    EmptyDataDecls
-    FlexibleContexts
-    FlexibleInstances
-    FunctionalDependencies
-    GADTs
-    GeneralizedNewtypeDeriving
-    LambdaCase
-    LiberalTypeSynonyms
-    MagicHash
-    MultiParamTypeClasses
-    MultiWayIf
-    OverloadedStrings
-    ParallelListComp
-    PatternGuards
-    QuasiQuotes
-    RankNTypes
-    RecordWildCards
-    RoleAnnotations
-    ScopedTypeVariables
-    StandaloneDeriving
-    TemplateHaskell
-    TupleSections
-    TypeFamilies
-    TypeOperators
-    UnboxedTuples
-
-  default-language:   Haskell2010
-  ghc-options:
-    -O2 -threaded -with-rtsopts=-N -rtsopts -funbox-strict-fields
-
+  import:         executable
+  type:           exitcode-stdio-1.0
+  hs-source-dirs: benchmarks
+  main-is:        Main.hs
   build-depends:
-    , gauge >=0.2.5 && <0.3
+    , criterion >=1.6 && <2
     , hasql
     , rerebase <2
 
 test-suite profiling
-  type:               exitcode-stdio-1.0
-  hs-source-dirs:     profiling
-  main-is:            Main.hs
-  default-extensions:
-    NoImplicitPrelude
-    NoMonomorphismRestriction
-    Arrows
-    BangPatterns
-    ConstraintKinds
-    DataKinds
-    DefaultSignatures
-    DeriveDataTypeable
-    DeriveFoldable
-    DeriveFunctor
-    DeriveGeneric
-    DeriveTraversable
-    EmptyDataDecls
-    FlexibleContexts
-    FlexibleInstances
-    FunctionalDependencies
-    GADTs
-    GeneralizedNewtypeDeriving
-    LambdaCase
-    LiberalTypeSynonyms
-    MagicHash
-    MultiParamTypeClasses
-    MultiWayIf
-    OverloadedStrings
-    ParallelListComp
-    PatternGuards
-    QuasiQuotes
-    RankNTypes
-    RecordWildCards
-    RoleAnnotations
-    ScopedTypeVariables
-    StandaloneDeriving
-    TemplateHaskell
-    TupleSections
-    TypeFamilies
-    TypeOperators
-    UnboxedTuples
-
-  default-language:   Haskell2010
-  ghc-options:        -O2 -threaded -rtsopts
+  import:         base
+  type:           exitcode-stdio-1.0
+  hs-source-dirs: profiling
+  main-is:        Main.hs
+  ghc-options:    -O2 -threaded -rtsopts
   build-depends:
     , hasql
     , rerebase >=1 && <2

library/Hasql/Private/Commands.hs → library/Hasql/Commands.hs

@@ -1,4 +1,4 @@
-module Hasql.Private.Commands
+module Hasql.Commands
   ( Commands,
     asBytes,
     setEncodersToUTF8,
@@ -8,7 +8,7 @@ where
 
 import qualified Data.ByteString.Builder as BB
 import qualified Data.ByteString.Lazy as BL
-import Hasql.Private.Prelude
+import Hasql.Prelude
 
 newtype Commands
   = Commands (DList BB.Builder)

library/Hasql/Connection.hs

@@ -11,5 +11,5 @@ module Hasql.Connection
   )
 where
 
-import Hasql.Private.Connection
-import Hasql.Private.Settings
+import Hasql.Connection.Core
+import Hasql.Settings

library/Hasql/Private/Connection.hs → library/Hasql/Connection/Core.hs

@@ -1,12 +1,12 @@
 -- |
 -- This module provides a low-level effectful API dealing with the connections to the database.
-module Hasql.Private.Connection where
+module Hasql.Connection.Core where
 
 import qualified Database.PostgreSQL.LibPQ as LibPQ
-import qualified Hasql.Private.IO as IO
-import Hasql.Private.Prelude
-import qualified Hasql.Private.PreparedStatementRegistry as PreparedStatementRegistry
-import qualified Hasql.Private.Settings as Settings
+import qualified Hasql.IO as IO
+import Hasql.Prelude
+import qualified Hasql.PreparedStatementRegistry as PreparedStatementRegistry
+import qualified Hasql.Settings as Settings
 
 -- |
 -- A single connection to the database.

library/Hasql/Decoders.hs

@@ -69,4 +69,4 @@ module Hasql.Decoders
   )
 where
 
-import Hasql.Private.Decoders
+import Hasql.Decoders.All

library/Hasql/Private/Decoders.hs → library/Hasql/Decoders/All.hs

@@ -1,17 +1,17 @@
 -- |
 -- A DSL for declaration of result decoders.
-module Hasql.Private.Decoders where
+module Hasql.Decoders.All where
 
 import qualified Data.Aeson as Aeson
 import qualified Data.Vector.Generic as GenericVector
-import qualified Hasql.Private.Decoders.Array as Array
-import qualified Hasql.Private.Decoders.Composite as Composite
-import qualified Hasql.Private.Decoders.Result as Result
-import qualified Hasql.Private.Decoders.Results as Results
-import qualified Hasql.Private.Decoders.Row as Row
-import qualified Hasql.Private.Decoders.Value as Value
-import Hasql.Private.Prelude hiding (bool, maybe)
-import qualified Hasql.Private.Prelude as Prelude
+import qualified Hasql.Decoders.Array as Array
+import qualified Hasql.Decoders.Composite as Composite
+import qualified Hasql.Decoders.Result as Result
+import qualified Hasql.Decoders.Results as Results
+import qualified Hasql.Decoders.Row as Row
+import qualified Hasql.Decoders.Value as Value
+import Hasql.Prelude hiding (bool, maybe)
+import qualified Hasql.Prelude as Prelude
 import qualified Network.IP.Addr as NetworkIp
 import qualified PostgreSQL.Binary.Decoding as A