ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-11 20:01:46 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix "isRelevant" functionality - addes/fixed is_modifiable column in cash selection. (#1348)

Browse Source
This commit is contained in:
szymonsztuka
2018-08-22 13:10:15 +01:00
committed by GitHub
parent ffe77d223a
commit 8b336d99a3
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
finance/src/main/kotlin/net/corda/finance/contracts/asset/cash/selection/CashSelectionOracleImpl.kt
View File

@ -44,6 +44,7 @@ class CashSelectionOracleImpl : AbstractCashSelection(maxRetries = 16, retrySlee
FROM contract_cash_states ccs, vault_states vs FROM contract_cash_states ccs, vault_states vs
WHERE vs.transaction_id = ccs.transaction_id AND vs.output_index = ccs.output_index WHERE vs.transaction_id = ccs.transaction_id AND vs.output_index = ccs.output_index
AND vs.state_status = 0 AND vs.state_status = 0
AND vs.is_modifiable = 0
AND ccs.ccy_code = ? AND ccs.ccy_code = ?
AND (vs.lock_id = ? OR vs.lock_id is null) AND (vs.lock_id = ? OR vs.lock_id is null)
"""+ """+

2
finance/src/main/kotlin/net/corda/finance/contracts/asset/cash/selection/CashSelectionSQLServerImpl.kt
View File

@ -74,7 +74,7 @@ class CashSelectionSQLServerImpl : AbstractCashSelection(maxRetries = 16, retryS
ON vs.transaction_id = ccs.transaction_id AND vs.output_index = ccs.output_index ON vs.transaction_id = ccs.transaction_id AND vs.output_index = ccs.output_index
WHERE WHERE
vs.state_status = 0 vs.state_status = 0
vs.is_modifiable = 0 AND vs.is_modifiable = 0
AND ccs.ccy_code = ? AND ccs.ccy_code = ?
AND (vs.lock_id = ? OR vs.lock_id IS NULL) AND (vs.lock_id = ? OR vs.lock_id IS NULL)
""" """