Skip to content

Commit 41aae43

Browse files
committed
add all insert + variant + start adding queries
1 parent 95d71cb commit 41aae43

File tree

43 files changed

+6013
-1920
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+6013
-1920
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ assertCurrentEpoch :: DBSyncEnv -> Word64 -> IO ()
204204
assertCurrentEpoch env expected =
205205
assertEqBackoff env q (Just expected) defaultDelays "Unexpected epoch stake counts"
206206
where
207-
q = queryCurrentEpochNo
207+
q = queryBlocksForCurrentEpochNo
208208

209209
assertAddrValues ::
210210
(EraCertState era, Core.EraTxOut era) =>

cardano-db-sync/src/Cardano/DbSync/Era/Universal/Insert/Other.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ insertScript ::
187187
Generic.TxScript ->
188188
ReaderT SqlBackend m DB.ScriptId
189189
insertScript tracer txId script = do
190-
mScriptId <- DB.queryScript $ Generic.txScriptHash script
190+
mScriptId <- DB.queryScriptWithId $ Generic.txScriptHash script
191191
case mScriptId of
192192
Just scriptId -> pure scriptId
193193
Nothing -> do

cardano-db-tool/src/Cardano/DbTool/Report/Balance.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ queryStakeAddressBalance txOutTableType address = do
114114

115115
queryRewardsSum :: MonadIO m => StakeAddressId -> ReaderT SqlBackend m Ada
116116
queryRewardsSum saId = do
117-
currentEpoch <- queryLatestEpochNo
117+
currentEpoch <- queryLatestEpochNoFromBlock
118118
res <- select $ do
119119
rwd <- from $ table @Reward
120120
where_ (rwd ^. RewardAddrId ==. val saId)

cardano-db/cardano-db.cabal

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ library
3030
-Wunused-packages
3131

3232
exposed-modules: Cardano.Db
33+
Cardano.Db.Schema.Core
3334
Cardano.Db.Schema.Variants
3435

3536
other-modules: Cardano.Db.Error
@@ -52,7 +53,6 @@ library
5253
Cardano.Db.Operations.TxOut.TxOutQuery
5354
Cardano.Db.PGConfig
5455
Cardano.Db.Run
55-
Cardano.Db.Schema.Core
5656
Cardano.Db.Schema.Core.Base
5757
Cardano.Db.Schema.Core.EpochAndProtocol
5858
Cardano.Db.Schema.Core.GovernanceAndVoting
@@ -61,6 +61,7 @@ library
6161
Cardano.Db.Schema.Core.Pool
6262
Cardano.Db.Schema.Core.StakeDeligation
6363
Cardano.Db.Schema.Ids
64+
Cardano.Db.Schema.MinIds
6465
Cardano.Db.Schema.Orphans
6566
Cardano.Db.Schema.Types
6667
Cardano.Db.Schema.Variants.TxOutAddress
@@ -69,6 +70,7 @@ library
6970
Cardano.Db.Schema.Variants.TxOutUtxoHdAddress
7071
Cardano.Db.Statement
7172
Cardano.Db.Statement.Function.Core
73+
Cardano.Db.Statement.Function.Delete
7274
Cardano.Db.Statement.Function.Query
7375
Cardano.Db.Statement.Function.Insert
7476
Cardano.Db.Statement.Base
@@ -77,8 +79,10 @@ library
7779
Cardano.Db.Statement.MultiAsset
7880
Cardano.Db.Statement.OffChain
7981
Cardano.Db.Statement.Pool
82+
Cardano.Db.Statement.Rollback
8083
Cardano.Db.Statement.StakeDeligation
8184
Cardano.Db.Statement.Types
85+
Cardano.Db.Statement.Variants.TxOut
8286
Cardano.Db.Types
8387

8488
build-depends: aeson

cardano-db/src/Cardano/Db.hs

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,10 @@ import Cardano.Db.Git.Version (gitRev)
1313
import Cardano.Db.Migration as X
1414
import Cardano.Db.Migration.Version as X
1515
import Cardano.Db.Operations.AlterTable as X
16-
import Cardano.Db.Operations.Delete as X
17-
import Cardano.Db.Operations.Insert as X
18-
import Cardano.Db.Operations.Other.ConsumedTxOut as X
19-
import Cardano.Db.Operations.Other.JsonbQuery as X
20-
import Cardano.Db.Operations.Other.MinId as X
21-
import Cardano.Db.Operations.Query as X
22-
import Cardano.Db.Operations.QueryHelper as X
23-
import Cardano.Db.Operations.TxOut.TxOutDelete as X
24-
import Cardano.Db.Operations.TxOut.TxOutInsert as X
25-
import Cardano.Db.Operations.TxOut.TxOutQuery as X
26-
import Cardano.Db.Operations.Types as X
2716
import Cardano.Db.PGConfig as X
2817
import Cardano.Db.Run as X
2918
import Cardano.Db.Schema.Core as X
3019
import Cardano.Db.Schema.Types as X
20+
import Cardano.Db.Schema.Variants as X
21+
import Cardano.Db.Statement as X
3122
import Cardano.Db.Types as X

0 commit comments

Comments
 (0)