Index: Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/Migration_21.1_21.2.sql =================================================================== diff -u -r716ff39af4c638498cf9eacf602ec5a82dfd70b9 -r32f38ae7beae7a490738d9bc2e83082e5e9c86dc --- Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/Migration_21.1_21.2.sql (.../Migration_21.1_21.2.sql) (revision 716ff39af4c638498cf9eacf602ec5a82dfd70b9) +++ Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/Migration_21.1_21.2.sql (.../Migration_21.1_21.2.sql) (revision 32f38ae7beae7a490738d9bc2e83082e5e9c86dc) @@ -101,8 +101,8 @@ [InAssemblyOutputComments], [NotInAssemblyComments], [CalculationsInputComments], - [FailurePathAssemblyProbabilityResultType], - [ManualFailurePathAssemblyProbability] + [FailureMechanismAssemblyResultProbabilityResultType], + [FailureMechanismAssemblyResultManualFailureMechanismAssemblyProbability] ) SELECT [FailureMechanismEntityId], @@ -810,7 +810,7 @@ END FROM [SOURCEPROJECT].WaveImpactAsphaltCoverWaveConditionsCalculationEntity; -INSERT INTO SpecificFailurePathEntity ( +INSERT INTO SpecificFailureMechanismEntity ( [AssessmentSectionEntityId], [Name], [Code], @@ -821,8 +821,8 @@ [InAssemblyOutputComments], [NotInAssemblyComments], [N], - [FailurePathAssemblyProbabilityResultType], - [ManualFailurePathAssemblyProbability], + [FailureMechanismAssemblyResultProbabilityResultType], + [FailureMechanismAssemblyResultManualFailureMechanismAssemblyProbability], [ApplyLengthEffectInSection] ) SELECT @@ -863,7 +863,7 @@ NULL FROM [SOURCEPROJECT].MacroStabilityOutwardsSectionResultEntity; -INSERT INTO SpecificFailurePathEntity ( +INSERT INTO SpecificFailureMechanismEntity ( [AssessmentSectionEntityId], [Name], [Code], @@ -874,8 +874,8 @@ [InAssemblyOutputComments], [NotInAssemblyComments], [N], - [FailurePathAssemblyProbabilityResultType], - [ManualFailurePathAssemblyProbability], + [FailureMechanismAssemblyResultProbabilityResultType], + [FailureMechanismAssemblyResultManualFailureMechanismAssemblyProbability], [ApplyLengthEffectInSection] ) SELECT @@ -916,7 +916,7 @@ NULL FROM [SOURCEPROJECT].StrengthStabilityLengthwiseConstructionSectionResultEntity; -INSERT INTO SpecificFailurePathEntity ( +INSERT INTO SpecificFailureMechanismEntity ( [AssessmentSectionEntityId], [Name], [Code], @@ -927,8 +927,8 @@ [InAssemblyOutputComments], [NotInAssemblyComments], [N], - [FailurePathAssemblyProbabilityResultType], - [ManualFailurePathAssemblyProbability], + [FailureMechanismAssemblyResultProbabilityResultType], + [FailureMechanismAssemblyResultManualFailureMechanismAssemblyProbability], [ApplyLengthEffectInSection] ) SELECT @@ -969,38 +969,38 @@ NULL FROM [SOURCEPROJECT].TechnicalInnovationSectionResultEntity; -CREATE TEMP TABLE TempSpecificFailurePathMapping +CREATE TEMP TABLE TempSpecificFailureMechanismMapping ( 'FailureMechanismEntityId' INTEGER NOT NULL, - 'SpecificFailurePathEntityId' INTEGER NOT NULL, -CONSTRAINT 'PK_SpecificFailurePathFailureMechanismSectionEntity' PRIMARY KEY ('FailureMechanismEntityId','SpecificFailurePathEntityId') + 'SpecificFailureMechanismEntityId' INTEGER NOT NULL, +CONSTRAINT 'PK_SpecificFailureMechanismFailureMechanismSectionEntity' PRIMARY KEY ('FailureMechanismEntityId','SpecificFailureMechanismEntityId') ); -INSERT INTO TempSpecificFailurePathMapping +INSERT INTO TempSpecificFailureMechanismMapping ( [FailureMechanismEntityId], - [SpecificFailurePathEntityId] + [SpecificFailureMechanismEntityId] ) SELECT [FailureMechanismEntityId], - [SpecificFailurePathEntityId] + [SpecificFailureMechanismEntityId] FROM [SOURCEPROJECT].FailureMechanismEntity fme -JOIN SpecificFailurePathEntity sfpe USING (AssessmentSectionEntityId) +JOIN SpecificFailureMechanismEntity sfpe USING (AssessmentSectionEntityId) WHERE (fme.[FailureMechanismType] = 13 AND sfpe.[Name] = "Macrostabiliteit buitenwaarts") OR (fme.[FailureMechanismType] = 17 AND sfpe.[Name] = "Sterkte en stabiliteit langsconstructies") OR (fme.[FailureMechanismType] = 18 AND sfpe.[Name] = "Technische innovaties"); -INSERT INTO SpecificFailurePathFailureMechanismSectionEntity ( - [SpecificFailurePathEntityId], +INSERT INTO SpecificFailureMechanismFailureMechanismSectionEntity ( + [SpecificFailureMechanismEntityId], [FailureMechanismSectionEntityId] ) SELECT - [SpecificFailurePathEntityId], + [SpecificFailureMechanismEntityId], [FailureMechanismSectionEntityId] -FROM TempSpecificFailurePathMapping +FROM TempSpecificFailureMechanismMapping JOIN [SOURCEPROJECT].FailureMechanismSectionEntity USING(FailureMechanismEntityId); -DROP TABLE TempSpecificFailurePathMapping; +DROP TABLE TempSpecificFailureMechanismMapping; /* Map all calculation groups to failure mechanism ids. Index: Riskeer/Migration/test/Riskeer.Migration.Integration.Test/MigrationTo212IntegrationTest.cs =================================================================== diff -u -r1929a5fe992d847da366760db15d5a6a805cf58c -r32f38ae7beae7a490738d9bc2e83082e5e9c86dc --- Riskeer/Migration/test/Riskeer.Migration.Integration.Test/MigrationTo212IntegrationTest.cs (.../MigrationTo212IntegrationTest.cs) (revision 1929a5fe992d847da366760db15d5a6a805cf58c) +++ Riskeer/Migration/test/Riskeer.Migration.Integration.Test/MigrationTo212IntegrationTest.cs (.../MigrationTo212IntegrationTest.cs) (revision 32f38ae7beae7a490738d9bc2e83082e5e9c86dc) @@ -66,11 +66,11 @@ AssertAssessmentSection(reader, sourceFilePath); AssertFailureMechanism(reader, sourceFilePath); AssertFailureMechanismSection(reader, sourceFilePath); - AssertMacroStabilityOutwardsFailurePath(reader, sourceFilePath); + AssertMacroStabilityOutwardsFailureMechanism(reader, sourceFilePath); AssertMacroStabilityOutwardsSections(reader, sourceFilePath); - AssertStrengthStabilityLengthwiseConstructionFailurePath(reader, sourceFilePath); + AssertStrengthStabilityLengthwiseConstructionFailureMechanism(reader, sourceFilePath); AssertStrengthStabilityLengthwiseConstructionSections(reader, sourceFilePath); - AssertTechnicalInnovationFailurePath(reader, sourceFilePath); + AssertTechnicalInnovationFailureMechanism(reader, sourceFilePath); AssertTechnicalInnovationSections(reader, sourceFilePath); AssertHydraulicBoundaryLocationCalculation(reader, sourceFilePath); @@ -332,8 +332,8 @@ "AND NEW.[InAssemblyOutputComments] IS OLD.[OutputComments] " + "AND NEW.[NotInAssemblyComments] IS OLD.[NotRelevantComments] " + "AND NEW.[CalculationsInputComments] IS NULL " + - "AND NEW.[FailurePathAssemblyProbabilityResultType] = 1 " + - "AND NEW.[ManualFailurePathAssemblyProbability] IS NULL; " + + "AND NEW.[FailureMechanismAssemblyResultProbabilityResultType] = 1 " + + "AND NEW.[FailureMechanismAssemblyResultManualFailureMechanismAssemblyProbability] IS NULL; " + "DETACH SOURCEPROJECT;"; reader.AssertReturnedDataIsValid(validateFailureMechanism); @@ -371,42 +371,42 @@ reader.AssertReturnedDataIsValid(validateFailureMechanismSectionEntity); } - private static void AssertMacroStabilityOutwardsFailurePath(MigratedDatabaseReader reader, string sourceFilePath) + private static void AssertMacroStabilityOutwardsFailureMechanism(MigratedDatabaseReader reader, string sourceFilePath) { - AssertMigratedSpecificFailurePath(reader, sourceFilePath, 13, "Macrostabiliteit buitenwaarts", "STBU", 1); + AssertMigratedSpecificFailureMechanism(reader, sourceFilePath, 13, "Macrostabiliteit buitenwaarts", "STBU", 1); } private static void AssertMacroStabilityOutwardsSections(MigratedDatabaseReader reader, string sourceFilePath) { AssertNonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity(reader, "MacroStabilityOutwardsSectionResultEntity", sourceFilePath); - AssertSpecificFailurePathFailureMechanismSectionEntity(reader, 13, "Macrostabiliteit buitenwaarts", sourceFilePath); + AssertSpecificFailureMechanismFailureMechanismSectionEntity(reader, 13, "Macrostabiliteit buitenwaarts", sourceFilePath); } - private static void AssertStrengthStabilityLengthwiseConstructionFailurePath(MigratedDatabaseReader reader, string sourceFilePath) + private static void AssertStrengthStabilityLengthwiseConstructionFailureMechanism(MigratedDatabaseReader reader, string sourceFilePath) { - AssertMigratedSpecificFailurePath(reader, sourceFilePath, 17, "Sterkte en stabiliteit langsconstructies", "STKWl", 2); + AssertMigratedSpecificFailureMechanism(reader, sourceFilePath, 17, "Sterkte en stabiliteit langsconstructies", "STKWl", 2); } private static void AssertStrengthStabilityLengthwiseConstructionSections(MigratedDatabaseReader reader, string sourceFilePath) { AssertNonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity(reader, "StrengthStabilityLengthwiseConstructionSectionResultEntity", sourceFilePath); - AssertSpecificFailurePathFailureMechanismSectionEntity(reader, 17, "Sterkte en stabiliteit langsconstructies", sourceFilePath); + AssertSpecificFailureMechanismFailureMechanismSectionEntity(reader, 17, "Sterkte en stabiliteit langsconstructies", sourceFilePath); } - private static void AssertTechnicalInnovationFailurePath(MigratedDatabaseReader reader, string sourceFilePath) + private static void AssertTechnicalInnovationFailureMechanism(MigratedDatabaseReader reader, string sourceFilePath) { - AssertMigratedSpecificFailurePath(reader, sourceFilePath, 18, "Technische innovaties", "INN", 3); + AssertMigratedSpecificFailureMechanism(reader, sourceFilePath, 18, "Technische innovaties", "INN", 3); } private static void AssertTechnicalInnovationSections(MigratedDatabaseReader reader, string sourceFilePath) { AssertNonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity(reader, "TechnicalInnovationSectionResultEntity", sourceFilePath); - AssertSpecificFailurePathFailureMechanismSectionEntity(reader, 18, "Technische innovaties", sourceFilePath); + AssertSpecificFailureMechanismFailureMechanismSectionEntity(reader, 18, "Technische innovaties", sourceFilePath); } - private static void AssertSpecificFailurePathFailureMechanismSectionEntity(MigratedDatabaseReader reader, int failureMechanismType, string failureMechanismName, string sourceFilePath) + private static void AssertSpecificFailureMechanismFailureMechanismSectionEntity(MigratedDatabaseReader reader, int failureMechanismType, string failureMechanismName, string sourceFilePath) { - string validateSpecificFailurePathFailureMechanismSectionEntity = + string validateSpecificFailureMechanismFailureMechanismSectionEntity = $"ATTACH DATABASE \"{sourceFilePath}\" AS SOURCEPROJECT; " + "SELECT " + "( " + @@ -418,8 +418,8 @@ $"WHERE FailureMechanismType = {failureMechanismType} " + ") " + ") " + - "FROM SpecificFailurePathEntity NEW " + - "JOIN SpecificFailurePathFailureMechanismSectionEntity USING(SpecificFailurePathEntityId) " + + "FROM SpecificFailureMechanismEntity NEW " + + "JOIN SpecificFailureMechanismFailureMechanismSectionEntity USING(SpecificFailureMechanismEntityId) " + "JOIN ( " + "SELECT " + "[AssessmentSectionEntityId], " + @@ -432,7 +432,7 @@ "AND NEW.AssessmentSectionEntityId = OLD.AssessmentSectionEntityId; " + "DETACH SOURCEPROJECT;"; - reader.AssertReturnedDataIsValid(validateSpecificFailurePathFailureMechanismSectionEntity); + reader.AssertReturnedDataIsValid(validateSpecificFailureMechanismFailureMechanismSectionEntity); } private static void AssertNonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity(MigratedDatabaseReader reader, string failureMechanismSectionResultEntityName, string sourceFilePath) @@ -458,21 +458,21 @@ reader.AssertReturnedDataIsValid(validateNonAdoptableWithProfileProbabilityFailureMechanismSectionResultEntity); } - private static void AssertMigratedSpecificFailurePath(MigratedDatabaseReader reader, string sourceFilePath, + private static void AssertMigratedSpecificFailureMechanism(MigratedDatabaseReader reader, string sourceFilePath, int failureMechanismType, string failureMechanismName, string failureMechanismCode, int order) { - string validateSpecificFailurePathEntity = + string validateSpecificFailureMechanismEntity = $"ATTACH DATABASE \"{sourceFilePath}\" AS SOURCEPROJECT; " + "SELECT COUNT() = " + "(" + "SELECT COUNT() " + "FROM SOURCEPROJECT.FailureMechanismEntity " + $"WHERE FailureMechanismType = {failureMechanismType} " + ") " + - "FROM SpecificFailurePathEntity NEW " + + "FROM SpecificFailureMechanismEntity NEW " + "JOIN (" + "SELECT " + "[AssessmentSectionEntityId], " + @@ -493,12 +493,12 @@ "AND NEW.[InAssemblyOutputComments] IS OLD.[OutputComments] " + "AND NEW.[NotInAssemblyComments] IS OLD.[NotRelevantComments] " + "AND NEW.[N] = 1 " + - "AND NEW.[FailurePathAssemblyProbabilityResultType] = 1 " + - "AND NEW.[ManualFailurePathAssemblyProbability] IS NULL " + + "AND NEW.[FailureMechanismAssemblyResultProbabilityResultType] = 1 " + + "AND NEW.[FailureMechanismAssemblyResultManualFailureMechanismAssemblyProbability] IS NULL " + "AND NEW.[ApplyLengthEffectInSection] = 0; " + "DETACH SOURCEPROJECT;"; - reader.AssertReturnedDataIsValid(validateSpecificFailurePathEntity); + reader.AssertReturnedDataIsValid(validateSpecificFailureMechanismEntity); } #region WaveConditions