add more types for the Hasql schema

Author: Cmdv

cardano-chain-gen/test/Test/Cardano/Db/Mock/Unit/Alonzo/Plutus.hs

@@ -31,8 +31,8 @@ module Test.Cardano.Db.Mock.Unit.Alonzo.Plutus (
 import qualified Cardano.Crypto.Hash as Crypto
 import Cardano.Db (TxOutTableType (..))
 import qualified Cardano.Db as DB
-import qualified Cardano.Db.Schema.Core.TxOut as C
-import qualified Cardano.Db.Schema.Variant.TxOut as V
+import qualified Cardano.Db.Schema.Variant.TxOutAddress as V
+import qualified Cardano.Db.Schema.Variant.TxOutCore as C
 import Cardano.DbSync.Era.Shelley.Generic.Util (renderAddress)
 import Cardano.Ledger.Coin
 import Cardano.Ledger.Mary.Value (MaryValue (..), MultiAsset (..), PolicyID (..))

cardano-chain-gen/test/Test/Cardano/Db/Mock/Unit/Babbage/Plutus.hs

@@ -32,8 +32,8 @@ module Test.Cardano.Db.Mock.Unit.Babbage.Plutus (
 
 import qualified Cardano.Crypto.Hash as Crypto
 import qualified Cardano.Db as DB
-import qualified Cardano.Db.Schema.Core.TxOut as C
-import qualified Cardano.Db.Schema.Variant.TxOut as V
+import qualified Cardano.Db.Schema.Variant.TxOutAddress as V
+import qualified Cardano.Db.Schema.Variant.TxOutCore as C
 import Cardano.DbSync.Era.Shelley.Generic.Util (renderAddress)
 import Cardano.Ledger.Coin
 import Cardano.Ledger.Mary.Value (MaryValue (..), MultiAsset (..), PolicyID (..))

cardano-chain-gen/test/Test/Cardano/Db/Mock/Unit/Conway/Plutus.hs

@@ -37,8 +37,8 @@ module Test.Cardano.Db.Mock.Unit.Conway.Plutus (
 
 import Cardano.Crypto.Hash.Class (hashToBytes)
 import qualified Cardano.Db as DB
-import qualified Cardano.Db.Schema.Core.TxOut as C
-import qualified Cardano.Db.Schema.Variant.TxOut as V
+import qualified Cardano.Db.Schema.Variant.TxOutAddress as V
+import qualified Cardano.Db.Schema.Variant.TxOutCore as C
 import Cardano.DbSync.Era.Shelley.Generic.Util (renderAddress)
 import Cardano.Ledger.Coin (Coin (..))
 import Cardano.Ledger.Mary.Value (MaryValue (..), MultiAsset (..), PolicyID (..))

cardano-chain-gen/test/Test/Cardano/Db/Mock/Validate.hs

@@ -45,8 +45,8 @@ module Test.Cardano.Db.Mock.Validate (
 
 import Cardano.Db
 import qualified Cardano.Db as DB
-import qualified Cardano.Db.Schema.Core.TxOut as C
-import qualified Cardano.Db.Schema.Variant.TxOut as V
+import qualified Cardano.Db.Schema.Variant.TxOutAddress as V
+import qualified Cardano.Db.Schema.Variant.TxOutCore as C
 import qualified Cardano.DbSync.Era.Shelley.Generic as Generic
 import Cardano.DbSync.Era.Shelley.Generic.Util
 import qualified Cardano.Ledger.Address as Ledger

cardano-db-sync/src/Cardano/DbSync/Cache.hs

@@ -32,7 +32,7 @@ module Cardano.DbSync.Cache (
 
 import Cardano.BM.Trace
 import qualified Cardano.Db as DB
-import qualified Cardano.Db.Schema.Variant.TxOut as V
+import qualified Cardano.Db.Schema.Variant.TxOutAddress as V
 import Cardano.DbSync.Cache.Epoch (rollbackMapEpochInCache)
 import qualified Cardano.DbSync.Cache.FIFO as FIFO
 import qualified Cardano.DbSync.Cache.LRU as LRU

cardano-db-sync/src/Cardano/DbSync/Cache/Types.hs

@@ -31,7 +31,7 @@ module Cardano.DbSync.Cache.Types (
 ) where
 
 import qualified Cardano.Db as DB
-import qualified Cardano.Db.Schema.Variant.TxOut as V
+import qualified Cardano.Db.Schema.Variant.TxOutAddress as V
 import Cardano.DbSync.Cache.FIFO (FIFOCache)
 import qualified Cardano.DbSync.Cache.FIFO as FIFO
 import Cardano.DbSync.Cache.LRU (LRUCache)

cardano-db-sync/src/Cardano/DbSync/Era/Byron/Genesis.hs

@@ -17,8 +17,8 @@ import qualified Cardano.Chain.Genesis as Byron
 import qualified Cardano.Chain.UTxO as Byron
 import qualified Cardano.Crypto as Crypto
 import qualified Cardano.Db as DB
-import qualified Cardano.Db.Schema.Core.TxOut as C
-import qualified Cardano.Db.Schema.Variant.TxOut as V
+import qualified Cardano.Db.Schema.Variant.TxOutAddress as V
+import qualified Cardano.Db.Schema.Variant.TxOutCore as C
 import Cardano.DbSync.Api
 import Cardano.DbSync.Api.Types (SyncEnv (..))
 import Cardano.DbSync.Cache (insertAddressUsingCache)

cardano-db-tool/src/Cardano/DbTool/Validate/TxAccounting.hs

@@ -11,8 +11,8 @@ module Cardano.DbTool.Validate.TxAccounting (
 ) where
 
 import Cardano.Db
-import qualified Cardano.Db.Schema.Core.TxOut as C
-import qualified Cardano.Db.Schema.Variant.TxOut as V
+import qualified Cardano.Db.Schema.Variant.TxOutAddress as V
+import qualified Cardano.Db.Schema.Variant.TxOutCore as C
 import Cardano.DbTool.Validate.Util
 import Control.Monad (replicateM, when)
 import Control.Monad.IO.Class (MonadIO, liftIO)

cardano-db/app/gen-schema-docs.hs

@@ -1,8 +1,8 @@
 {-# LANGUAGE OverloadedStrings #-}
 
 import Cardano.Db (schemaDocs)
-import Cardano.Db.Schema.Core.TxOut (schemaDocsTxOutCore)
-import Cardano.Db.Schema.Variant.TxOut (schemaDocsTxOutVariant)
+import Cardano.Db.Schema.Variants.TxOutAddress (schemaDocsTxOutVariant)
+import Cardano.Db.Schema.Variants.TxOutCore (schemaDocsTxOutCore)
 import Data.Text (Text)
 import qualified Data.Text as Text
 import qualified Data.Text.IO as Text

cardano-db/cardano-db.cabal

@@ -30,8 +30,8 @@ library
                         -Wunused-packages
 
   exposed-modules:      Cardano.Db
-                        Cardano.Db.Schema.Core.TxOut
-                        Cardano.Db.Schema.Variant.TxOut
+                        Cardano.Db.Schema.Variants.TxOutCore
+                        Cardano.Db.Schema.Variants.TxOutAddress
                         Cardano.Db.Version.V13_0
 
   other-modules:        Cardano.Db.Error
@@ -54,7 +54,15 @@ library
                         Cardano.Db.Operations.TxOut.TxOutQuery
                         Cardano.Db.PGConfig
                         Cardano.Db.Run
-                        Cardano.Db.Schema.BaseSchema
+                        Cardano.Db.Schema.Core
+                        Cardano.Db.Schema.Core.Base
+                        Cardano.Db.Schema.Core.EpochAndProtocol
+                        Cardano.Db.Schema.Core.GovernanceAndVoting
+                        Cardano.Db.Schema.Core.MultiAsset
+                        Cardano.Db.Schema.Core.OffChain
+                        Cardano.Db.Schema.Core.Pool
+                        Cardano.Db.Schema.Core.StakeDeligation
+                        Cardano.Db.Schema.Ids
                         Cardano.Db.Schema.Orphans
                         Cardano.Db.Schema.Types
                         Cardano.Db.Types

cardano-db/src/Cardano/Db.hs

@@ -26,6 +26,6 @@ import Cardano.Db.Operations.TxOut.TxOutQuery as X
 import Cardano.Db.Operations.Types as X
 import Cardano.Db.PGConfig as X
 import Cardano.Db.Run as X
-import Cardano.Db.Schema.BaseSchema as X
+import Cardano.Db.Schema.Core as X
 import Cardano.Db.Schema.Types as X
 import Cardano.Db.Types as X

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

@@ -10,7 +10,7 @@ module Cardano.Db.Error (
 ) where
 
 import Cardano.BM.Trace (Trace, logError)
-import Cardano.Db.Schema.BaseSchema
+import Cardano.Db.Schema.Core
 import Cardano.Prelude (throwIO)
 import Control.Exception (Exception)
 import qualified Data.ByteString.Base16 as Base16

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

@@ -32,9 +32,8 @@ import Cardano.Db.Operations.Query
 import Cardano.Db.Operations.Types (TxOutTableType (..))
 import Cardano.Db.PGConfig
 import Cardano.Db.Run
-import Cardano.Db.Schema.BaseSchema
-import Cardano.Db.Schema.Core.TxOut (migrateCoreTxOutCardanoDb)
-import Cardano.Db.Schema.Variant.TxOut (migrateVariantAddressCardanoDb)
+import Cardano.Db.Schema.Core
+import Cardano.Db.Schema.Variants.TxOutCore (migrateCoreTxOutCardanoDb, migrateVariantAddressCardanoDb)
 import Cardano.Prelude (Typeable, textShow)
 import Control.Exception (Exception, SomeException, handle)
 import Control.Monad.Extra

cardano-db/src/Cardano/Db/Operations/Delete.hs

@@ -29,9 +29,9 @@ import Cardano.Db.Operations.Other.ConsumedTxOut (querySetNullTxOut)
 import Cardano.Db.Operations.Other.MinId (MinIds (..), MinIdsWrapper (..), completeMinId, textToMinIds)
 import Cardano.Db.Operations.Query
 import Cardano.Db.Operations.Types (TxOutTableType (..))
-import Cardano.Db.Schema.BaseSchema
-import qualified Cardano.Db.Schema.Core.TxOut as C
-import qualified Cardano.Db.Schema.Variant.TxOut as V
+import Cardano.Db.Schema.Core
+import qualified Cardano.Db.Schema.Variants.TxOutAddress as V
+import qualified Cardano.Db.Schema.Variants.TxOutCore as C
 import Cardano.Prelude (Int64)
 import Cardano.Slotting.Slot (SlotNo (..))
 import Control.Monad (void)
@@ -187,7 +187,7 @@ deleteTablesAfterBlockId txOutTableType blkId mtxId minIdsW = do
   pure (sum $ map snd blockLogs, initialLogs <> blockLogs <> offChainLogs <> afterTxIdLogs)
 
 deleteTablesAfterTxId ::
-  (MonadIO m) =>
+  MonadIO m =>
   TxOutTableType ->
   Maybe TxId ->
   MinIdsWrapper ->

cardano-db/src/Cardano/Db/Operations/Insert.hs

@@ -97,7 +97,7 @@ module Cardano.Db.Operations.Insert (
 ) where
 
 import Cardano.Db.Operations.Query
-import Cardano.Db.Schema.BaseSchema
+import Cardano.Db.Schema.Core
 import Cardano.Db.Types
 import Cardano.Prelude (textShow)
 import Control.Exception.Lifted (Exception, handle, throwIO)
@@ -152,9 +152,8 @@ import Database.Persist.Types (
  )
 import Database.PostgreSQL.Simple (SqlError)
 import Hasql.Statement (Statement)
-import qualified Hasql.Transaction.Sessions as Transaction
 import qualified Hasql.Transaction as Transactio
-
+import qualified Hasql.Transaction.Sessions as Transaction
 
 -- The original naive way of inserting rows into Postgres was:
 --

cardano-db/src/Cardano/Db/Operations/Other/ConsumedTxOut.hs

@@ -19,9 +19,9 @@ import Cardano.Db.Operations.Insert (insertExtraMigration)
 import Cardano.Db.Operations.Query (listToMaybe, queryAllExtraMigrations, queryBlockHeight, queryBlockNo, queryMaxRefId)
 import Cardano.Db.Operations.QueryHelper (isJust)
 import Cardano.Db.Operations.Types (TxOutFields (..), TxOutIdW (..), TxOutTable, TxOutTableType (..), isTxOutVariantAddress)
-import Cardano.Db.Schema.BaseSchema
-import qualified Cardano.Db.Schema.Core.TxOut as C
-import qualified Cardano.Db.Schema.Variant.TxOut as V
+import Cardano.Db.Schema.Core
+import qualified Cardano.Db.Schema.Variants.TxOutAddress as V
+import qualified Cardano.Db.Schema.Variants.TxOutCore as C
 import Cardano.Db.Types (ExtraMigration (..), MigrationValues (..), PruneConsumeMigration (..), processMigrationValues)
 import Cardano.Prelude (textShow, void)
 import Control.Exception (throw)
@@ -97,7 +97,7 @@ querySetNullTxOut txOutTableType mMinTxId = do
         TxOutVariantAddress -> setNull
       where
         setNull ::
-          (MonadIO m) =>
+          MonadIO m =>
           ReaderT SqlBackend m ()
         setNull = do
           case txOutId of

cardano-db/src/Cardano/Db/Operations/Other/MinId.hs

@@ -12,9 +12,9 @@ module Cardano.Db.Operations.Other.MinId where
 
 import Cardano.Db.Operations.Query (queryMinRefId)
 import Cardano.Db.Operations.Types (MaTxOutFields (..), TxOutFields (..), TxOutTableType (..))
-import Cardano.Db.Schema.BaseSchema
-import qualified Cardano.Db.Schema.Core.TxOut as C
-import qualified Cardano.Db.Schema.Variant.TxOut as V
+import Cardano.Db.Schema.Core
+import qualified Cardano.Db.Schema.Variants.TxOutAddress as V
+import qualified Cardano.Db.Schema.Variants.TxOutCore as C
 import Cardano.Prelude
 import qualified Data.Text as Text
 import Database.Persist.Sql (PersistEntity, PersistField, SqlBackend, fromSqlKey, toSqlKey)

cardano-db/src/Cardano/Db/Operations/Query.hs

@@ -105,7 +105,7 @@ module Cardano.Db.Operations.Query (
 
 import Cardano.Db.Error
 import Cardano.Db.Operations.QueryHelper (defaultUTCTime, isJust, maybeToEither, unValue2, unValue3, unValue5, unValueSumAda)
-import Cardano.Db.Schema.BaseSchema
+import Cardano.Db.Schema.Core
 import Cardano.Db.Types
 import Cardano.Ledger.BaseTypes (CertIx (..), TxIx (..))
 import Cardano.Ledger.Credential (Ptr (..))

cardano-db/src/Cardano/Db/Operations/QueryHelper.hs

@@ -5,7 +5,7 @@
 
 module Cardano.Db.Operations.QueryHelper where
 
-import Cardano.Db.Schema.BaseSchema
+import Cardano.Db.Schema.Core
 import Cardano.Db.Types
 import Data.Fixed (Micro)
 import Data.Time.Clock (UTCTime)

cardano-db/src/Cardano/Db/Operations/TxOut/TxOutDelete.hs

@@ -6,8 +6,8 @@
 module Cardano.Db.Operations.TxOut.TxOutDelete where
 
 import Cardano.Db.Operations.Types (TxOutTableType (..))
-import qualified Cardano.Db.Schema.Core.TxOut as C
-import qualified Cardano.Db.Schema.Variant.TxOut as V
+import qualified Cardano.Db.Schema.Variants.TxOutAddress as V
+import qualified Cardano.Db.Schema.Variants.TxOutCore as C
 import Cardano.Prelude (Int64)
 import Control.Monad.Extra (whenJust)
 import Control.Monad.IO.Class (MonadIO)

cardano-db/src/Cardano/Db/Operations/TxOut/TxOutInsert.hs

@@ -9,8 +9,8 @@ module Cardano.Db.Operations.TxOut.TxOutInsert where
 
 import Cardano.Db.Operations.Insert (insertMany', insertUnchecked)
 import Cardano.Db.Operations.Types (CollateralTxOutIdW (..), CollateralTxOutW (..), MaTxOutIdW (..), MaTxOutW (..), TxOutIdW (..), TxOutW (..))
-import qualified Cardano.Db.Schema.Core.TxOut as C
-import qualified Cardano.Db.Schema.Variant.TxOut as V
+import qualified Cardano.Db.Schema.Variants.TxOutAddress as V
+import qualified Cardano.Db.Schema.Variants.TxOutCore as C
 import Control.Monad.IO.Class (MonadIO)
 import Control.Monad.Trans.Control (MonadBaseControl)
 import Control.Monad.Trans.Reader (ReaderT)

cardano-db/src/Cardano/Db/Operations/TxOut/TxOutQuery.hs

@@ -16,9 +16,9 @@ module Cardano.Db.Operations.TxOut.TxOutQuery where
 import Cardano.Db.Error (LookupFail (..))
 import Cardano.Db.Operations.QueryHelper (isJust, maybeToEither, txLessEqual, unValue2, unValue3, unValueSumAda)
 import Cardano.Db.Operations.Types (TxOutFields (..), TxOutIdW (..), TxOutTableType (..), TxOutW (..), UtxoQueryResult (..))
-import Cardano.Db.Schema.BaseSchema
-import qualified Cardano.Db.Schema.Core.TxOut as C
-import qualified Cardano.Db.Schema.Variant.TxOut as V
+import Cardano.Db.Schema.Core
+import qualified Cardano.Db.Schema.Variants.TxOutAddress as V
+import qualified Cardano.Db.Schema.Variants.TxOutCore as C
 import Cardano.Db.Types (Ada, DbLovelace (..))
 import Cardano.Prelude (Bifunctor (second), ByteString, ReaderT, Text, Word64, listToMaybe, mapMaybe)
 import Control.Monad.IO.Class (MonadIO)

cardano-db/src/Cardano/Db/Operations/Types.hs

@@ -8,9 +8,9 @@
 
 module Cardano.Db.Operations.Types where
 
-import Cardano.Db.Schema.BaseSchema
-import qualified Cardano.Db.Schema.Core.TxOut as C
-import qualified Cardano.Db.Schema.Variant.TxOut as V
+import Cardano.Db.Schema.Core
+import qualified Cardano.Db.Schema.Variants.TxOutAddress as V
+import qualified Cardano.Db.Schema.Variants.TxOutCore as C
 import Cardano.Db.Types (DbLovelace (..), DbWord64)
 import Cardano.Prelude (ByteString, Text, Word64, mapMaybe)
 import Data.Kind (Type)