diff --git a/Database/Configuration.cs b/Database/Configuration.cs index b6a84c39..87daa322 100644 --- a/Database/Configuration.cs +++ b/Database/Configuration.cs @@ -14,7 +14,7 @@ namespace Swarmops.Database /// public static int DbVersionExpected { - get { return 52; } + get { return 53; } } diff --git a/Database/Schemata/revisions.txt b/Database/Schemata/revisions.txt index 33c5f827..c26fc6bb 100644 --- a/Database/Schemata/revisions.txt +++ b/Database/Schemata/revisions.txt @@ -49,4 +49,5 @@ 0049 - Another fix for CreateVatReportItem 0050 - Added VatReports.OpenTransaction, .CloseTransaction 0051 - Fix for CreateFinancialTransactionStub with Amount field gone (caused in 0043) [RF] -0052 - Added database support for multiple Bitcoin chain forks [RF] \ No newline at end of file +0052 - Added database support for multiple Bitcoin chain forks [RF] +0053 - Bugfix for 0052 [RF] \ No newline at end of file diff --git a/Database/Schemata/upgrade-0053.sql b/Database/Schemata/upgrade-0053.sql new file mode 100644 index 00000000..384fa595 --- /dev/null +++ b/Database/Schemata/upgrade-0053.sql @@ -0,0 +1,34 @@ +DROP PROCEDURE IF EXISTS `CreateHotBitcoinAddressConditional` + +# + + +CREATE PROCEDURE `CreateHotBitcoinAddressConditional`( + IN organizationId INT, + IN bitcoinChainId INT, + IN derivationPath VARCHAR(256), + IN addressString VARCHAR(48), + IN addressStringFallback VARCHAR(48) +) +BEGIN + + IF ((SELECT COUNT(*) FROM HotBitcoinAddresses WHERE HotBitcoinAddresses.AddressString=addressString AND HotBitcoinAddresses.BitcoinChainId=bitcoinChainId) = 0) + THEN + + INSERT INTO HotBitcoinAddresses + (OrganizationId,BitcoinChainId,DerivationPath,AddressString,AddressStringFallback,BalanceSatoshis,ThroughputSatoshis) + VALUES + (organizationId,bitcoinChainId,derivationPath,addressString,addressStringFallback,0,0); + + SELECT LAST_INSERT_ID() AS Identity; + + ELSE + + SELECT HotBitcoinAddresses.HotBitcoinAddressId AS Identity + FROM HotBitcoinAddresses + WHERE HotBitcoinAddresses.AddressString=addressString AND HotBitcoinAddresses.BitcoinChainId=bitcoinChainId; + + END IF; + +END +