diff --git a/Database/Configuration.cs b/Database/Configuration.cs index 8027f1ec..5dcac3c8 100644 --- a/Database/Configuration.cs +++ b/Database/Configuration.cs @@ -14,7 +14,7 @@ namespace Swarmops.Database /// public static int DbVersionExpected { - get { return 48; } + get { return 49; } } diff --git a/Database/Database-VatReports.cs b/Database/Database-VatReports.cs index fa1ee97b..67a97498 100644 --- a/Database/Database-VatReports.cs +++ b/Database/Database-VatReports.cs @@ -239,7 +239,7 @@ namespace Swarmops.Database AddParameterWithName(command, "vatReportId", vatReportId); AddParameterWithName(command, "financialTransactionId", financialTransactionId); - AddParameterWithName(command, "foreignObjectId", foreignObjectId); + AddParameterWithName(command, "foreignId", foreignObjectId); AddParameterWithName(command, "financialDependencyType", financialDependencyType.ToString()); AddParameterWithName(command, "turnoverCents", turnoverCents); AddParameterWithName(command, "vatInboundCents", vatInboundCents); diff --git a/Database/Schemata/revisions.txt b/Database/Schemata/revisions.txt index 9371d100..18186653 100644 --- a/Database/Schemata/revisions.txt +++ b/Database/Schemata/revisions.txt @@ -46,3 +46,4 @@ 0046 - VatReports.Turnover=>TurnoverCents [RF] 0047 - Fix for null case in SetVatReportReleased [RF] 0048 - Fix for CreateVatReportItem, ForeignObjectId=>ForeignId [RF] +0049 - Another fix for CreateVatReportItem diff --git a/Database/Schemata/upgrade-0048.sql b/Database/Schemata/upgrade-0048.sql index 3ad053b2..058967cb 100644 --- a/Database/Schemata/upgrade-0048.sql +++ b/Database/Schemata/upgrade-0048.sql @@ -33,4 +33,8 @@ BEGIN INSERT INTO VatReportItems (VatReportId, FinancialTransactionId, ForeignId, FinancialDependencyTypeId, TurnoverCents, VatInboundCents, VatOutboundCents) VALUES (vatReportId, financialTransactionId, foreignId, financialDependencyTypeId, turnoverCents, vatInboundCents, vatOutboundCents); + + + SELECT LAST_INSERT_ID() AS Identity; + END diff --git a/Database/Schemata/upgrade-0049.sql b/Database/Schemata/upgrade-0049.sql new file mode 100644 index 00000000..058967cb --- /dev/null +++ b/Database/Schemata/upgrade-0049.sql @@ -0,0 +1,40 @@ +DROP PROCEDURE IF EXISTS `CreateVatReportItem` + +# + +CREATE PROCEDURE `CreateVatReportItem`( + vatReportId INT, + financialTransactionId INT, + foreignId INT, + financialDependencyType VARCHAR(64), + turnoverCents BIGINT, + vatInboundCents BIGINT, + vatOutboundCents BIGINT +) +BEGIN + + DECLARE financialDependencyTypeId INTEGER; + + SELECT 0 INTO financialDependencyTypeId; + + IF ((SELECT COUNT(*) FROM FinancialDependencyTypes WHERE FinancialDependencyTypes.Name=financialDependencyType) = 0) + THEN + INSERT INTO FinancialDependencyTypes (Name) + VALUES (financialDependencyType); + + SELECT LAST_INSERT_ID() INTO financialDependencyTypeId; + + ELSE + + SELECT FinancialDependencyTypes.FinancialDependencyTypeId INTO FinancialDependencyTypeId FROM FinancialDependencyTypes + WHERE FinancialDependencyTypes.Name=financialDependencyType; + + END IF; + + INSERT INTO VatReportItems (VatReportId, FinancialTransactionId, ForeignId, FinancialDependencyTypeId, TurnoverCents, VatInboundCents, VatOutboundCents) + VALUES (vatReportId, financialTransactionId, foreignId, financialDependencyTypeId, turnoverCents, vatInboundCents, vatOutboundCents); + + + SELECT LAST_INSERT_ID() AS Identity; + +END