Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/test-data/AssessmentSectionProvider/project.risk =================================================================== diff -u -rab80a69e063d9acaf28b68c610ddbdfc93196d30 -rdee95c47ef173fe8ff00297f227470004ed11252 Binary files differ Index: Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/Migration_19.1_20.1.sql =================================================================== diff -u -rab70956b184642e2345539dc2cb996dabc81be19 -rdee95c47ef173fe8ff00297f227470004ed11252 --- Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/Migration_19.1_20.1.sql (.../Migration_19.1_20.1.sql) (revision ab70956b184642e2345539dc2cb996dabc81be19) +++ Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/Migration_19.1_20.1.sql (.../Migration_19.1_20.1.sql) (revision dee95c47ef173fe8ff00297f227470004ed11252) @@ -385,10 +385,48 @@ INSERT INTO MacroStabilityOutwardsFailureMechanismMetaEntity SELECT * FROM [SOURCEPROJECT].MacroStabilityOutwardsFailureMechanismMetaEntity; INSERT INTO MacroStabilityOutwardsSectionResultEntity SELECT * FROM [SOURCEPROJECT].MacroStabilityOutwardsSectionResultEntity; INSERT INTO MicrostabilitySectionResultEntity SELECT * FROM [SOURCEPROJECT].MicrostabilitySectionResultEntity; -INSERT INTO PipingCalculationEntity SELECT * FROM [SOURCEPROJECT].PipingCalculationEntity; -INSERT INTO PipingCalculationOutputEntity( - [PipingCalculationOutputEntityId], - [PipingCalculationEntityId], +INSERT INTO SemiProbabilisticPipingCalculationEntity( + [SemiProbabilisticPipingCalculationEntityId], + [CalculationGroupEntityId], + [SurfaceLineEntityId], + [PipingStochasticSoilProfileEntityId], + [HydraulicLocationEntityId], + [Order], + [Name], + [Comments], + [EntryPointL], + [ExitPointL], + [PhreaticLevelExitMean], + [PhreaticLevelExitStandardDeviation], + [DampingFactorExitMean], + [DampingFactorExitStandardDeviation], + [RelevantForScenario], + [ScenarioContribution], + [AssessmentLevel], + [UseAssessmentLevelManualInput]) +SELECT + [PipingCalculationEntityId], + [CalculationGroupEntityId], + [SurfaceLineEntityId], + [PipingStochasticSoilProfileEntityId], + [HydraulicLocationEntityId], + [Order], + [Name], + [Comments], + [EntryPointL], + [ExitPointL], + [PhreaticLevelExitMean], + [PhreaticLevelExitStandardDeviation], + [DampingFactorExitMean], + [DampingFactorExitStandardDeviation], + [RelevantForScenario], + [ScenarioContribution], + [AssessmentLevel], + [UseAssessmentLevelManualInput] +FROM [SOURCEPROJECT].PipingCalculationEntity; +INSERT INTO SemiProbabilisticPipingCalculationOutputEntity( + [SemiProbabilisticPipingCalculationOutputEntityId], + [SemiProbabilisticPipingCalculationEntityId], [Order], [HeaveFactorOfSafety], [UpliftFactorOfSafety], Index: Riskeer/Migration/test/Riskeer.Migration.Core.Test/test-data/MigrationTestProject201.risk =================================================================== diff -u -rab70956b184642e2345539dc2cb996dabc81be19 -rdee95c47ef173fe8ff00297f227470004ed11252 Binary files differ Index: Riskeer/Migration/test/Riskeer.Migration.Integration.Test/MigrationTo201IntegrationTest.cs =================================================================== diff -u -rab70956b184642e2345539dc2cb996dabc81be19 -rdee95c47ef173fe8ff00297f227470004ed11252 --- Riskeer/Migration/test/Riskeer.Migration.Integration.Test/MigrationTo201IntegrationTest.cs (.../MigrationTo201IntegrationTest.cs) (revision ab70956b184642e2345539dc2cb996dabc81be19) +++ Riskeer/Migration/test/Riskeer.Migration.Integration.Test/MigrationTo201IntegrationTest.cs (.../MigrationTo201IntegrationTest.cs) (revision dee95c47ef173fe8ff00297f227470004ed11252) @@ -75,6 +75,7 @@ AssertMacroStabilityInwardsOutput(reader); + AssertPipingCalculation(reader, sourceFilePath); AssertPipingOutput(reader, sourceFilePath); } @@ -625,18 +626,52 @@ reader.AssertReturnedDataIsValid(macroStabilityInwardsCalculationOutputEntityTable); } + private static void AssertPipingCalculation(MigratedDatabaseReader reader, string sourceFilePath) + { + string validateCalculation = + $"ATTACH DATABASE \"{sourceFilePath}\" AS SOURCEPROJECT; " + + "SELECT COUNT() = " + + "(" + + "SELECT COUNT() " + + "FROM SOURCEPROJECT.PipingCalculationEntity" + + ") " + + "FROM SemiProbabilisticPipingCalculationEntity NEW " + + "JOIN SOURCEPROJECT.PipingCalculationEntity OLD " + + "ON NEW.[SemiProbabilisticPipingCalculationEntityId] = OLD.[PipingCalculationEntityId]" + + "WHERE NEW.[CalculationGroupEntityId] = OLD.[CalculationGroupEntityId] " + + "AND NEW.[SurfaceLineEntityId] IS OLD.[SurfaceLineEntityId] " + + "AND NEW.[PipingStochasticSoilProfileEntityId] IS OLD.[PipingStochasticSoilProfileEntityId] " + + "AND NEW.[HydraulicLocationEntityId] IS OLD.[HydraulicLocationEntityId] " + + "AND NEW.\"Order\" = OLD.\"Order\" " + + "AND NEW.[Name] IS OLD.[Name] " + + "AND NEW.[Comments] IS OLD.[Comments] " + + "AND NEW.[EntryPointL] IS OLD.[EntryPointL] " + + "AND NEW.[ExitPointL] IS OLD.[ExitPointL] " + + "AND NEW.[PhreaticLevelExitMean] IS OLD.[PhreaticLevelExitMean] " + + "AND NEW.[PhreaticLevelExitStandardDeviation] IS OLD.[PhreaticLevelExitStandardDeviation] " + + "AND NEW.[DampingFactorExitMean] IS OLD.[DampingFactorExitMean] " + + "AND NEW.[DampingFactorExitStandardDeviation] IS OLD.[DampingFactorExitStandardDeviation] " + + "AND NEW.[RelevantForScenario] = OLD.[RelevantForScenario] " + + "AND NEW.[ScenarioContribution] IS OLD.[ScenarioContribution] " + + "AND NEW.[AssessmentLevel] IS OLD.[AssessmentLevel] " + + "AND NEW.[UseAssessmentLevelManualInput] = OLD.[UseAssessmentLevelManualInput]; " + + "DETACH SOURCEPROJECT;"; + reader.AssertReturnedDataIsValid(validateCalculation); + } + private static void AssertPipingOutput(MigratedDatabaseReader reader, string sourceFilePath) { - string validateSectionResults = + string validateOutput = $"ATTACH DATABASE \"{sourceFilePath}\" AS SOURCEPROJECT; " + "SELECT COUNT() = " + "(" + "SELECT COUNT() " + "FROM SOURCEPROJECT.PipingCalculationOutputEntity" + ") " + - "FROM PipingCalculationOutputEntity NEW " + - "JOIN SOURCEPROJECT.PipingCalculationOutputEntity OLD USING(PipingCalculationOutputEntityId) " + - "WHERE NEW.[PipingCalculationEntityId] = OLD.[PipingCalculationEntityId] " + + "FROM SemiProbabilisticPipingCalculationOutputEntity NEW " + + "JOIN SOURCEPROJECT.PipingCalculationOutputEntity OLD " + + "ON NEW.[SemiProbabilisticPipingCalculationOutputEntityId] = OLD.[PipingCalculationOutputEntityId]" + + "WHERE NEW.[SemiProbabilisticPipingCalculationEntityId] = OLD.[PipingCalculationEntityId] " + "AND NEW.\"Order\" = OLD.\"Order\" " + "AND NEW.[HeaveFactorOfSafety] IS OLD.[HeaveFactorOfSafety] " + "AND NEW.[UpliftFactorOfSafety] IS OLD.[UpliftFactorOfSafety] " + @@ -647,7 +682,7 @@ "AND NEW.[SellmeijerCriticalFall] IS OLD.[SellmeijerCriticalFall] " + "AND NEW.[SellmeijerReducedFall] IS OLD.[SellmeijerReducedFall]; " + "DETACH SOURCEPROJECT;"; - reader.AssertReturnedDataIsValid(validateSectionResults); + reader.AssertReturnedDataIsValid(validateOutput); } private static void AssertTablesContentMigrated(MigratedDatabaseReader reader, string sourceFilePath)