diff --git a/Database/Configuration.cs b/Database/Configuration.cs index c3116f3f..bc95612e 100644 --- a/Database/Configuration.cs +++ b/Database/Configuration.cs @@ -14,7 +14,7 @@ namespace Swarmops.Database /// public static int DbVersionExpected { - get { return 33; } + get { return 34; } } diff --git a/Database/Schemata/revisions.txt b/Database/Schemata/revisions.txt index 8baeb4f8..8017155d 100644 --- a/Database/Schemata/revisions.txt +++ b/Database/Schemata/revisions.txt @@ -30,4 +30,5 @@ 0030 - Added flexibility for Resolver classes for OutboundComms [RF] 0031 - Added foreign ID tables, procs for transactions, to track blockchain [RF] 0032 - Added native currency to transaction rows, for multi-currency accounting [RF] -0033 - Added transaction row identity return, necessary for 0032 [RF] \ No newline at end of file +0033 - Added transaction row identity return, necessary for 0032 [RF] +0034 - Fix for SetFinancialTransactionRowNativeCurrency \ No newline at end of file diff --git a/Database/Schemata/upgrade-0034.sql b/Database/Schemata/upgrade-0034.sql new file mode 100644 index 00000000..a8cc7e7e --- /dev/null +++ b/Database/Schemata/upgrade-0034.sql @@ -0,0 +1,31 @@ +DROP procedure IF EXISTS `SetFinancialTransactionRowNativeCurrency` + + +# + + +CREATE PROCEDURE `SetFinancialTransactionRowNativeCurrency`( + IN financialTransactionRowId INT, + IN currencyId INT, + IN nativeAmountCents BIGINT +) +BEGIN + + IF NOT EXISTS (SELECT * FROM FinancialTransactionRowsNativeCurrency + WHERE FinancialTransactionRowsNativeCurrency.FinancialTransactionRowId=financialTransactionRowId) + THEN + + INSERT INTO FinancialTransactionRowsNativeCurrency (FinancialTransactionRowId,CurrencyId,NativeAmountCents) + VALUES (financialTransactionRowId,currencyId,nativeAmountCents); + + ELSE + + UPDATE FinancialTransactionRowsNativeCurrency + SET FinancialTransactionRowsNativeCurrency.CurrencyId=currencyId, + FinancialTransactionRowsNativeCurrency.NativeAmountCents=nativeAmountCents + WHERE FinancialTransactionRowsNativeCurrency.FinancialTransactionRowId= + financialTransactionRowId; + + END IF; + +END