Index: Ringtoets/Migration/src/Ringtoets.Migration.Core/EmbeddedResources/Migration_17.3_18.1.sql =================================================================== diff -u -r83af36537e4c5b7760260de67d2f361ff2a71ed2 -rc34002da854486928c4dfa4a718d39561f10a973 --- Ringtoets/Migration/src/Ringtoets.Migration.Core/EmbeddedResources/Migration_17.3_18.1.sql (.../Migration_17.3_18.1.sql) (revision 83af36537e4c5b7760260de67d2f361ff2a71ed2) +++ Ringtoets/Migration/src/Ringtoets.Migration.Core/EmbeddedResources/Migration_17.3_18.1.sql (.../Migration_17.3_18.1.sql) (revision c34002da854486928c4dfa4a718d39561f10a973) @@ -1951,41 +1951,6 @@ FROM TempDuneLocationCalculationCollectionEntity WHERE CalculationType = 4 ) USING (DuneErosionFailureMechanismMetaEntityId); --- Migrate the dune location outputs -INSERT INTO DuneLocationCalculationOutputEntity ( - [DuneLocationCalculationOutputEntityId], - [DuneLocationCalculationEntityId], - [WaterLevel], - [WaveHeight], - [WavePeriod], - [TargetProbability], - [TargetReliability], - [CalculatedProbability], - [CalculatedReliability], - [CalculationConvergence]) -SELECT - [DuneLocationOutputEntityId], - [DuneLocationCalculationEntityId], - [WaterLevel], - [WaveHeight], - [WavePeriod], - [TargetProbability], - [TargetReliability], - [CalculatedProbability], - [CalculatedReliability], - [CalculationConvergence] -FROM DuneErosionFailureMechanismMetaEntity defmme -JOIN FailureMechanismEntity fm USING(FailureMechanismEntityId) -JOIN AssessmentSectionEntity USING(AssessmentSectionEntityId) -JOIN DuneLocationCalculationCollectionEntity dlcce -ON defmme.DuneLocationCalculationCollectionEntity2Id = dlcce.DuneLocationCalculationCollectionEntityId -OR defmme.DuneLocationCalculationCollectionEntity3Id = dlcce.DuneLocationCalculationCollectionEntityId -JOIN DuneLocationCalculationEntity USING(DuneLocationCalculationCollectionEntityId) -JOIN DuneLocationEntity dl USING(DuneLocationEntityId) -JOIN [SOURCEPROJECT].DuneLocationOutputEntity USING(DuneLocationEntityId) -WHERE (NormativeNormType = 2 AND defmme.DuneLocationCalculationCollectionEntity2Id = dlcce.DuneLocationCalculationCollectionEntityId) -OR (NormativeNormType = 1 AND defmme.DuneLocationCalculationCollectionEntity3Id = dlcce.DuneLocationCalculationCollectionEntityId); - -- Cleanup DROP TABLE TempCalculationTypes; DROP TABLE TempHydraulicLocationCalculationEntity; Index: Ringtoets/Migration/test/Ringtoets.Migration.Integration.Test/MigrationTo181IntegrationTest.cs =================================================================== diff -u -r83af36537e4c5b7760260de67d2f361ff2a71ed2 -rc34002da854486928c4dfa4a718d39561f10a973 --- Ringtoets/Migration/test/Ringtoets.Migration.Integration.Test/MigrationTo181IntegrationTest.cs (.../MigrationTo181IntegrationTest.cs) (revision 83af36537e4c5b7760260de67d2f361ff2a71ed2) +++ Ringtoets/Migration/test/Ringtoets.Migration.Integration.Test/MigrationTo181IntegrationTest.cs (.../MigrationTo181IntegrationTest.cs) (revision c34002da854486928c4dfa4a718d39561f10a973) @@ -1041,15 +1041,12 @@ reader.AssertReturnedDataIsValid(queryGenerator.GetDuneLocationCalculationsCountValidationQuery( DuneErosionFailureMechanismValidationQueryGenerator.CalculationType.CalculationsForLowerFactorizedLimitNorm)); - reader.AssertReturnedDataIsValid(queryGenerator.GetMigratedDuneLocationCalculationOutputValidationQuery(NormativeNormType.SignalingNorm)); - reader.AssertReturnedDataIsValid(queryGenerator.GetMigratedDuneLocationCalculationOutputValidationQuery(NormativeNormType.LowerLimitNorm)); - - reader.AssertReturnedDataIsValid(DuneErosionFailureMechanismValidationQueryGenerator.GetNewDuneLocationCalculationOutputValidationQuery( - DuneErosionFailureMechanismValidationQueryGenerator.CalculationType.CalculationsForMechanismSpecificFactorizedSignalingNorm)); - reader.AssertReturnedDataIsValid(DuneErosionFailureMechanismValidationQueryGenerator.GetNewDuneLocationCalculationOutputValidationQuery( - DuneErosionFailureMechanismValidationQueryGenerator.CalculationType.CalculationsForLowerLimitNorm)); - reader.AssertReturnedDataIsValid(DuneErosionFailureMechanismValidationQueryGenerator.GetNewDuneLocationCalculationOutputValidationQuery( - DuneErosionFailureMechanismValidationQueryGenerator.CalculationType.CalculationsForLowerFactorizedLimitNorm)); + string validateDuneLocationOutput = + $"ATTACH DATABASE \"{sourceFilePath}\" AS SOURCEPROJECT; " + + "SELECT COUNT() = 0 " + + "FROM DuneLocationCalculationOutputEntity; " + + "DETACH DATABASE SOURCEPROJECT;"; + reader.AssertReturnedDataIsValid(validateDuneLocationOutput); } private static void AssertGrassCoverErosionOutwardsFailureMechanismMetaEntity(MigratedDatabaseReader reader, string sourceFilePath) @@ -1188,53 +1185,6 @@ "DETACH DATABASE SOURCEPROJECT;"; } - /// - /// Generates a query to validate the new dune location outputs that are not based on migrated data. - /// - /// The type of calculation on which the output should be validated. - /// The query to validate the dune location output. - public static string GetNewDuneLocationCalculationOutputValidationQuery(CalculationType calculationType) - { - return "SELECT COUNT() = 0 " + - GetDuneLocationCalculationsQuery(calculationType) + - "JOIN DuneLocationCalculationOutputEntity USING(DuneLocationCalculationEntityId);"; - } - - /// - /// Generates a query to validate if the dune location outputs are migrated correctly to the - /// corresponding calculation entities. - /// - /// The norm type to generate the query for. - /// A query to validate the dune location outputs. - /// Thrown when - /// is an invalid value of . - /// Thrown when is a valid value, - /// but unsupported. - public string GetMigratedDuneLocationCalculationOutputValidationQuery(NormativeNormType normType) - { - return $"ATTACH DATABASE \"{sourceFilePath}\" AS SOURCEPROJECT; " + - "SELECT COUNT() = ( " + - "SELECT COUNT() " + - "FROM [SOURCEPROJECT].DuneLocationOutputEntity " + - "JOIN [SOURCEPROJECT].DuneLocationEntity USING(DuneLocationEntityId) " + - "JOIN [SOURCEPROJECT].FailureMechanismEntity USING(FailureMechanismEntityId) " + - "JOIN [SOURCEPROJECT].AssessmentSectionEntity USING(AssessmentSectionEntityId) " + - $"WHERE NormativeNormType = {(int) normType} " + - ") " + - GetDuneLocationCalculationsQuery(ConvertToCalculationType(normType)) + - "JOIN DuneLocationCalculationOutputEntity NEW USING(DuneLocationCalculationEntityId) " + - "JOIN [SOURCEPROJECT].DuneLocationOutputEntity OLD ON OLD.DuneLocationOutputEntityId = NEW.DuneLocationCalculationOutputEntityId " + - "WHERE NEW.WaterLevel IS OLD.WaterLevel " + - "AND NEW.WaveHeight IS OLD.WaveHeight " + - "AND NEW.WavePeriod IS OLD.WavePeriod " + - "AND NEW.TargetProbability IS OLD.TargetProbability " + - "AND NEW.TargetReliability IS OLD.TargetReliability " + - "AND NEW.CalculatedProbability IS OLD.CalculatedProbability " + - "AND NEW.CalculatedReliability IS OLD.CalculatedReliability " + - "AND NEW.CalculationConvergence = OLD.CalculationConvergence; " + - "DETACH DATABASE SOURCEPROJECT;"; - } - private static string GetDuneLocationCalculationsQuery(CalculationType calculationType) { return "FROM DuneErosionFailureMechanismMetaEntity fme " + @@ -2529,10 +2479,10 @@ } /// - /// Converts the to the corresponding category type from . + /// Converts the to the corresponding category type from . /// /// The norm type to convert. - /// Returns the converted . + /// Returns the converted . /// Thrown when /// is an invalid value of . /// Thrown when is a valid value, @@ -2556,10 +2506,10 @@ } /// - /// Converts the to the corresponding category type from . + /// Converts the to the corresponding category type from . /// /// The norm type to convert. - /// Returns the converted . + /// Returns the converted . /// Thrown when /// is an invalid value of . /// Thrown when is a valid value,