make things compile

Author: Cmdv

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

@@ -23,6 +23,18 @@ module Cardano.DbSync (
   SimplifiedOffChainPoolData (..),
   extractSyncOptions,
 ) where
+import Control.Monad.Extra (whenJust)
+import qualified Data.Strict.Maybe as Strict
+import qualified Data.Text as Text
+import Data.Version (showVersion)
+import Database.Persist.Postgresql (ConnectionString, withPostgresqlConn)
+import qualified Ouroboros.Consensus.HardFork.Simple as HardFork
+import Ouroboros.Network.NodeToClient (IOManager, withIOManager)
+import Paths_cardano_db_sync (version)
+import System.Directory (createDirectoryIfMissing)
+import Prelude (id)
+import qualified Hasql.Connection as HsqlC
+import qualified Hasql.Connection.Setting as HsqlSet
 
 import Cardano.BM.Trace (Trace, logError, logInfo, logWarning)
 import qualified Cardano.Crypto as Crypto
@@ -47,17 +59,6 @@ import Cardano.DbSync.Util.Constraint (queryIsJsonbInSchema)
 import Cardano.Prelude hiding (Nat, (%))
 import Cardano.Slotting.Slot (EpochNo (..))
 import Control.Concurrent.Async
-import Control.Monad.Extra (whenJust)
-import qualified Data.Strict.Maybe as Strict
-import qualified Data.Text as Text
-import Data.Version (showVersion)
-import Database.Persist.Postgresql (ConnectionString, withPostgresqlConn)
-import qualified Ouroboros.Consensus.HardFork.Simple as HardFork
-import Ouroboros.Network.NodeToClient (IOManager, withIOManager)
-import Paths_cardano_db_sync (version)
-import System.Directory (createDirectoryIfMissing)
-import Prelude (id)
-import qualified Hasql.Connection as HsqlC
 
 runDbSyncNode :: MetricSetters -> [(Text, Text)] -> SyncNodeParams -> SyncNodeConfig -> IO ()
 runDbSyncNode metricsSetters knownMigrations params syncNodeConfigFromFile =
@@ -150,14 +151,14 @@ runSyncNode ::
   Trace IO Text ->
   IOManager ->
   -- | Database connection settings
-  Setting ->
+  HsqlSet.Setting ->
   -- | run migration function
   RunMigration ->
   SyncNodeConfig ->
   SyncNodeParams ->
   SyncOptions ->
   IO ()
-runSyncNode metricsSetters trce iomgr connSetting runMigrationFnc syncNodeConfigFromFile syncNodeParams syncOptions = do
+runSyncNode metricsSetters trce iomgr dbConnSetting runMigrationFnc syncNodeConfigFromFile syncNodeParams syncOptions = do
   whenJust maybeLedgerDir $
     \enpLedgerStateDir -> do
       createDirectoryIfMissing True (unLedgerStateDir enpLedgerStateDir)

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

@@ -379,11 +379,7 @@ mkSyncEnv ::
   SyncNodeParams ->
   RunMigration ->
   IO SyncEnv
-<<<<<<< HEAD
-mkSyncEnv trce backend connectionString syncOptions protoInfo nw nwMagic systemStart syncNodeConfigFromFile syncNP runMigrationFnc = do
-=======
-mkSyncEnv trce dbEnv connectionString syncOptions protoInfo nw nwMagic systemStart syncNodeConfigFromFile syncNP ranMigrations runMigrationFnc = do
->>>>>>> 29841e49 (more functionality)
+mkSyncEnv trce dbEnv connectionString syncOptions protoInfo nw nwMagic systemStart syncNodeConfigFromFile syncNP runMigrationFnc = do
   dbCNamesVar <- newTVarIO =<< dbConstraintNamesExists backend
   cache <-
     if soptCache syncOptions

cardano-db/cardano-db.cabal

@@ -30,8 +30,7 @@ library
                         -Wunused-packages
 
   exposed-modules:      Cardano.Db
-                        Cardano.Db.Schema.Core.TxOut
-                        Cardano.Db.Schema.Variant.TxOut
+                        Cardano.Db.Schema.Variants
 
   other-modules:        Cardano.Db.Error
                         Cardano.Db.Git.RevFromGit
@@ -64,6 +63,10 @@ library
                         Cardano.Db.Schema.Ids
                         Cardano.Db.Schema.Orphans
                         Cardano.Db.Schema.Types
+                        Cardano.Db.Schema.Variants.TxOutAddress
+                        Cardano.Db.Schema.Variants.TxOutCore
+                        Cardano.Db.Schema.Variants.TxOutUtxoHd
+                        Cardano.Db.Schema.Variants.TxOutUtxoHdAddress
                         Cardano.Db.Statement
                         Cardano.Db.Statement.Function.Core
                         Cardano.Db.Statement.Function.Query
@@ -93,7 +96,6 @@ library
                       , contravariant-extras
                       , cryptonite
                       , directory
-                      , esqueleto
                       , extra
                       , fast-logger
                       , filepath
@@ -105,7 +107,6 @@ library
                       , monad-control
                       , monad-logger
                       , persistent
-                      , persistent-documentation
                       , persistent-postgresql
                       , postgresql-simple
                       , process

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

@@ -25,6 +25,9 @@ data DbError = DbError
   , dbErrorMessage :: !Text
   , dbErrorCause :: !(Maybe HsqlSes.SessionError) -- Now a Maybe
   }
+  deriving (Show, Eq)
+
+instance Exception DbError
 
 -- class AsDbError e where
 --   toDbError :: DbError -> e

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

@@ -25,9 +25,9 @@ import qualified Data.ByteString.Char8 as BS
 import qualified Data.Text as Text
 import qualified Data.Text.Read as Text (decimal)
 import Data.Word (Word16)
-import qualified Hasql.Connection.Setting as HsqlS
-import qualified Hasql.Connection.Setting.Connection as HsqlC
-import qualified Hasql.Connection.Setting.Connection.Param as HsqlP
+import qualified Hasql.Connection.Setting as HsqlSet
+import qualified Hasql.Connection.Setting.Connection as HsqlSetC
+import qualified Hasql.Connection.Setting.Connection.Param as HsqlSetP
 import System.Environment (lookupEnv, setEnv)
 import System.Posix.User (getEffectiveUserName)
 
@@ -51,18 +51,18 @@ newtype PGPassFile
   = PGPassFile FilePath
 
 -- | Convert PGConfig to Hasql connection settings, or return an error message.
-toConnectionSetting :: PGConfig -> Either String HsqlS.Setting
+toConnectionSetting :: PGConfig -> Either String HsqlSet.Setting
 toConnectionSetting pgc = do
   -- Convert the port from Text to Word16
   portWord16 <- textToWord16 (pgcPort pgc)
   -- Build the connection settings
-  pure $ HsqlS.connection (HsqlC.params [host, port portWord16, user, dbname, password])
+  pure $ HsqlSet.connection (HsqlSetC.params [host, port portWord16, user, dbname, password])
   where
-    host = HsqlP.host (pgcHost pgc)
-    port = HsqlP.port
-    user = HsqlP.user (pgcUser pgc)
-    dbname = HsqlP.dbname (pgcDbname pgc)
-    password = HsqlP.password (pgcPassword pgc)
+    host = HsqlSetP.host (pgcHost pgc)
+    port = HsqlSetP.port
+    user = HsqlSetP.user (pgcUser pgc)
+    dbname = HsqlSetP.dbname (pgcDbname pgc)
+    password = HsqlSetP.password (pgcPassword pgc)
 
 -- | Convert a Text port to Word16, or return an error message.
 textToWord16 :: Text.Text -> Either String Word16