From 864767b86af595ee869b961ef9d43a1bb420664b Mon Sep 17 00:00:00 2001
From: Nikita Volkov <nikita.y.volkov@mail.ru>
Date: Sun, 28 Apr 2024 15:12:50 +0300
Subject: [PATCH] Remove rerebase from the internal library deps

As a workaround for Hackage including the dependencies of internal libs in the public list of package dependencies.
---
 hasql.cabal                                         |  6 +++++-
 testing-kit/Hasql/TestingKit/Preludes/Base.hs       | 13 +++++++++++++
 .../Hasql/TestingKit/Statements/BrokenSyntax.hs     |  2 +-
 .../Hasql/TestingKit/Statements/GenerateSeries.hs   |  2 +-
 .../Hasql/TestingKit/Statements/WrongDecoder.hs     |  2 +-
 testing-kit/Hasql/TestingKit/TestingDsl.hs          |  2 +-
 6 files changed, 22 insertions(+), 5 deletions(-)
 create mode 100644 testing-kit/Hasql/TestingKit/Preludes/Base.hs

diff --git a/hasql.cabal b/hasql.cabal
index 3e228fc..0ea08f1 100644
--- a/hasql.cabal
+++ b/hasql.cabal
@@ -151,14 +151,18 @@ library testing-kit
   hs-source-dirs: testing-kit
   exposed-modules:
     Hasql.TestingKit.Constants
+    Hasql.TestingKit.Preludes.Base
     Hasql.TestingKit.Statements.BrokenSyntax
     Hasql.TestingKit.Statements.GenerateSeries
     Hasql.TestingKit.Statements.WrongDecoder
     Hasql.TestingKit.TestingDsl
 
   build-depends:
+    base,
+    bytestring,
     hasql,
-    rerebase <2,
+    transformers,
+    uuid,
 
 test-suite tasty
   import: base
diff --git a/testing-kit/Hasql/TestingKit/Preludes/Base.hs b/testing-kit/Hasql/TestingKit/Preludes/Base.hs
new file mode 100644
index 0000000..544e13c
--- /dev/null
+++ b/testing-kit/Hasql/TestingKit/Preludes/Base.hs
@@ -0,0 +1,13 @@
+module Hasql.TestingKit.Preludes.Base
+  ( module Exports,
+  )
+where
+
+import Control.Monad.Trans.Class as Exports
+import Control.Monad.Trans.Except as Exports (Except, ExceptT (ExceptT), catchE, except, finallyE, mapExcept, mapExceptT, runExcept, runExceptT, throwE, withExcept, withExceptT)
+import Data.Bifunctor as Exports
+import Data.ByteString as Exports (ByteString)
+import Data.Functor.Contravariant as Exports
+import Data.Int as Exports
+import Data.UUID as Exports (UUID)
+import Prelude as Exports
diff --git a/testing-kit/Hasql/TestingKit/Statements/BrokenSyntax.hs b/testing-kit/Hasql/TestingKit/Statements/BrokenSyntax.hs
index 6508bea..9eac728 100644
--- a/testing-kit/Hasql/TestingKit/Statements/BrokenSyntax.hs
+++ b/testing-kit/Hasql/TestingKit/Statements/BrokenSyntax.hs
@@ -5,7 +5,7 @@ import Hasql.Encoders qualified as Encoders
 import Hasql.Pipeline qualified as Pipeline
 import Hasql.Session qualified as Session
 import Hasql.Statement qualified as Statement
-import Prelude
+import Hasql.TestingKit.Preludes.Base
 
 data Params = Params
   { start :: Int64,
diff --git a/testing-kit/Hasql/TestingKit/Statements/GenerateSeries.hs b/testing-kit/Hasql/TestingKit/Statements/GenerateSeries.hs
index 20fc044..c19e0e7 100644
--- a/testing-kit/Hasql/TestingKit/Statements/GenerateSeries.hs
+++ b/testing-kit/Hasql/TestingKit/Statements/GenerateSeries.hs
@@ -5,7 +5,7 @@ import Hasql.Encoders qualified as Encoders
 import Hasql.Pipeline qualified as Pipeline
 import Hasql.Session qualified as Session
 import Hasql.Statement qualified as Statement
-import Prelude
+import Hasql.TestingKit.Preludes.Base
 
 data Params = Params
   { start :: Int64,
diff --git a/testing-kit/Hasql/TestingKit/Statements/WrongDecoder.hs b/testing-kit/Hasql/TestingKit/Statements/WrongDecoder.hs
index 5a9a302..27882aa 100644
--- a/testing-kit/Hasql/TestingKit/Statements/WrongDecoder.hs
+++ b/testing-kit/Hasql/TestingKit/Statements/WrongDecoder.hs
@@ -5,7 +5,7 @@ import Hasql.Encoders qualified as Encoders
 import Hasql.Pipeline qualified as Pipeline
 import Hasql.Session qualified as Session
 import Hasql.Statement qualified as Statement
-import Prelude
+import Hasql.TestingKit.Preludes.Base
 
 data Params = Params
   { start :: Int64,
diff --git a/testing-kit/Hasql/TestingKit/TestingDsl.hs b/testing-kit/Hasql/TestingKit/TestingDsl.hs
index d86de75..15821d5 100644
--- a/testing-kit/Hasql/TestingKit/TestingDsl.hs
+++ b/testing-kit/Hasql/TestingKit/TestingDsl.hs
@@ -24,7 +24,7 @@ import Hasql.Pipeline qualified as Pipeline
 import Hasql.Session qualified as Session
 import Hasql.Statement qualified as Statement
 import Hasql.TestingKit.Constants qualified as Constants
-import Prelude
+import Hasql.TestingKit.Preludes.Base
 
 data Error
   = ConnectionError (Connection.ConnectionError)