Index: Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/Migration_21.1_21.2.sql =================================================================== diff -u -r9114785c52b332de3ccf370d39910cdb17ad5ceb -raf9929adae44ae73b502f7c26ce8a7ec525c4489 --- Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/Migration_21.1_21.2.sql (.../Migration_21.1_21.2.sql) (revision 9114785c52b332de3ccf370d39910cdb17ad5ceb) +++ Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/Migration_21.1_21.2.sql (.../Migration_21.1_21.2.sql) (revision af9929adae44ae73b502f7c26ce8a7ec525c4489) @@ -816,9 +816,94 @@ ) SELECT [AssessmentSectionEntityId], + "Sterkte en stabiliteit langsconstructies", + "STKWl", + 2, + [IsRelevant], + [FailureMechanismSectionCollectionSourcePath], + [InputComments], + [OutputComments], + [NotRelevantComments], + 1, + 1, + NULL, + 0 +FROM [SOURCEPROJECT].FailureMechanismEntity +WHERE FailureMechanismType = 17; + +CREATE TEMP TABLE TempSpecificFailurePathMapping +( + 'FailureMechanismEntityId' INTEGER NOT NULL, + 'SpecificFailurePathEntityId' INTEGER NOT NULL, +CONSTRAINT 'PK_SpecificFailurePathFailureMechanismSectionEntity' PRIMARY KEY ('FailureMechanismEntityId','SpecificFailurePathEntityId') +); + +INSERT INTO TempSpecificFailurePathMapping +( + [FailureMechanismEntityId], + [SpecificFailurePathEntityId] +) +SELECT + [FailureMechanismEntityId], + [SpecificFailurePathEntityId] +FROM [SOURCEPROJECT].FailureMechanismEntity + JOIN SpecificFailurePathEntity USING (AssessmentSectionEntityId) +WHERE FailureMechanismType = 17 + AND [Name] = "Sterkte en stabiliteit langsconstructies"; + +INSERT INTO NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity ( + [FailureMechanismSectionEntityId], + [IsRelevant], + [InitialFailureMechanismResultType], + [ManualInitialFailureMechanismResultSectionProbability], + [ManualInitialFailureMechanismResultProfileProbability], + [FurtherAnalysisType], + [RefinedSectionProbability], + [RefinedProfileProbability] +) +SELECT + [FailureMechanismSectionEntityId], + 1, + 1, + NULL, + NULL, + 1, + NULL, + NULL +FROM [SOURCEPROJECT].StrengthStabilityLengthwiseConstructionSectionResultEntity; + +INSERT INTO SpecificFailurePathFailureMechanismSectionEntity ( + [SpecificFailurePathEntityId], + [FailureMechanismSectionEntityId] +) +SELECT + [SpecificFailurePathEntityId], + [FailureMechanismSectionEntityId] +FROM TempSpecificFailurePathMapping + JOIN [SOURCEPROJECT].FailureMechanismSectionEntity USING(FailureMechanismEntityId); + +DROP TABLE TempSpecificFailurePathMapping; + +INSERT INTO SpecificFailurePathEntity ( + [AssessmentSectionEntityId], + [Name], + [Code], + [Order], + [InAssembly], + [FailureMechanismSectionCollectionSourcePath], + [InAssemblyInputComments], + [InAssemblyOutputComments], + [NotInAssemblyComments], + [N], + [FailurePathAssemblyProbabilityResultType], + [ManualFailurePathAssemblyProbability], + [ApplyLengthEffectInSection] +) +SELECT + [AssessmentSectionEntityId], "Technische innovaties", "INN", - 1, + 3, [IsRelevant], [FailureMechanismSectionCollectionSourcePath], [InputComments], Index: Riskeer/Migration/test/Riskeer.Migration.Integration.Test/MigrationTo212IntegrationTest.cs =================================================================== diff -u -rab2ec0eefc737a0605613669b5205cebd4a5c77d -raf9929adae44ae73b502f7c26ce8a7ec525c4489 --- Riskeer/Migration/test/Riskeer.Migration.Integration.Test/MigrationTo212IntegrationTest.cs (.../MigrationTo212IntegrationTest.cs) (revision ab2ec0eefc737a0605613669b5205cebd4a5c77d) +++ Riskeer/Migration/test/Riskeer.Migration.Integration.Test/MigrationTo212IntegrationTest.cs (.../MigrationTo212IntegrationTest.cs) (revision af9929adae44ae73b502f7c26ce8a7ec525c4489) @@ -370,7 +370,7 @@ "(" + "SELECT COUNT() " + "FROM SOURCEPROJECT.FailureMechanismEntity " + - "WHERE FailureMechanismType = 18 " + + "WHERE FailureMechanismType = {0} " + ") " + "FROM SpecificFailurePathEntity NEW " + "JOIN (" + @@ -382,11 +382,11 @@ "[OutputComments], " + "[NotRelevantComments] " + "FROM SOURCEPROJECT.FailureMechanismEntity " + - "WHERE FailureMechanismType = 18 " + + "WHERE FailureMechanismType = {0} " + ") OLD USING (AssessmentSectionEntityId) " + - "WHERE NEW.[Name] IS \"Technische innovaties\" " + - "AND NEW.[Code] IS \"INN\" " + - "AND NEW.[Order] = 1 " + + "WHERE NEW.[Name] IS \"{1}\" " + + "AND NEW.[Code] IS \"{2}\" " + + "AND NEW.[Order] = {3} " + "AND NEW.[InAssembly] = OLD.[IsRelevant] " + "AND NEW.[FailureMechanismSectionCollectionSourcePath] IS OLD.[FailureMechanismSectionCollectionSourcePath] " + "AND NEW.[InAssemblyInputComments] IS OLD.[InputComments] " + @@ -398,17 +398,18 @@ "AND NEW.[ApplyLengthEffectInSection] = 0; " + "DETACH SOURCEPROJECT;"; - reader.AssertReturnedDataIsValid(validateSpecificFailurePathEntity); + reader.AssertReturnedDataIsValid(string.Format(validateSpecificFailurePathEntity, "17", "Sterkte en stabiliteit langsconstructies","STKWl", 2)); + reader.AssertReturnedDataIsValid(string.Format(validateSpecificFailurePathEntity, "18", "Technische innovaties","INN", 3)); string validateNonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity = $"ATTACH DATABASE \"{sourceFilePath}\" AS SOURCEPROJECT; " + "SELECT COUNT() = " + "(" + "SELECT COUNT() " + - "FROM SOURCEPROJECT.TechnicalInnovationSectionResultEntity " + + "FROM SOURCEPROJECT.{0} " + ") " + "FROM NonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity NEW " + - "JOIN SOURCEPROJECT.TechnicalInnovationSectionResultEntity OLD USING(FailureMechanismSectionEntityId) " + + "JOIN SOURCEPROJECT.{0} OLD USING(FailureMechanismSectionEntityId) " + "WHERE NEW.[IsRelevant] = 1 " + "AND NEW.[InitialFailureMechanismResultType] = 1 " + "AND NEW.[ManualInitialFailureMechanismResultSectionProbability] IS NULL " + @@ -418,7 +419,8 @@ "AND NEW.[RefinedProfileProbability] IS NULL; " + "DETACH SOURCEPROJECT;"; - reader.AssertReturnedDataIsValid(validateNonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity); + reader.AssertReturnedDataIsValid(string.Format(validateNonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity, "StrengthStabilityLengthwiseConstructionSectionResultEntity")); + reader.AssertReturnedDataIsValid(string.Format(validateNonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity, "TechnicalInnovationSectionResultEntity")); string validateSpecificFailurePathFailureMechanismSectionEntity = $"ATTACH DATABASE \"{sourceFilePath}\" AS SOURCEPROJECT; " + @@ -440,13 +442,14 @@ "[FailureMechanismSectionEntityId] " + "FROM SOURCEPROJECT.FailureMechanismEntity " + "JOIN SOURCEPROJECT.FailureMechanismSectionEntity USING(FailureMechanismEntityId) " + - "WHERE FailureMechanismType = 18 " + + "WHERE FailureMechanismType = {0} " + ") OLD USING (FailureMechanismSectionEntityId) " + - "WHERE NEW.[Name] = \"Technische innovaties\" " + + "WHERE NEW.[Name] = \"{1}\" " + "AND NEW.AssessmentSectionEntityId = OLD.AssessmentSectionEntityId; " + "DETACH SOURCEPROJECT;"; - reader.AssertReturnedDataIsValid(validateSpecificFailurePathFailureMechanismSectionEntity); + reader.AssertReturnedDataIsValid(string.Format(validateSpecificFailurePathFailureMechanismSectionEntity, "17", "Sterkte en stabiliteit langsconstructies")); + reader.AssertReturnedDataIsValid(string.Format(validateSpecificFailurePathFailureMechanismSectionEntity, "18", "Technische innovaties")); } #region WaveConditions