fix dbInt65

Author: Cmdv

cardano-db/src/Cardano/Db/Statement/Base.hs

@@ -15,7 +15,7 @@ import Cardano.Ledger.BaseTypes (SlotNo (..))
 import Cardano.Prelude (ByteString, Int64, MonadError (..), MonadIO (..), Proxy (..), Word64, textShow, void)
 import Data.Functor.Contravariant (Contravariant (..), (>$<))
 import Data.List (partition)
-import Data.Maybe (isJust)
+import Data.Maybe (isJust, fromMaybe)
 import qualified Data.Text as Text
 import qualified Data.Text.Encoding as TextEnc
 import Data.Time (UTCTime)
@@ -311,8 +311,8 @@ queryMinBlockStmt =
 
     decoder = HsqlD.rowMaybe $ do
       blockId <- Id.idDecoder Id.BlockId
-      blockNo <- HsqlD.column (HsqlD.nonNullable $ fromIntegral <$> HsqlD.int8)
-      pure (blockId, blockNo)
+      blockNo <- HsqlD.column (HsqlD.nullable $ fromIntegral <$> HsqlD.int8)
+      pure (blockId, fromMaybe 0 blockNo)
 
 queryMinBlock :: MonadIO m => DbAction m (Maybe (Id.BlockId, Word64))
 queryMinBlock =
@@ -1317,16 +1317,15 @@ queryScriptWithId hash =
 --------------------------------------------------------------------------------
 -- SlotLeader
 --------------------------------------------------------------------------------
-insertSlotLeaderStmt :: HsqlStmt.Statement SCB.SlotLeader (Entity SCB.SlotLeader)
+insertSlotLeaderStmt :: HsqlStmt.Statement SCB.SlotLeader Id.SlotLeaderId
 insertSlotLeaderStmt =
   insert
     SCB.slotLeaderEncoder
-    (WithResult $ HsqlD.singleRow SCB.entitySlotLeaderDecoder)
+    (WithResult $ Id.idDecoder Id.SlotLeaderId)
 
 insertSlotLeader :: MonadIO m => SCB.SlotLeader -> DbAction m Id.SlotLeaderId
 insertSlotLeader slotLeader = do
-  entity <- runDbSession (mkCallInfo "insertSlotLeader") $ HsqlSes.statement slotLeader insertSlotLeaderStmt
-  pure $ entityKey entity
+  runDbSession (mkCallInfo "insertSlotLeader") $ HsqlSes.statement slotLeader insertSlotLeaderStmt
 
 --------------------------------------------------------------------------------
 -- TxCbor

cardano-db/src/Cardano/Db/Statement/GovernanceAndVoting.hs

@@ -308,13 +308,11 @@ queryDrepHashSpecialStmt targetValue =
     table = tableName (Proxy @a)
     rawCol = validateColumn @a "raw"
     viewCol = validateColumn @a "view"
-    idCol = validateColumn @a "id"
 
     sql =
       TextEnc.encodeUtf8 $
         Text.concat
-          [ "SELECT "
-          , idCol
+          [ "SELECT id"
           , " FROM "
           , table
           , " WHERE "
@@ -417,7 +415,6 @@ setGovActionStateNullStmt columnName =
           , " IS NOT NULL AND "
           , columnName
           , " > $1"
-          , " RETURNING xmax != 0 AS changed"
           ]
     encoder = HsqlE.param (HsqlE.nonNullable HsqlE.int8)
     decoder = HsqlD.rowsAffected

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

@@ -9,6 +9,7 @@
 {-# LANGUAGE TypeFamilyDependencies #-}
 {-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE UndecidableInstances #-}
+{-# LANGUAGE OverloadedStrings #-}
 
 module Cardano.Db.Statement.Types where
 
@@ -130,7 +131,7 @@ instance GRecordFieldNames (K1 i c) where
 -- | Validate a column name against the list of columns in the table.
 validateColumn :: forall a. (DbInfo a) => Text -> Text
 validateColumn colName =
-  let cols = NE.toList $ columnNames (Proxy @a)
+  let cols = "id" : NE.toList (columnNames (Proxy @a))
    in if colName `elem` cols
         then colName
         else

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

@@ -221,16 +221,18 @@ dbInt65Encoder = fromDbInt65 >$< HsqlE.int8
 
 -- Helper functions to pack/unpack the sign and value
 toDbInt65 :: Int64 -> DbInt65
-toDbInt65 n =
-  DbInt65 $
-    if n >= 0
-      then fromIntegral n
-      else setBit (fromIntegral (abs n)) 63 -- Set sign bit for negative
+toDbInt65 n
+  | n >= 0 = DbInt65 (fromIntegral n)
+  | n == minBound = DbInt65 (setBit 0 63)  -- Special: magnitude 0 + sign bit = minBound
+  | otherwise = DbInt65 (setBit (fromIntegral (abs n)) 63)
 
 fromDbInt65 :: DbInt65 -> Int64
 fromDbInt65 (DbInt65 w) =
   if testBit w 63
-    then negate $ fromIntegral (clearBit w 63) -- Clear sign bit for value
+    then let magnitude = clearBit w 63
+         in if magnitude == 0
+            then minBound  -- Special: magnitude 0 + sign bit = minBound
+            else negate (fromIntegral magnitude)
     else fromIntegral w
 
 -- Newtype wrapper around Word64 so we can hand define a PersistentField instance.

cardano-db/test/Test/Property/Cardano/Db/Types.hs

@@ -105,16 +105,17 @@ prop_AssetFingerprint =
 prop_roundtrip_DbInt65 :: Property
 prop_roundtrip_DbInt65 =
   H.withTests 5000 . H.property $ do
-    -- Generate both positive and negative values
-    posInt64 <- H.forAll $ Gen.int64 (Range.linear 0 maxBound)
-    negInt64 <- H.forAll $ Gen.int64 (Range.linear minBound (-1))
-
-    let i65pos = toDbInt65 posInt64
-    let i65neg = toDbInt65 negInt64
-
-    -- Test roundtrip conversion
-    runDbInt65Roundtrip i65pos === i65pos
-    runDbInt65Roundtrip i65neg === i65neg
+    i64 <- H.forAll $ Gen.int64 (Range.linearFrom 0 minBound maxBound)
+    let i65 = toDbInt65 i64
+    fromDbInt65 i65 === i64
+
+prop_DbInt65_edge_cases :: Property
+prop_DbInt65_edge_cases = H.property $ do
+  fromDbInt65 (toDbInt65 minBound) === minBound
+  fromDbInt65 (toDbInt65 maxBound) === maxBound
+  fromDbInt65 (toDbInt65 0) === 0
+  fromDbInt65 (toDbInt65 (-1)) === (-1)
+  fromDbInt65 (toDbInt65 1) === 1
 
 -- Test DbLovelace roundtrip conversion
 prop_roundtrip_DbLovelace :: Property