Index: Ringtoets/Migration/src/Ringtoets.Migration.Core/EmbeddedResources/Migration_17.3_18.1.sql =================================================================== diff -u -rd793636169dd75ec39000f5a779533e434e18d11 -r8114d324558759c8d2f46682b6a2f4a570845b14 --- Ringtoets/Migration/src/Ringtoets.Migration.Core/EmbeddedResources/Migration_17.3_18.1.sql (.../Migration_17.3_18.1.sql) (revision d793636169dd75ec39000f5a779533e434e18d11) +++ Ringtoets/Migration/src/Ringtoets.Migration.Core/EmbeddedResources/Migration_17.3_18.1.sql (.../Migration_17.3_18.1.sql) (revision 8114d324558759c8d2f46682b6a2f4a570845b14) @@ -588,7 +588,9 @@ 'TangentLinesXmlSerializer.SerializableTangentLine', 'SerializableTangentLine' ) -FROM [SOURCEPROJECT].MacroStabilityInwardsCalculationOutputEntity; +FROM [SOURCEPROJECT].MacroStabilityInwardsCalculationOutputEntity +JOIN [SOURCEPROJECT].MacroStabilityInwardsCalculationEntity USING(MacroStabilityInwardsCalculationEntityId) +WHERE [UseAssessmentLevelManualInput] = 1; INSERT INTO MacroStabilityInwardsCharacteristicPointEntity SELECT * FROM [SOURCEPROJECT].MacroStabilityInwardsCharacteristicPointEntity; INSERT INTO MacroStabilityInwardsFailureMechanismMetaEntity SELECT * FROM [SOURCEPROJECT].MacroStabilityInwardsFailureMechanismMetaEntity; INSERT INTO MacroStabilityInwardsPreconsolidationStressEntity SELECT * FROM [SOURCEPROJECT].MacroStabilityInwardsPreconsolidationStressEntity; @@ -1312,6 +1314,33 @@ JOIN [SOURCEPROJECT].AssessmentSectionEntity USING(AssessmentSectionEntityId); /* +Outputs that used HydraRing are not migrated +*/ +-- ClosingStructuresOutputEntity +-- GrassCoverErosionOutwardsWaveConditionsOutputEntity +-- GrassCoverErosionInwardsDikeHeightOutputEntity +-- GrassCoverErosionInwardsOutputEntity +-- GrassCoverErosionInwardsOvertoppingRateOutputEntity +-- HeightStructuresOutputEntity +-- StabilityPointStructuresOutputEntity +-- StabilityStoneCoverWaveConditionsOutputEntity +-- WaveImpactAsphaltCoverWaveConditionsOutputEntity +-- TopLevelFaultTreeIllustrationPointEntity +-- TopLevelSubMechanismIllustrationPointEntity +-- GeneralResultFaultTreeIllustrationPointEntity +-- GeneralResultFaultTreeIllustrationPointStochastEntity +-- GeneralResultSubMechanismIllustrationPointEntity +-- GeneralResultSubMechanismIllustrationPointStochastEntity +-- SubMechanismIllustrationPointEntity +-- SubMechanismIllustrationPointStochastEntity +-- FaultTreeIllustrationPointEntity +-- FaultTreeIllustrationPointStochastEntity +-- FaultTreeSubmechanismIllustrationPointEntity +-- StochastEntity +-- (Conditional) MacroStabilityInwardsCalculationOutputEntity +-- (Conditional) PipingCalculationOutputEntity + +/* Insert new data */ INSERT INTO MacroStabilityOutwardsFailureMechanismMetaEntity ( Index: Ringtoets/Migration/test/Ringtoets.Migration.Integration.Test/MigrationTo181IntegrationTest.cs =================================================================== diff -u -rd793636169dd75ec39000f5a779533e434e18d11 -r8114d324558759c8d2f46682b6a2f4a570845b14 --- Ringtoets/Migration/test/Ringtoets.Migration.Integration.Test/MigrationTo181IntegrationTest.cs (.../MigrationTo181IntegrationTest.cs) (revision d793636169dd75ec39000f5a779533e434e18d11) +++ Ringtoets/Migration/test/Ringtoets.Migration.Integration.Test/MigrationTo181IntegrationTest.cs (.../MigrationTo181IntegrationTest.cs) (revision 8114d324558759c8d2f46682b6a2f4a570845b14) @@ -88,6 +88,7 @@ AssertFailureMechanismRelatedOutput(reader); AssertPipingOutput(reader, sourceFilePath); + AssertMacroStabilityInwardsOutput(reader, sourceFilePath); AssertPipingSoilLayers(reader); AssertStabilityStoneCoverFailureMechanism(reader); @@ -431,7 +432,6 @@ "HydraulicLocationEntity", "IllustrationPointResultEntity", "MacroStabilityInwardsCalculationEntity", - "MacroStabilityInwardsCalculationOutputEntity", "MacroStabilityInwardsCharacteristicPointEntity", "MacroStabilityInwardsFailureMechanismMetaEntity", "MacroStabilityInwardsPreconsolidationStressEntity", @@ -1052,6 +1052,72 @@ reader.AssertReturnedDataIsValid(validateOutputCount); } + private static void AssertMacroStabilityInwardsOutput(MigratedDatabaseReader reader, string sourceFilePath) + { + string validateOutputCount = + $"ATTACH DATABASE \"{sourceFilePath}\" AS SOURCEPROJECT; " + + "SELECT COUNT() = " + + "( " + + "SELECT COUNT() " + + "FROM [SOURCEPROJECT].MacroStabilityInwardsCalculationOutputEntity " + + "JOIN [SOURCEPROJECT].MacroStabilityInwardsCalculationEntity USING(MacroStabilityInwardsCalculationEntityId) " + + "WHERE [UseAssessmentLevelManualInput] = 1 " + + ") " + + "FROM MacroStabilityInwardsCalculationOutputEntity;" + + "DETACH DATABASE SOURCEPROJECT;"; + reader.AssertReturnedDataIsValid(validateOutputCount); + + string validateOutputContent = + $"ATTACH DATABASE \"{sourceFilePath}\" AS SOURCEPROJECT; " + + "SELECT " + + "COUNT() = " + + "(" + + "SELECT COUNT() " + + "FROM [SOURCEPROJECT].MacroStabilityInwardsCalculationOutputEntity " + + "JOIN [SOURCEPROJECT].MacroStabilityInwardsCalculationEntity USING(MacroStabilityInwardsCalculationEntityId) " + + "WHERE [UseAssessmentLevelManualInput] = 1 " + + ") " + + "FROM MacroStabilityInwardsCalculationOutputEntity NEW " + + "JOIN [SourceProject].MacroStabilityInwardsCalculationOutputEntity AS OLD USING(MacroStabilityInwardsCalculationOutputEntityId) " + + "WHERE NEW.MacroStabilityInwardsCalculationEntityId = OLD.MacroStabilityInwardsCalculationEntityId " + + "AND NEW.FactorOfStability IS OLD.FactorOfStability " + + "AND NEW.ZValue IS OLD.ZValue " + + "AND NEW.ForbiddenZonesXEntryMin IS OLD.ForbiddenZonesXEntryMin " + + "AND NEW.ForbiddenZonesXEntryMax IS OLD.ForbiddenZonesXEntryMax " + + "AND NEW.SlidingCurveLeftSlidingCircleCenterX IS OLD.SlidingCurveLeftSlidingCircleCenterX " + + "AND NEW.SlidingCurveLeftSlidingCircleCenterY IS OLD.SlidingCurveLeftSlidingCircleCenterY " + + "AND NEW.SlidingCurveLeftSlidingCircleRadius IS OLD.SlidingCurveLeftSlidingCircleRadius " + + "AND NEW.SlidingCurveLeftSlidingCircleIsActive = OLD.SlidingCurveLeftSlidingCircleIsActive " + + "AND NEW.SlidingCurveLeftSlidingCircleNonIteratedForce IS OLD.SlidingCurveLeftSlidingCircleNonIteratedForce " + + "AND NEW.SlidingCurveLeftSlidingCircleIteratedForce IS OLD.SlidingCurveLeftSlidingCircleIteratedForce " + + "AND NEW.SlidingCurveLeftSlidingCircleDrivingMoment IS OLD.SlidingCurveLeftSlidingCircleDrivingMoment " + + "AND NEW.SlidingCurveLeftSlidingCircleResistingMoment IS OLD.SlidingCurveLeftSlidingCircleResistingMoment " + + "AND NEW.SlidingCurveRightSlidingCircleCenterX IS OLD.SlidingCurveRightSlidingCircleCenterX " + + "AND NEW.SlidingCurveRightSlidingCircleCenterY IS OLD.SlidingCurveRightSlidingCircleCenterY " + + "AND NEW.SlidingCurveRightSlidingCircleRadius IS OLD.SlidingCurveRightSlidingCircleRadius " + + "AND NEW.SlidingCurveRightSlidingCircleIsActive = OLD.SlidingCurveRightSlidingCircleIsActive " + + "AND NEW.SlidingCurveRightSlidingCircleNonIteratedForce IS OLD.SlidingCurveRightSlidingCircleNonIteratedForce " + + "AND NEW.SlidingCurveRightSlidingCircleIteratedForce IS OLD.SlidingCurveRightSlidingCircleIteratedForce " + + "AND NEW.SlidingCurveRightSlidingCircleDrivingMoment IS OLD.SlidingCurveRightSlidingCircleDrivingMoment " + + "AND NEW.SlidingCurveRightSlidingCircleResistingMoment IS OLD.SlidingCurveRightSlidingCircleResistingMoment " + + "AND NEW.SlidingCurveNonIteratedHorizontalForce IS OLD.SlidingCurveNonIteratedHorizontalForce " + + "AND NEW.SlidingCurveIteratedHorizontalForce IS OLD.SlidingCurveIteratedHorizontalForce " + + "AND NEW.SlipPlaneLeftGridXLeft IS OLD.SlipPlaneLeftGridXLeft " + + "AND NEW.SlipPlaneLeftGridXRight IS OLD.SlipPlaneLeftGridXRight " + + "AND NEW.SlipPlaneLeftGridNrOfHorizontalPoints = OLD.SlipPlaneLeftGridNrOfHorizontalPoints " + + "AND NEW.SlipPlaneLeftGridZTop IS OLD.SlipPlaneLeftGridZTop " + + "AND NEW.SlipPlaneLeftGridZBottom IS OLD.SlipPlaneLeftGridZBottom " + + "AND NEW.SlipPlaneLeftGridNrOfVerticalPoints = OLD.SlipPlaneLeftGridNrOfVerticalPoints " + + "AND NEW.SlipPlaneRightGridXLeft IS OLD.SlipPlaneRightGridXLeft " + + "AND NEW.SlipPlaneRightGridXRight IS OLD.SlipPlaneRightGridXRight " + + "AND NEW.SlipPlaneRightGridNrOfHorizontalPoints = OLD.SlipPlaneRightGridNrOfHorizontalPoints " + + "AND NEW.SlipPlaneRightGridZTop IS OLD.SlipPlaneRightGridZTop " + + "AND NEW.SlipPlaneRightGridZBottom IS OLD.SlipPlaneRightGridZBottom " + + "AND NEW.SlipPlaneRightGridNrOfVerticalPoints = OLD.SlipPlaneRightGridNrOfVerticalPoints;" + + "DETACH DATABASE SOURCEPROJECT;"; + reader.AssertReturnedDataIsValid(validateOutputContent); + } + #region Dune Locations ///