devide queries and use statements

Author: Cmdv

cardano-db/cardano-db.cabal

@@ -102,7 +102,6 @@ library
                       , filepath
                       , file-embed
                       , hasql
-                      , hasql-transaction
                       , iohk-monitoring
                       , lifted-base
                       , memory

cardano-db/src/Cardano/Db/Error.hs

@@ -1,10 +1,7 @@
-{-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE LambdaCase #-}
-{-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RankNTypes #-}
 
 module Cardano.Db.Error (
-  AsDbError (..),
+  -- AsDbError (..),
   CallSite (..),
   DbError (..),
   runOrThrowIODb,
@@ -14,53 +11,57 @@ module Cardano.Db.Error (
 ) where
 
 import Cardano.BM.Trace (Trace, logError)
-import Cardano.Db.Schema.Ids
 import Cardano.Prelude (throwIO, MonadIO)
 import Control.Exception (Exception)
 import Data.ByteString.Char8 (ByteString)
 import Data.Text (Text)
-import Data.Word (Word16, Word64)
-import GHC.Generics (Generic)
 import qualified Data.ByteString.Base16 as Base16
 import qualified Data.Text.Encoding as Text
-import qualified Hasql.Session as HsqlS
 
-class AsDbError e where
-  toDbError :: DbError -> e
-  fromDbError :: e -> Maybe DbError
+import qualified Hasql.Session as HsqlSes
 
-data DbError
-  = DbError !CallSite !Text !HsqlS.SessionError
-  | DbLookupError !CallSite !Text !LookupContext
-  deriving (Show, Eq)
+data DbError = DbError
+  { dbErrorCallSite :: !CallSite
+  , dbErrorMessage :: !Text
+  , dbErrorCause :: !(Maybe HsqlSes.SessionError)  -- Now a Maybe
+  }
 
-instance Exception DbError
+-- class AsDbError e where
+--   toDbError :: DbError -> e
+--   fromDbError :: e -> Maybe DbError
+
+-- data DbError
+--   = DbError !CallSite !Text !HsqlS.SessionError
+--   | DbLookupError !CallSite !Text !LookupContext
+--   deriving (Show, Eq)
+
+-- instance Exception DbError
 
 data CallSite = CallSite
   { csModule :: !Text
   , csFile :: !Text
   , csLine :: !Int
   } deriving (Show, Eq)
 
-data LookupContext
-  = BlockHashContext !ByteString
-  | BlockIdContext !Word64
-  | MessageContext !Text
-  | TxHashContext !ByteString
-  | TxOutPairContext !ByteString !Word16
-  | EpochNoContext !Word64
-  | SlotNoContext !Word64
-  | GovActionPairContext !TxId !Word64
-  | MetaEmptyContext
-  | MetaMultipleRowsContext
-  | MultipleGenesisContext
-  | ExtraMigrationContext !String
-  | PruneConsumedContext !String
-  | RJsonbInSchemaContext !String
-  | TxOutVariantContext !String
-  deriving (Show, Eq, Generic)
-
-instance Exception LookupContext
+-- data LookupContext
+--   = BlockHashContext !ByteString
+--   | BlockIdContext !Word64
+--   | MessageContext !Text
+--   | TxHashContext !ByteString
+--   | TxOutPairContext !ByteString !Word16
+--   | EpochNoContext !Word64
+--   | SlotNoContext !Word64
+--   | GovActionPairContext !TxId !Word64
+--   | MetaEmptyContext
+--   | MetaMultipleRowsContext
+--   | MultipleGenesisContext
+--   | ExtraMigrationContext !String
+--   | PruneConsumedContext !String
+--   | RJsonbInSchemaContext !String
+--   | TxOutVariantContext !String
+--   deriving (Show, Eq, Generic)
+
+-- instance Exception LookupContext
 
 -- catchDbError :: String -> HsqlT.Transaction a -> HsqlT.Transaction a
 -- catchDbError context action =