Index: Ringtoets/Migration/src/Ringtoets.Migration.Core/EmbeddedResources/Migration_17.3_18.1.sql =================================================================== diff -u -r623a4788917a79f7a28b13ae46d4d8cc6515b155 -r83af36537e4c5b7760260de67d2f361ff2a71ed2 --- Ringtoets/Migration/src/Ringtoets.Migration.Core/EmbeddedResources/Migration_17.3_18.1.sql (.../Migration_17.3_18.1.sql) (revision 623a4788917a79f7a28b13ae46d4d8cc6515b155) +++ Ringtoets/Migration/src/Ringtoets.Migration.Core/EmbeddedResources/Migration_17.3_18.1.sql (.../Migration_17.3_18.1.sql) (revision 83af36537e4c5b7760260de67d2f361ff2a71ed2) @@ -1676,39 +1676,6 @@ OR (ShouldWaveHeightIllustrationPointsBeCalculated = 1 AND NormativeNormType = 1 AND ase.HydraulicLocationCalculationCollectionEntity7Id = hlcce.HydraulicLocationCalculationCollectionEntityId) ); ---Migrate the outputs on AssessmentSection level -INSERT INTO HydraulicLocationOutputEntity ( - [HydraulicLocationCalculationEntityId], - [GeneralResultSubMechanismIllustrationPointEntityId], - [Result], - [TargetProbability], - [TargetReliability], - [CalculatedProbability], - [CalculatedReliability], - [CalculationConvergence]) -SELECT - [HydraulicLocationCalculationEntityId], - [GeneralResultSubMechanismIllustrationPointEntityId], - [Result], - [TargetProbability], - [TargetReliability], - [CalculatedProbability], - [CalculatedReliability], - [CalculationConvergence] -FROM AssessmentSectionEntity ase -JOIN HydraulicLocationCalculationCollectionEntity hlcce -ON ase.HydraulicLocationCalculationCollectionEntity2Id = hlcce.HydraulicLocationCalculationCollectionEntityId -OR ase.HydraulicLocationCalculationCollectionEntity3Id = hlcce.HydraulicLocationCalculationCollectionEntityId -OR ase.HydraulicLocationCalculationCollectionEntity6Id = hlcce.HydraulicLocationCalculationCollectionEntityId -OR ase.HydraulicLocationCalculationCollectionEntity7Id = hlcce.HydraulicLocationCalculationCollectionEntityId -JOIN HydraulicLocationCalculationEntity USING(HydraulicLocationCalculationCollectionEntityId) -JOIN HydraulicLocationEntity USING(HydraulicLocationEntityId) -JOIN [SOURCEPROJECT].HydraulicLocationOutputEntity USING(HydraulicLocationEntityId) -WHERE (HydraulicLocationOutputType = 1 AND NormativeNormType = 2 AND ase.HydraulicLocationCalculationCollectionEntity2Id = hlcce.HydraulicLocationCalculationCollectionEntityId) -OR (HydraulicLocationOutputType = 1 AND NormativeNormType = 1 AND ase.HydraulicLocationCalculationCollectionEntity3Id = hlcce.HydraulicLocationCalculationCollectionEntityId) -OR (HydraulicLocationOutputType = 2 AND NormativeNormType = 2 AND ase.HydraulicLocationCalculationCollectionEntity6Id = hlcce.HydraulicLocationCalculationCollectionEntityId) -OR (HydraulicLocationOutputType = 2 AND NormativeNormType = 1 AND ase.HydraulicLocationCalculationCollectionEntity7Id = hlcce.HydraulicLocationCalculationCollectionEntityId); - -- Migration for the Hydraulic Boundary Locations on Grass Cover Erosion Outwards Failure Mechanism Level INSERT INTO GrassCoverErosionOutwardsFailureMechanismMetaEntity ( [GrassCoverErosionOutwardsFailureMechanismMetaEntityId], @@ -1794,42 +1761,6 @@ OR (ShouldWaveHeightIllustrationPointsBeCalculated = 1 AND NormativeNormType = 1 AND gceofmme.HydraulicLocationCalculationCollectionEntity6Id = hlcce.HydraulicLocationCalculationCollectionEntityId) ); --- Insert outputs -INSERT INTO HydraulicLocationOutputEntity ( - [HydraulicLocationCalculationEntityId], - [GeneralResultSubMechanismIllustrationPointEntityId], - [Result], - [TargetProbability], - [TargetReliability], - [CalculatedProbability], - [CalculatedReliability], - [CalculationConvergence]) -SELECT - [HydraulicLocationCalculationEntityId], - [GeneralResultSubMechanismIllustrationPointEntityId], - [Result], - [TargetProbability], - [TargetReliability], - [CalculatedProbability], - [CalculatedReliability], - [CalculationConvergence] -FROM GrassCoverErosionOutwardsFailureMechanismMetaEntity gceofmme -JOIN FailureMechanismEntity fm USING(FailureMechanismEntityId) -JOIN AssessmentSectionEntity USING(AssessmentSectionEntityId) -JOIN HydraulicLocationCalculationCollectionEntity hlcce -ON gceofmme.HydraulicLocationCalculationCollectionEntity2Id = hlcce.HydraulicLocationCalculationCollectionEntityId -OR gceofmme.HydraulicLocationCalculationCollectionEntity3Id = hlcce.HydraulicLocationCalculationCollectionEntityId -OR gceofmme.HydraulicLocationCalculationCollectionEntity5Id = hlcce.HydraulicLocationCalculationCollectionEntityId -OR gceofmme.HydraulicLocationCalculationCollectionEntity6Id = hlcce.HydraulicLocationCalculationCollectionEntityId -JOIN HydraulicLocationCalculationEntity USING(HydraulicLocationCalculationCollectionEntityId) -JOIN HydraulicLocationEntity hl USING(HydraulicLocationEntityId) -JOIN TempGrassCoverErosionOutwardsHydraulicBoundaryLocationLookupTable USING(HydraulicLocationEntityId) -JOIN [SOURCEPROJECT].GrassCoverErosionOutwardsHydraulicLocationOutputEntity USING(GrassCoverErosionOutwardsHydraulicLocationEntityId) -WHERE (HydraulicLocationOutputType = 1 AND NormativeNormType = 2 AND gceofmme.HydraulicLocationCalculationCollectionEntity2Id = hlcce.HydraulicLocationCalculationCollectionEntityId) -OR (HydraulicLocationOutputType = 1 AND NormativeNormType = 1 AND gceofmme.HydraulicLocationCalculationCollectionEntity3Id = hlcce.HydraulicLocationCalculationCollectionEntityId) -OR (HydraulicLocationOutputType = 2 AND NormativeNormType = 2 AND gceofmme.HydraulicLocationCalculationCollectionEntity5Id = hlcce.HydraulicLocationCalculationCollectionEntityId) -OR (HydraulicLocationOutputType = 2 AND NormativeNormType = 1 AND gceofmme.HydraulicLocationCalculationCollectionEntity6Id = hlcce.HydraulicLocationCalculationCollectionEntityId); - -- Migrate the grass cover erosion outwards wave conditions calculations INSERT INTO GrassCoverErosionOutwardsWaveConditionsCalculationEntity ( [GrassCoverErosionOutwardsWaveConditionsCalculationEntityId], Index: Ringtoets/Migration/test/Ringtoets.Migration.Integration.Test/MigrationTo181IntegrationTest.cs =================================================================== diff -u -r623a4788917a79f7a28b13ae46d4d8cc6515b155 -r83af36537e4c5b7760260de67d2f361ff2a71ed2 --- Ringtoets/Migration/test/Ringtoets.Migration.Integration.Test/MigrationTo181IntegrationTest.cs (.../MigrationTo181IntegrationTest.cs) (revision 623a4788917a79f7a28b13ae46d4d8cc6515b155) +++ Ringtoets/Migration/test/Ringtoets.Migration.Integration.Test/MigrationTo181IntegrationTest.cs (.../MigrationTo181IntegrationTest.cs) (revision 83af36537e4c5b7760260de67d2f361ff2a71ed2) @@ -1,4 +1,4 @@ -// Copyright (C) Stichting Deltares 2017. All rights reserved. +// Copyright (C) Stichting Deltares 2017. All rights reserved. // // This file is part of Ringtoets. // @@ -1005,15 +1005,7 @@ string validateHydraulicLocationCalculationOutputCount = $"ATTACH DATABASE \"{sourceFilePath}\" AS SOURCEPROJECT; " + - "SELECT COUNT() = " + - "( " + - "SELECT COUNT() + " + - "( " + - "SELECT COUNT() " + - "FROM [SOURCEPROJECT].GrassCoverErosionOutwardsHydraulicLocationOutputEntity " + - ") " + - "FROM [SOURCEPROJECT].HydraulicLocationOutputEntity " + - ") " + + "SELECT COUNT() = 0 " + "FROM HydraulicLocationOutputEntity; " + "DETACH DATABASE SOURCEPROJECT;"; reader.AssertReturnedDataIsValid(validateHydraulicLocationCalculationOutputCount); @@ -1250,33 +1242,6 @@ $"DuneLocationCalculationCollectionEntityId = fme.DuneLocationCalculationCollectionEntity{(int) calculationType}Id " + "JOIN DuneLocationCalculationEntity USING(DuneLocationCalculationCollectionEntityId) "; } - - /// - /// Converts the to the corresponding calculation from . - /// - /// The norm type to convert. - /// Returns the converted . - /// Thrown when - /// is an invalid value of . - /// Thrown when is a valid value, - /// but unsupported. - private static CalculationType ConvertToCalculationType(NormativeNormType normType) - { - if (!Enum.IsDefined(typeof(NormativeNormType), normType)) - { - throw new InvalidEnumArgumentException(nameof(normType), (int) normType, typeof(NormativeNormType)); - } - - switch (normType) - { - case NormativeNormType.LowerLimitNorm: - return CalculationType.CalculationsForMechanismSpecificLowerLimitNorm; - case NormativeNormType.SignalingNorm: - return CalculationType.CalculationsForMechanismSpecificSignalingNorm; - default: - throw new NotSupportedException(); - } - } } #endregion @@ -1799,17 +1764,11 @@ reader.AssertReturnedDataIsValid(queryGenerator.GetMigratedWaveHeightCalculationsValidationQuery(NormativeNormType.LowerLimitNorm)); reader.AssertReturnedDataIsValid(queryGenerator.GetMigratedWaveHeightCalculationsValidationQuery(NormativeNormType.SignalingNorm)); - reader.AssertReturnedDataIsValid(queryGenerator.GetMigratedWaveHeightCalculationOutputsValidationQuery(NormativeNormType.LowerLimitNorm)); - reader.AssertReturnedDataIsValid(queryGenerator.GetMigratedWaveHeightCalculationOutputsValidationQuery(NormativeNormType.SignalingNorm)); reader.AssertReturnedDataIsValid(queryGenerator.GetNewCalculationsValidationQuery( HydraulicLocationCalculationOnAssessmentSectionValidationQueryGenerator.CalculationType.WaveHeightCalculationsForFactorizedLowerLimitNorm)); reader.AssertReturnedDataIsValid(queryGenerator.GetNewCalculationsValidationQuery( HydraulicLocationCalculationOnAssessmentSectionValidationQueryGenerator.CalculationType.WaveHeightCalculationsForFactorizedSignalingNorm)); - reader.AssertReturnedDataIsValid(HydraulicLocationCalculationOnAssessmentSectionValidationQueryGenerator.GetNewCalculationOutputsValidationQuery( - HydraulicLocationCalculationOnAssessmentSectionValidationQueryGenerator.CalculationType.WaterLevelCalculationsForFactorizedLowerLimitNorm)); - reader.AssertReturnedDataIsValid(HydraulicLocationCalculationOnAssessmentSectionValidationQueryGenerator.GetNewCalculationOutputsValidationQuery( - HydraulicLocationCalculationOnAssessmentSectionValidationQueryGenerator.CalculationType.WaveHeightCalculationsForFactorizedSignalingNorm)); } private static void AssertDesignWaterLevelCalculationEntitiesOnAssessmentSection(MigratedDatabaseReader reader, @@ -1826,17 +1785,11 @@ reader.AssertReturnedDataIsValid(queryGenerator.GetMigratedDesignWaterLevelCalculationsValidationQuery(NormativeNormType.LowerLimitNorm)); reader.AssertReturnedDataIsValid(queryGenerator.GetMigratedDesignWaterLevelCalculationsValidationQuery(NormativeNormType.SignalingNorm)); - reader.AssertReturnedDataIsValid(queryGenerator.GetMigratedDesignWaterLevelCalculationOutputsValidationQuery(NormativeNormType.LowerLimitNorm)); - reader.AssertReturnedDataIsValid(queryGenerator.GetMigratedDesignWaterLevelCalculationOutputsValidationQuery(NormativeNormType.SignalingNorm)); reader.AssertReturnedDataIsValid(queryGenerator.GetNewCalculationsValidationQuery( HydraulicLocationCalculationOnAssessmentSectionValidationQueryGenerator.CalculationType.WaterLevelCalculationsForFactorizedLowerLimitNorm)); reader.AssertReturnedDataIsValid(queryGenerator.GetNewCalculationsValidationQuery( HydraulicLocationCalculationOnAssessmentSectionValidationQueryGenerator.CalculationType.WaterLevelCalculationsForFactorizedSignalingNorm)); - reader.AssertReturnedDataIsValid(HydraulicLocationCalculationOnAssessmentSectionValidationQueryGenerator.GetNewCalculationOutputsValidationQuery( - HydraulicLocationCalculationOnAssessmentSectionValidationQueryGenerator.CalculationType.WaterLevelCalculationsForFactorizedLowerLimitNorm)); - reader.AssertReturnedDataIsValid(HydraulicLocationCalculationOnAssessmentSectionValidationQueryGenerator.GetNewCalculationOutputsValidationQuery( - HydraulicLocationCalculationOnAssessmentSectionValidationQueryGenerator.CalculationType.WaterLevelCalculationsForFactorizedSignalingNorm)); } /// @@ -1985,35 +1938,6 @@ } /// - /// Generates a query to validate if the hydraulic boundary location calculation outputs related to the design water level calculations - /// are migrated correctly to the corresponding calculation entities. - /// - /// The norm type to generate the query for. - /// A query to validate the hydraulic boundary location calculation outputs. - /// Thrown when - /// is an invalid value of . - /// Thrown when is a valid value, - /// but unsupported. - public string GetMigratedDesignWaterLevelCalculationOutputsValidationQuery(NormativeNormType normType) - { - CalculationType calculationType = ConvertToDesignWaterLevelCalculationType(normType); - - return $"ATTACH DATABASE \"{sourceFilePath}\" AS SOURCEPROJECT; " + - "SELECT " + - "COUNT() = " + - "( " + - "SELECT COUNT() " + - "FROM [SOURCEPROJECT].HydraulicLocationOutputEntity sourceHlo " + - "JOIN [SOURCEPROJECT].HydraulicLocationEntity USING(HydraulicLocationEntityId) " + - "JOIN [SOURCEPROJECT].AssessmentSectionEntity sourceAse USING(AssessmentSectionEntityId) " + - $"WHERE sourceHlo.HydraulicLocationOutputType = 1 AND sourceAse.NormativeNormType = {(int) normType} " + - ") " + - GetHydraulicLocationCalculationsFromCollectionQuery(calculationType) + - GetHydraulicLocationCalculationOutputValidationSubQuery() + - "DETACH DATABASE SOURCEPROJECT;"; - } - - /// /// Generates a query to validate if the hydraulic boundary calculation input for the wave height calculations /// are migrated correctly. /// @@ -2040,35 +1964,6 @@ } /// - /// Generates a query to validate if the hydraulic boundary location calculation outputs related to the wave height calculations - /// are migrated correctly to the corresponding calculation entities. - /// - /// The norm type to generate the query for. - /// A query to validate the hydraulic boundary location calculation outputs. - /// Thrown when - /// is an invalid value of . - /// Thrown when is a valid value, - /// but unsupported. - public string GetMigratedWaveHeightCalculationOutputsValidationQuery(NormativeNormType normType) - { - CalculationType calculationType = ConvertToDesignWaterLevelCalculationType(normType); - - return $"ATTACH DATABASE \"{sourceFilePath}\" AS SOURCEPROJECT; " + - "SELECT " + - "COUNT() = " + - "( " + - "SELECT COUNT() " + - "FROM [SOURCEPROJECT].HydraulicLocationOutputEntity sourceHlo " + - "JOIN [SOURCEPROJECT].HydraulicLocationEntity USING(HydraulicLocationEntityId) " + - "JOIN [SOURCEPROJECT].AssessmentSectionEntity sourceAse USING(AssessmentSectionEntityId) " + - $"WHERE sourceHlo.HydraulicLocationOutputType = 2 AND sourceAse.NormativeNormType = {(int) normType} " + - ") " + - GetHydraulicLocationCalculationsFromCollectionQuery(calculationType) + - GetHydraulicLocationCalculationOutputValidationSubQuery() + - "DETACH DATABASE SOURCEPROJECT;"; - } - - /// /// Generates a query to validate the new hydraulic boundary location calculations that are not based on migrated data. /// /// The type of calculation on which the input should be validated. @@ -2082,19 +1977,6 @@ "DETACH DATABASE SOURCEPROJECT;"; } - /// - /// Generates a query to validate the new hydraulic boundary location calculation outputs that are not based on migrated data. - /// - /// The type of calculation on which the output should be validated. - /// The query to validate the hydraulic boundary location calculation output. - public static string GetNewCalculationOutputsValidationQuery(CalculationType calculationType) - { - return "SELECT " + - "COUNT() = 0 " + - GetHydraulicLocationCalculationsFromCollectionQuery(calculationType) + - "JOIN HydraulicLocationOutputEntity USING(HydraulicLocationCalculationEntityId); "; - } - private static string GetHydraulicLocationCalculationsFromCollectionQuery(CalculationType calculationType) { return "FROM AssessmentSectionEntity ase " + @@ -2103,19 +1985,6 @@ "JOIN HydraulicLocationCalculationEntity USING(HydraulicLocationCalculationCollectionEntityId) "; } - private static string GetHydraulicLocationCalculationOutputValidationSubQuery() - { - return "JOIN HydraulicLocationOutputEntity NEW USING(HydraulicLocationCalculationEntityId) " + - "JOIN [SOURCEPROJECT].HydraulicLocationOutputEntity OLD ON " + - "NEW.GeneralResultSubMechanismIllustrationPointEntityId IS OLD.GeneralResultSubMechanismIllustrationPointEntityId " + - "AND NEW.Result IS OLD.Result " + - "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; "; - } - /// /// Converts the to the corresponding design water level calculation from . /// @@ -2186,14 +2055,10 @@ HydraulicLocationOnGrassCoverErosionOutwardsFailureMechanismValidationQueryGenerator.CalculationType.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm)); reader.AssertReturnedDataIsValid(queryGenerator.GetMigratedDesignWaterLevelCalculationsValidationQuery(NormativeNormType.SignalingNorm)); - reader.AssertReturnedDataIsValid(queryGenerator.GetMigratedDesignWaterLevelCalculationOutputsValidationQuery(NormativeNormType.SignalingNorm)); reader.AssertReturnedDataIsValid(queryGenerator.GetMigratedDesignWaterLevelCalculationsValidationQuery(NormativeNormType.LowerLimitNorm)); - reader.AssertReturnedDataIsValid(queryGenerator.GetMigratedDesignWaterLevelCalculationOutputsValidationQuery(NormativeNormType.LowerLimitNorm)); reader.AssertReturnedDataIsValid(queryGenerator.GetNewCalculationsValidationQuery( HydraulicLocationOnGrassCoverErosionOutwardsFailureMechanismValidationQueryGenerator.CalculationType.WaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm)); - reader.AssertReturnedDataIsValid(HydraulicLocationOnGrassCoverErosionOutwardsFailureMechanismValidationQueryGenerator.GetNewCalculationOutputsValidationQuery( - HydraulicLocationOnGrassCoverErosionOutwardsFailureMechanismValidationQueryGenerator.CalculationType.WaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm)); } private static void AssertWaveHeightCalculationEntitiesOnGrassCoverErosionOutwardsFailureMechanism(MigratedDatabaseReader reader, @@ -2207,14 +2072,10 @@ HydraulicLocationOnGrassCoverErosionOutwardsFailureMechanismValidationQueryGenerator.CalculationType.WaveHeightCalculationsForMechanismSpecificLowerLimitNorm)); reader.AssertReturnedDataIsValid(queryGenerator.GetMigratedWaveHeightCalculationsValidationQuery(NormativeNormType.SignalingNorm)); - reader.AssertReturnedDataIsValid(queryGenerator.GetMigratedWaveHeightCalculationOutputsValidationQuery(NormativeNormType.SignalingNorm)); reader.AssertReturnedDataIsValid(queryGenerator.GetMigratedWaveHeightCalculationsValidationQuery(NormativeNormType.LowerLimitNorm)); - reader.AssertReturnedDataIsValid(queryGenerator.GetMigratedWaveHeightCalculationOutputsValidationQuery(NormativeNormType.LowerLimitNorm)); reader.AssertReturnedDataIsValid(queryGenerator.GetNewCalculationsValidationQuery( HydraulicLocationOnGrassCoverErosionOutwardsFailureMechanismValidationQueryGenerator.CalculationType.WaveHeightCalculationsForMechanismSpecificFactorizedSignalingNorm)); - reader.AssertReturnedDataIsValid(HydraulicLocationOnGrassCoverErosionOutwardsFailureMechanismValidationQueryGenerator.GetNewCalculationOutputsValidationQuery( - HydraulicLocationOnGrassCoverErosionOutwardsFailureMechanismValidationQueryGenerator.CalculationType.WaveHeightCalculationsForMechanismSpecificFactorizedSignalingNorm)); } /// @@ -2363,35 +2224,6 @@ } /// - /// Generates a query to validate if the hydraulic boundary location calculation outputs related to the design water level calculations - /// are migrated correctly to the corresponding calculation entities. - /// - /// The norm type to generate the query for. - /// A query to validate the hydraulic boundary location calculation outputs. - /// Thrown when - /// is an invalid value of . - /// Thrown when is a valid value, - /// but unsupported. - public string GetMigratedDesignWaterLevelCalculationOutputsValidationQuery(NormativeNormType normType) - { - CalculationType calculationType = ConvertToDesignWaterLevelCalculationType(normType); - - return $"ATTACH DATABASE \"{sourceFilePath}\" AS SOURCEPROJECT; " + - "SELECT " + - "COUNT() = ( " + - "SELECT COUNT() " + - "FROM [SOURCEPROJECT].GrassCoverErosionOutwardsHydraulicLocationOutputEntity " + - "JOIN [SOURCEPROJECT].GrassCoverErosionOutwardsHydraulicLocationEntity USING(GrassCoverErosionOutwardsHydraulicLocationEntityId) " + - "JOIN [SOURCEPROJECT].FailureMechanismEntity USING(FailureMechanismEntityId) " + - "JOIN [SOURCEPROJECT].AssessmentSectionEntity USING(AssessmentSectionEntityId) " + - $"WHERE HydraulicLocationOutputType = 1 AND NormativeNormType = {(int) normType}" + - ") " + - GetHydraulicLocationCalculationsFromFailureMechanismQuery(calculationType) + - GetHydraulicLocationCalculationOutputValidationSubQuery() + - "DETACH DATABASE SOURCEPROJECT;"; - } - - /// /// Generates a query to validate if the hydraulic boundary calculation input for the wave height calculations /// are migrated correctly. /// @@ -2428,35 +2260,6 @@ } /// - /// Generates a query to validate if the hydraulic boundary location calculation outputs related to the wave height calculations - /// are migrated correctly to the corresponding calculation entities. - /// - /// The norm type to generate the query for. - /// A query to validate the hydraulic boundary location calculation outputs. - /// Thrown when - /// is an invalid value of . - /// Thrown when is a valid value, - /// but unsupported. - public string GetMigratedWaveHeightCalculationOutputsValidationQuery(NormativeNormType normType) - { - CalculationType calculationType = ConvertToWaveHeightCalculationType(normType); - - return $"ATTACH DATABASE \"{sourceFilePath}\" AS SOURCEPROJECT; " + - "SELECT " + - "COUNT() = ( " + - "SELECT COUNT() " + - "FROM [SOURCEPROJECT].GrassCoverErosionOutwardsHydraulicLocationOutputEntity " + - "JOIN [SOURCEPROJECT].GrassCoverErosionOutwardsHydraulicLocationEntity USING(GrassCoverErosionOutwardsHydraulicLocationEntityId) " + - "JOIN [SOURCEPROJECT].FailureMechanismEntity USING(FailureMechanismEntityId) " + - "JOIN [SOURCEPROJECT].AssessmentSectionEntity USING(AssessmentSectionEntityId) " + - $"WHERE HydraulicLocationOutputType = 2 AND NormativeNormType = {(int) normType}" + - ") " + - GetHydraulicLocationCalculationsFromFailureMechanismQuery(calculationType) + - GetHydraulicLocationCalculationOutputValidationSubQuery() + - "DETACH DATABASE SOURCEPROJECT;"; - } - - /// /// Generates a query to validate the new hydraulic boundary location calculations that are not based on migrated data. /// /// The type of calculation on which the input should be validated. @@ -2470,19 +2273,6 @@ "DETACH DATABASE SOURCEPROJECT;"; } - /// - /// Generates a query to validate the new hydraulic boundary location calculation outputs that are not based on migrated data. - /// - /// The type of calculation on which the output should be validated. - /// The query to validate the hydraulic boundary location calculation input. - public static string GetNewCalculationOutputsValidationQuery(CalculationType calculationType) - { - return "SELECT " + - "COUNT() = 0 " + - GetHydraulicLocationCalculationsFromFailureMechanismQuery(calculationType) + - "JOIN HydraulicLocationOutputEntity USING(HydraulicLocationCalculationEntityId); "; - } - private static string GetHydraulicLocationCalculationsFromFailureMechanismQuery(CalculationType calculationType) { return "FROM GrassCoverErosionOutwardsFailureMechanismMetaEntity gceofmm " + @@ -2494,33 +2284,6 @@ "JOIN AssessmentSectionEntity USING(AssessmentSectionEntityId) "; } - private static string GetHydraulicLocationCalculationOutputValidationSubQuery() - { - return "JOIN HydraulicLocationOutputEntity NEW USING(HydraulicLocationCalculationEntityId) " + - "JOIN ( " + - "SELECT " + - "LocationId, " + - "AssessmentSectionEntityId, " + - "GeneralResultSubMechanismIllustrationPointEntityId, " + - "Result, " + - "TargetProbability, " + - "TargetReliability, " + - "CalculatedProbability, " + - "CalculatedReliability, " + - "CalculationConvergence " + - "FROM [SOURCEPROJECT].GrassCoverErosionOutwardsHydraulicLocationOutputEntity " + - "JOIN [SOURCEPROJECT].GrassCoverErosionOutwardsHydraulicLocationEntity USING(GrassCoverErosionOutwardsHydraulicLocationEntityId) " + - "JOIN [SOURCEPROJECT].FailureMechanismEntity USING(FailureMechanismEntityId) " + - ") OLD ON (fm.AssessmentSectionEntityId = OLD.AssessmentSectionEntityId AND OLD.LocationId = hl.LocationId)" + - "WHERE NEW.GeneralResultSubMechanismIllustrationPointEntityId IS OLD.GeneralResultSubMechanismIllustrationPointEntityId " + - "AND NEW.Result IS OLD.Result " + - "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; "; - } - /// /// Converts the to the corresponding design water level calculation from . ///