Index: Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_17.1_17.2.sql =================================================================== diff -u -r69e9d0bfd3c8b88e37996d673e1acdcb55a70f9e -r24d1ce7c0ee0c2db9a891e15e72c89ebcac7d203 --- Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_17.1_17.2.sql (.../Migration_17.1_17.2.sql) (revision 69e9d0bfd3c8b88e37996d673e1acdcb55a70f9e) +++ Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_17.1_17.2.sql (.../Migration_17.1_17.2.sql) (revision 24d1ce7c0ee0c2db9a891e15e72c89ebcac7d203) @@ -297,7 +297,12 @@ ( SELECT CASE - WHEN [SignalingNorm] IS NULL OR OriginalNorm BETWEEN ([SignalingNorm] - 0.1) AND ([SignalingNorm] + 0.1) + WHEN [SignalingNorm] IS NULL OR OriginalNorm BETWEEN ([SignalingNorm] - 0.1) AND ([SignalingNorm] + 0.1) OR + ( + OriginalNorm NOT BETWEEN ([SignalingNorm] - 0.1) AND ([SignalingNorm] + 0.1) + AND OriginalNorm NOT BETWEEN ([LowerLimitNorm] - 0.1) AND ([LowerLimitNorm] + 0.1) + AND OriginalNorm > [LowerLimitNorm] + ) THEN 2 -- Set signaling norm type ELSE 1 -- Set lower limit norm type END AS [NormativeNorm], @@ -536,16 +541,16 @@ [FactorOfSafety] FROM [SOURCEPROJECT].ClosingStructuresOutputEntity; INSERT INTO ClosingStructuresSectionResultEntity ( - [ClosingStructuresSectionResultEntityId], - [FailureMechanismSectionEntityId], - [ClosingStructuresCalculationEntityId], - [LayerOne], + [ClosingStructuresSectionResultEntityId], + [FailureMechanismSectionEntityId], + [ClosingStructuresCalculationEntityId], + [LayerOne], [LayerThree] ) SELECT - [ClosingStructuresSectionResultEntityId], - [FailureMechanismSectionEntityId], - [ClosingStructuresCalculationEntityId], + [ClosingStructuresSectionResultEntityId], + [FailureMechanismSectionEntityId], + [ClosingStructuresCalculationEntityId], [LayerOne], CASE WHEN [LayerThree] > 1 OR [LayerThree] < 0 @@ -1093,9 +1098,9 @@ INSERT INTO ProjectEntity SELECT * FROM [SOURCEPROJECT].ProjectEntity; INSERT INTO SoilLayerEntity SELECT * FROM [SOURCEPROJECT].SoilLayerEntity; INSERT INTO SoilProfileEntity( - [SoilProfileEntityId], - [Bottom], - [Name], + [SoilProfileEntityId], + [Bottom], + [Name], [SourceType]) SELECT [SoilProfileEntityId], @@ -1475,25 +1480,25 @@ FROM [SOURCEPROJECT].StochasticSoilProfileEntity; INSERT INTO StrengthStabilityLengthwiseConstructionSectionResultEntity SELECT * FROM [SOURCEPROJECT].StrengthStabilityLengthwiseConstructionSectionResultEntity; INSERT INTO SurfaceLineEntity ( - [SurfaceLineEntityId], - [FailureMechanismEntityId], - [Name], - [ReferenceLineIntersectionX], - [ReferenceLineIntersectionY], - [PointsXml], + [SurfaceLineEntityId], + [FailureMechanismEntityId], + [Name], + [ReferenceLineIntersectionX], + [ReferenceLineIntersectionY], + [PointsXml], [Order]) SELECT - [SurfaceLineEntityId], - [FailureMechanismEntityId], + [SurfaceLineEntityId], + [FailureMechanismEntityId], CASE WHEN [Name] IS NULL THEN "" ELSE [Name] - END, - [ReferenceLineIntersectionX], - [ReferenceLineIntersectionY], - [PointsXml], + END, + [ReferenceLineIntersectionX], + [ReferenceLineIntersectionY], + [PointsXml], [Order] FROM [SOURCEPROJECT].SurfaceLineEntity; INSERT INTO TechnicalInnovationSectionResultEntity SELECT * FROM [SOURCEPROJECT].TechnicalInnovationSectionResultEntity;