Add slot_internal_index field to PoolOwner table.

cardano-foundation · Jul 9, 2020 · 7bf5407 · 7bf5407
1 parent 0e74cca
commit 7bf5407
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/lib/core/src/Cardano/Pool/DB/Sqlite.hs b/lib/core/src/Cardano/Pool/DB/Sqlite.hs
@@ -218,7 +218,10 @@ newDBLayer trace fp = do
                     (snd <$> poolMetadata cert)
             _ <- repsert poolRegistrationKey poolRegistrationRow
             insertMany_ $
-                zipWith (PoolOwner poolId slotId) (poolOwners cert) [0..]
+                zipWith
+                    (PoolOwner poolId slotId slotInternalIndex)
+                    (poolOwners cert)
+                    [0..]
 
         , readPoolRegistration = \poolId -> do
             let filterBy = [ PoolRegistrationPoolId ==. poolId ]
@@ -247,8 +250,14 @@ newDBLayer trace fp = do
                           (,) <$> poolMetadataUrl <*> poolMetadataHash
                     poolOwners <- fmap (poolOwnerOwner . entityVal) <$>
                         selectList
-                            [ PoolOwnerPoolId ==. poolId ]
-                            [ Desc PoolOwnerSlot, Asc PoolOwnerIndex ]
+                            [ PoolOwnerPoolId
+                                ==. poolId
+                            , PoolOwnerSlot
+                                ==. slotId
+                            , PoolOwnerSlotInternalIndex
+                                ==. slotInternalIndex
+                            ]
+                            [ Asc PoolOwnerIndex ]
                     let cert = PoolRegistrationCertificate
                             { poolId
                             , poolOwners

diff --git a/lib/core/src/Cardano/Pool/DB/Sqlite/TH.hs b/lib/core/src/Cardano/Pool/DB/Sqlite/TH.hs
@@ -75,12 +75,13 @@ StakeDistribution sql=stake_distribution
 
 -- Mapping from pool id to owner.
 PoolOwner sql=pool_owner
-    poolOwnerPoolId     W.PoolId     sql=pool_id
-    poolOwnerSlot       W.SlotId     sql=slot
-    poolOwnerOwner      W.PoolOwner  sql=pool_owner
-    poolOwnerIndex      Word8        sql=pool_owner_index
+    poolOwnerPoolId             W.PoolId            sql=pool_id
+    poolOwnerSlot               W.SlotId            sql=slot
+    poolOwnerSlotInternalIndex  W.SlotInternalIndex sql=slot_internal_index
+    poolOwnerOwner              W.PoolOwner         sql=pool_owner
+    poolOwnerIndex              Word8               sql=pool_owner_index
 
-    Primary poolOwnerPoolId poolOwnerSlot poolOwnerOwner poolOwnerIndex
+    Primary poolOwnerPoolId poolOwnerSlot poolOwnerSlotInternalIndex poolOwnerOwner poolOwnerIndex
     deriving Show Generic
 
 -- Mapping of registration certificate to pool