Index: Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/Migration_21.1_21.2.sql =================================================================== diff -u -rfb6fa0f631a49f4274a31e7a5649832e61b05579 -r64d60848f3b1bae48233315253f61f858d05a309 --- Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/Migration_21.1_21.2.sql (.../Migration_21.1_21.2.sql) (revision fb6fa0f631a49f4274a31e7a5649832e61b05579) +++ Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/Migration_21.1_21.2.sql (.../Migration_21.1_21.2.sql) (revision 64d60848f3b1bae48233315253f61f858d05a309) @@ -47,7 +47,7 @@ [ClosingStructuresSectionResultEntityId], [FailureMechanismSectionEntityId], [IsRelevant], - [AdoptableInitialFailureMechanismResultType], + [InitialFailureMechanismResultType], [ManualInitialFailureMechanismResultSectionProbability], [FurtherAnalysisNeeded], [RefinedSectionProbability] @@ -76,7 +76,7 @@ [DuneErosionSectionResultEntityId], [FailureMechanismSectionEntityId], [IsRelevant], - [NonAdoptableInitialFailureMechanismResultType], + [InitialFailureMechanismResultType], [ManualInitialFailureMechanismResultSectionProbability], [FurtherAnalysisNeeded], [RefinedSectionProbability] @@ -167,7 +167,7 @@ [GrassCoverErosionInwardsSectionResultEntityId], [FailureMechanismSectionEntityId], [IsRelevant], - [AdoptableInitialFailureMechanismResultType], + [InitialFailureMechanismResultType], [ManualInitialFailureMechanismResultSectionProbability], [ManualInitialFailureMechanismResultProfileProbability], [FurtherAnalysisNeeded], @@ -283,7 +283,7 @@ [HeightStructuresSectionResultEntityId], [FailureMechanismSectionEntityId], [IsRelevant], - [AdoptableInitialFailureMechanismResultType], + [InitialFailureMechanismResultType], [ManualInitialFailureMechanismResultSectionProbability], [FurtherAnalysisNeeded], [RefinedSectionProbability] @@ -343,7 +343,7 @@ [MacroStabilityInwardsSectionResultEntityId], [FailureMechanismSectionEntityId], [IsRelevant], - [AdoptableInitialFailureMechanismResultType], + [InitialFailureMechanismResultType], [ManualInitialFailureMechanismResultSectionProbability], [ManualInitialFailureMechanismResultProfileProbability], [FurtherAnalysisNeeded], @@ -426,7 +426,7 @@ [PipingSectionResultEntityId], [FailureMechanismSectionEntityId], [IsRelevant], - [AdoptableInitialFailureMechanismResultType], + [InitialFailureMechanismResultType], [ManualInitialFailureMechanismResultSectionProbability], [ManualInitialFailureMechanismResultProfileProbability], [FurtherAnalysisNeeded], @@ -454,7 +454,7 @@ [PipingStructureSectionResultEntityId], [FailureMechanismSectionEntityId], [IsRelevant], - [NonAdoptableInitialFailureMechanismResultType], + [InitialFailureMechanismResultType], [ManualInitialFailureMechanismResultSectionProbability], [FurtherAnalysisNeeded], [RefinedSectionProbability] @@ -481,7 +481,7 @@ [StabilityPointStructuresSectionResultEntityId], [FailureMechanismSectionEntityId], [IsRelevant], - [AdoptableInitialFailureMechanismResultType], + [InitialFailureMechanismResultType], [ManualInitialFailureMechanismResultSectionProbability], [FurtherAnalysisNeeded], [RefinedSectionProbability] Index: Riskeer/Migration/test/Riskeer.Migration.Integration.Test/MigrationTo212IntegrationTest.cs =================================================================== diff -u -rfb6fa0f631a49f4274a31e7a5649832e61b05579 -r64d60848f3b1bae48233315253f61f858d05a309 --- Riskeer/Migration/test/Riskeer.Migration.Integration.Test/MigrationTo212IntegrationTest.cs (.../MigrationTo212IntegrationTest.cs) (revision fb6fa0f631a49f4274a31e7a5649832e61b05579) +++ Riskeer/Migration/test/Riskeer.Migration.Integration.Test/MigrationTo212IntegrationTest.cs (.../MigrationTo212IntegrationTest.cs) (revision 64d60848f3b1bae48233315253f61f858d05a309) @@ -103,6 +103,7 @@ AssertPipingStructureFailureMechanismSectionResults(reader, sourceFilePath); AssertDuneErosionFailureMechanismSectionResults(reader, sourceFilePath); + AssertStabilityStoneCoverSectionResults(reader, sourceFilePath); } AssertLogDatabase(logFilePath); @@ -1067,6 +1068,15 @@ #endregion + #region StabilityStoneCover + + private static void AssertStabilityStoneCoverSectionResults(MigratedDatabaseReader reader, string sourceFilePath) + { + AssertNonAdoptableWithProfileProbabilityFailureMechanismSectionResults(reader, "StabilityStoneCoverSectionResultEntity", sourceFilePath); + } + + #endregion + #region FailureMechanismSectionResults private static void AssertAdoptableFailureMechanismSectionResults(MigratedDatabaseReader reader, @@ -1084,7 +1094,7 @@ $"JOIN SOURCEPROJECT.{failureMechanismSectionResultEntityName} OLD USING({failureMechanismSectionResultEntityName}Id) " + "WHERE NEW.[FailureMechanismSectionEntityId] = OLD.[FailureMechanismSectionEntityId] " + "AND NEW.[IsRelevant] = 1 " + - "AND NEW.[AdoptableInitialFailureMechanismResultType] = 1 " + + "AND NEW.[InitialFailureMechanismResultType] = 1 " + "AND NEW.[ManualInitialFailureMechanismResultSectionProbability] IS NULL " + "AND NEW.[FurtherAnalysisNeeded] = 0 " + "AND NEW.[RefinedSectionProbability] IS NULL; " + @@ -1108,7 +1118,7 @@ $"JOIN SOURCEPROJECT.{failureMechanismSectionResultEntityName} OLD USING({failureMechanismSectionResultEntityName}Id) " + "WHERE NEW.[FailureMechanismSectionEntityId] = OLD.[FailureMechanismSectionEntityId] " + "AND NEW.[IsRelevant] = 1 " + - "AND NEW.[AdoptableInitialFailureMechanismResultType] = 1 " + + "AND NEW.[InitialFailureMechanismResultType] = 1 " + "AND NEW.[ManualInitialFailureMechanismResultSectionProbability] IS NULL " + "AND NEW.[ManualInitialFailureMechanismResultProfileProbability] IS NULL " + "AND NEW.[FurtherAnalysisNeeded] = 0 " + @@ -1135,15 +1145,41 @@ $"JOIN SOURCEPROJECT.{failureMechanismSectionResultEntityName} OLD USING({failureMechanismSectionResultEntityName}Id) " + "WHERE NEW.[FailureMechanismSectionEntityId] = OLD.[FailureMechanismSectionEntityId] " + "AND NEW.[IsRelevant] = 1 " + - "AND NEW.[NonAdoptableInitialFailureMechanismResultType] = 1 " + + "AND NEW.[InitialFailureMechanismResultType] = 1 " + "AND NEW.[ManualInitialFailureMechanismResultSectionProbability] IS NULL " + "AND NEW.[FurtherAnalysisNeeded] = 0 " + "AND NEW.[RefinedSectionProbability] IS NULL; " + "DETACH SOURCEPROJECT;"; reader.AssertReturnedDataIsValid(validateFailureMechanismSectionResults); } + + private static void AssertNonAdoptableWithProfileProbabilityFailureMechanismSectionResults(MigratedDatabaseReader reader, + string failureMechanismSectionResultEntityName, + string sourceFilePath) + { + string validateFailureMechanismSectionResults = + $"ATTACH DATABASE \"{sourceFilePath}\" AS SOURCEPROJECT; " + + "SELECT COUNT() = " + + "(" + + "SELECT COUNT() " + + $"FROM SOURCEPROJECT.{failureMechanismSectionResultEntityName} " + + ") " + + $"FROM {failureMechanismSectionResultEntityName} NEW " + + $"JOIN SOURCEPROJECT.{failureMechanismSectionResultEntityName} OLD USING({failureMechanismSectionResultEntityName}Id) " + + "WHERE NEW.[FailureMechanismSectionEntityId] = OLD.[FailureMechanismSectionEntityId] " + + "AND NEW.[IsRelevant] = 1 " + + "AND NEW.[InitialFailureMechanismResultType] = 1 " + + "AND NEW.[ManualInitialFailureMechanismResultSectionProbability] IS NULL " + + "AND NEW.[ManualInitialFailureMechanismResultProfileProbability] IS NULL " + + "AND NEW.[FurtherAnalysisNeeded] = 0 " + + "AND NEW.[RefinedSectionProbability] IS NULL " + + "AND NEW.[RefinedProfileProbability] IS NULL; " + + "DETACH SOURCEPROJECT;"; + reader.AssertReturnedDataIsValid(validateFailureMechanismSectionResults); + } + #endregion } } \ No newline at end of file