Index: Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/Migration_21.1_21.2.sql =================================================================== diff -u -r1c70a81c3fb7aa02bec6fd128ca8f5276f04e817 -rabba2cf59047b58744bc952b8abb6bba923d8f14 --- Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/Migration_21.1_21.2.sql (.../Migration_21.1_21.2.sql) (revision 1c70a81c3fb7aa02bec6fd128ca8f5276f04e817) +++ Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/Migration_21.1_21.2.sql (.../Migration_21.1_21.2.sql) (revision abba2cf59047b58744bc952b8abb6bba923d8f14) @@ -11,14 +11,14 @@ INSERT INTO AssessmentSectionEntity ( [AssessmentSectionEntityId], [ProjectEntityId], - [HydraulicLocationCalculationCollectionEntity1Id], -- Represents the design water level signaling norm - [HydraulicLocationCalculationCollectionEntity2Id], -- Represents the design water level lower limit norm + [HydraulicLocationCalculationCollectionEntity1Id], -- Represents the water level signal flooding probability + [HydraulicLocationCalculationCollectionEntity2Id], -- Represents the water level maximum allowable flooding probability [Id], [Name], [Comments], - [LowerLimitNorm], - [SignalingNorm], - [NormativeNormType], + [MaximumAllowableFloodingProbability], + [SignalFloodingProbability], + [NormativeProbabilityType], [Composition], [ReferenceLinePointXml] ) @@ -1120,9 +1120,9 @@ SELECT AssessmentSectionEntityId AS sectionId, CASE - WHEN NormativeNormType IS 1 - THEN LowerLimitNorm - ELSE SignalingNorm + WHEN NormativeProbabilityType IS 1 + THEN MaximumAllowableFloodingProbability + ELSE SignalFloodingProbability END AS Norm FROM AssessmentSectionEntity) ON sectionId = AssessmentSectionEntityId; Index: Riskeer/Migration/test/Riskeer.Migration.Integration.Test/MigrationTo212IntegrationTest.cs =================================================================== diff -u -ra123a11efec057cb209862d2fe5ee637ed50b583 -rabba2cf59047b58744bc952b8abb6bba923d8f14 --- Riskeer/Migration/test/Riskeer.Migration.Integration.Test/MigrationTo212IntegrationTest.cs (.../MigrationTo212IntegrationTest.cs) (revision a123a11efec057cb209862d2fe5ee637ed50b583) +++ Riskeer/Migration/test/Riskeer.Migration.Integration.Test/MigrationTo212IntegrationTest.cs (.../MigrationTo212IntegrationTest.cs) (revision abba2cf59047b58744bc952b8abb6bba923d8f14) @@ -286,9 +286,9 @@ "AND NEW.[Id] IS OLD.[Id] " + "AND NEW.[Name] IS OLD.[Name] " + "AND NEW.[Comments] IS OLD.[Comments] " + - "AND NEW.[LowerLimitNorm] = OLD.[LowerLimitNorm] " + - "AND NEW.[SignalingNorm] = OLD.[SignalingNorm] " + - "AND NEW.[NormativeNormType] = OLD.[NormativeNormType] " + + "AND NEW.[MaximumAllowableFloodingProbability] = OLD.[LowerLimitNorm] " + + "AND NEW.[SignalFloodingProbability] = OLD.[SignalingNorm] " + + "AND NEW.[NormativeProbabilityType] = OLD.[NormativeNormType] " + "AND NEW.[Composition] = OLD.[Composition] " + "AND NEW.[ReferenceLinePointXml] = OLD.[ReferenceLinePointXml]; " + "DETACH SOURCEPROJECT;"; @@ -1036,9 +1036,9 @@ "SELECT " + "AssessmentSectionEntityId AS sectionId, " + "CASE " + - "WHEN NormativeNormType IS 1 " + - "THEN LowerLimitNorm " + - "ELSE SignalingNorm " + + "WHEN NormativeProbabilityType IS 1 " + + "THEN MaximumAllowableFloodingProbability " + + "ELSE SignalFloodingProbability " + "END AS Norm " + "FROM AssessmentSectionEntity) " + "ON sectionId = failureMechanismAssessmentSectionId";