Index: Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/Migration_21.1_21.2.sql =================================================================== diff -u -r94306bf98e0d71b0461540e58fdacd1aa1236c6c -rd3c45f5db8ba3de5f2144f7eedad830be54b5f7c --- Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/Migration_21.1_21.2.sql (.../Migration_21.1_21.2.sql) (revision 94306bf98e0d71b0461540e58fdacd1aa1236c6c) +++ Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/Migration_21.1_21.2.sql (.../Migration_21.1_21.2.sql) (revision d3c45f5db8ba3de5f2144f7eedad830be54b5f7c) @@ -433,7 +433,24 @@ INSERT INTO PipingSoilProfileEntity SELECT * FROM [SOURCEPROJECT].PipingSoilProfileEntity; INSERT INTO PipingStochasticSoilProfileEntity SELECT * FROM [SOURCEPROJECT].PipingStochasticSoilProfileEntity; INSERT INTO PipingStructureFailureMechanismMetaEntity SELECT * FROM [SOURCEPROJECT].PipingStructureFailureMechanismMetaEntity; -INSERT INTO PipingStructureSectionResultEntity SELECT * FROM [SOURCEPROJECT].PipingStructureSectionResultEntity; +INSERT INTO PipingStructureSectionResultEntity ( + [PipingStructureSectionResultEntityId], + [FailureMechanismSectionEntityId], + [IsRelevant], + [NonAdoptableInitialFailureMechanismResultType], + [ManualInitialFailureMechanismResultSectionProbability], + [FurtherAnalysisNeeded], + [RefinedSectionProbability] +) +SELECT + [PipingStructureSectionResultEntityId], + [FailureMechanismSectionEntityId], + 1, + 1, + NULL, + 0, + NULL +FROM [SOURCEPROJECT].PipingStructureSectionResultEntity; INSERT INTO ProbabilisticPipingCalculationEntity SELECT * FROM [SOURCEPROJECT].ProbabilisticPipingCalculationEntity; INSERT INTO ProbabilisticPipingCalculationOutputEntity SELECT * FROM [SOURCEPROJECT].ProbabilisticPipingCalculationOutputEntity; INSERT INTO ProjectEntity SELECT * FROM [SOURCEPROJECT].ProjectEntity; Index: Riskeer/Migration/test/Riskeer.Migration.Integration.Test/MigrationTo212IntegrationTest.cs =================================================================== diff -u -r94306bf98e0d71b0461540e58fdacd1aa1236c6c -rd3c45f5db8ba3de5f2144f7eedad830be54b5f7c --- Riskeer/Migration/test/Riskeer.Migration.Integration.Test/MigrationTo212IntegrationTest.cs (.../MigrationTo212IntegrationTest.cs) (revision 94306bf98e0d71b0461540e58fdacd1aa1236c6c) +++ Riskeer/Migration/test/Riskeer.Migration.Integration.Test/MigrationTo212IntegrationTest.cs (.../MigrationTo212IntegrationTest.cs) (revision d3c45f5db8ba3de5f2144f7eedad830be54b5f7c) @@ -75,12 +75,12 @@ AssertGrassCoverErosionInwardsCalculation(reader, sourceFilePath); AssertGrassCoverErosionInwardsOutput(reader); AssertGrassCoverErosionInwardsSectionResults(reader, sourceFilePath); - + AssertGrassCoverErosionOutwardsFailureMechanismMetaEntity(reader, sourceFilePath); AssertGrassCoverErosionOutwardsCalculations(reader, sourceFilePath); AssertMacroStabilityOutwardsFailureMechanismMetaEntity(reader, sourceFilePath); - + AssertStabilityStoneCoverFailureMechanismMetaEntity(reader, sourceFilePath); AssertStabilityStoneCoverCalculations(reader, sourceFilePath); @@ -100,6 +100,8 @@ AssertStrengthStabilityLengthwiseConstructionFailureMechanismMetaEntity(reader, sourceFilePath); AssertStandAloneFailureMechanismMetaEntity(reader, sourceFilePath); + + AssertPipingStructureFailureMechanismSectionResults(reader, sourceFilePath); } AssertLogDatabase(logFilePath); @@ -364,7 +366,7 @@ reader.AssertReturnedDataIsValid(validateFailureMechanismEntity); } - + private static void AssertStabilityStoneCoverCalculations(MigratedDatabaseReader reader, string sourceFilePath) { string validateNormBaseQueryFormat = @@ -542,7 +544,7 @@ reader.AssertReturnedDataIsValid(string.Format(validateFailureMechanismMetaEntity, "17", "StrengthStabilityLengthwiseConstructionFailureMechanismMetaEntity")); } - + private static void AssertStandAloneFailureMechanismMetaEntity(MigratedDatabaseReader reader, string sourceFilePath) { string validateFailureMechanismMetaEntity = @@ -566,6 +568,11 @@ reader.AssertReturnedDataIsValid(string.Format(validateFailureMechanismMetaEntity, "15", "WaterPressureAsphaltCoverFailureMechanismMetaEntity")); } + private static void AssertPipingStructureFailureMechanismSectionResults(MigratedDatabaseReader reader, string sourceFilePath) + { + AssertNonAdoptableFailureMechanismSectionResults(reader, "PipingStructureSectionResultEntity", sourceFilePath); + } + #endregion #region HydraulicBoundaryLocations @@ -674,7 +681,7 @@ private static void AssertPipingFailureMechanismSectionResults(MigratedDatabaseReader reader, string sourceFilePath) { - AssertAdoptableWithProfileProbabilityFailureMechanismSectionResult(reader, "PipingSectionResultEntity", sourceFilePath); + AssertAdoptableWithProfileProbabilityFailureMechanismSectionResults(reader, "PipingSectionResultEntity", sourceFilePath); } #endregion @@ -700,7 +707,7 @@ reader.AssertReturnedDataIsValid(validateFailureMechanismEntity); } - + private static void AssertGrassCoverErosionInwardsCalculation(MigratedDatabaseReader reader, string sourceFilePath) { const string getNormQuery = @@ -851,7 +858,7 @@ private static void AssertGrassCoverErosionInwardsSectionResults(MigratedDatabaseReader reader, string sourceFilePath) { - AssertAdoptableWithProfileProbabilityFailureMechanismSectionResult(reader, "GrassCoverErosionInwardsSectionResultEntity", sourceFilePath); + AssertAdoptableWithProfileProbabilityFailureMechanismSectionResults(reader, "GrassCoverErosionInwardsSectionResultEntity", sourceFilePath); } #endregion @@ -971,7 +978,7 @@ } #endregion - + #region DuneErosion private static void AssertDuneErosionFailureMechanismMetaEntity(MigratedDatabaseReader reader, string sourceFilePath) @@ -1022,7 +1029,7 @@ private static void AssertMacroStabilityInwardsFailureMechanismSectionResults(MigratedDatabaseReader reader, string sourceFilePath) { - AssertAdoptableWithProfileProbabilityFailureMechanismSectionResult(reader, "MacroStabilityInwardsSectionResultEntity", sourceFilePath); + AssertAdoptableWithProfileProbabilityFailureMechanismSectionResults(reader, "MacroStabilityInwardsSectionResultEntity", sourceFilePath); } #endregion @@ -1031,7 +1038,7 @@ private static void AssertHeightStructuresSectionResults(MigratedDatabaseReader reader, string sourceFilePath) { - AssertAdoptableFailureMechanismSectionResult(reader, "HeightStructuresSectionResultEntity", sourceFilePath); + AssertAdoptableFailureMechanismSectionResults(reader, "HeightStructuresSectionResultEntity", sourceFilePath); } #endregion @@ -1040,7 +1047,7 @@ private static void AssertClosingStructuresSectionResults(MigratedDatabaseReader reader, string sourceFilePath) { - AssertAdoptableFailureMechanismSectionResult(reader, "ClosingStructuresSectionResultEntity", sourceFilePath); + AssertAdoptableFailureMechanismSectionResults(reader, "ClosingStructuresSectionResultEntity", sourceFilePath); } #endregion @@ -1049,16 +1056,16 @@ private static void AssertStabilityPointStructuresSectionResults(MigratedDatabaseReader reader, string sourceFilePath) { - AssertAdoptableFailureMechanismSectionResult(reader, "StabilityPointStructuresSectionResultEntity", sourceFilePath); + AssertAdoptableFailureMechanismSectionResults(reader, "StabilityPointStructuresSectionResultEntity", sourceFilePath); } #endregion - + #region FailureMechanismSectionResults - private static void AssertAdoptableFailureMechanismSectionResult(MigratedDatabaseReader reader, - string failureMechanismSectionResultEntityName, - string sourceFilePath) + private static void AssertAdoptableFailureMechanismSectionResults(MigratedDatabaseReader reader, + string failureMechanismSectionResultEntityName, + string sourceFilePath) { string validateFailureMechanismSectionResults = $"ATTACH DATABASE \"{sourceFilePath}\" AS SOURCEPROJECT; " + @@ -1080,9 +1087,9 @@ reader.AssertReturnedDataIsValid(validateFailureMechanismSectionResults); } - private static void AssertAdoptableWithProfileProbabilityFailureMechanismSectionResult(MigratedDatabaseReader reader, - string failureMechanismSectionResultEntityName, - string sourceFilePath) + private static void AssertAdoptableWithProfileProbabilityFailureMechanismSectionResults(MigratedDatabaseReader reader, + string failureMechanismSectionResultEntityName, + string sourceFilePath) { string validateFailureMechanismSectionResults = $"ATTACH DATABASE \"{sourceFilePath}\" AS SOURCEPROJECT; " + @@ -1107,6 +1114,30 @@ reader.AssertReturnedDataIsValid(validateFailureMechanismSectionResults); } + private static void AssertNonAdoptableFailureMechanismSectionResults(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.[NonAdoptableInitialFailureMechanismResultType] = 1 " + + "AND NEW.[ManualInitialFailureMechanismResultSectionProbability] IS NULL " + + "AND NEW.[FurtherAnalysisNeeded] = 0 " + + "AND NEW.[RefinedSectionProbability] IS NULL; " + + "DETACH SOURCEPROJECT;"; + + reader.AssertReturnedDataIsValid(validateFailureMechanismSectionResults); + } + #endregion } } \ No newline at end of file