Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/test-data/AssessmentSectionProvider/project.risk
===================================================================
diff -u -rfef0568186c1f56945f2b22727a561230cb85462 -r8dcce8b9957cc35a8425fc206c78b9e6bbf46e83
Binary files differ
Index: Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/DatabaseStructure21.2.sql
===================================================================
diff -u -r648cae0cb9e1cb3124dfd88173b4b3b78b0e5b0d -r8dcce8b9957cc35a8425fc206c78b9e6bbf46e83
--- Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/DatabaseStructure21.2.sql (.../DatabaseStructure21.2.sql) (revision 648cae0cb9e1cb3124dfd88173b4b3b78b0e5b0d)
+++ Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/DatabaseStructure21.2.sql (.../DatabaseStructure21.2.sql) (revision 8dcce8b9957cc35a8425fc206c78b9e6bbf46e83)
@@ -1,6 +1,6 @@
/* ---------------------------------------------------- */
/* Generated by Enterprise Architect Version 15.2 */
-/* Created On : 27-jan-2022 10:04:08 */
+/* Created On : 28-jan-2022 09:04:33 */
/* DBMS : SQLite */
/* ---------------------------------------------------- */
@@ -30,27 +30,27 @@
DROP TABLE IF EXISTS 'HydraulicLocationEntity'
;
-DROP TABLE IF EXISTS 'SemiProbabilisticPipingCalculationEntity'
-;
-
DROP TABLE IF EXISTS 'GrassCoverErosionInwardsFailureMechanismMetaEntity'
;
-DROP TABLE IF EXISTS 'GrassCoverErosionInwardsCalculationEntity'
+DROP TABLE IF EXISTS 'SemiProbabilisticPipingCalculationEntity'
;
DROP TABLE IF EXISTS 'GrassCoverSlipOffInwardsFailureMechanismMetaEntity'
;
-DROP TABLE IF EXISTS 'GrassCoverErosionOutwardsFailureMechanismMetaEntity'
+DROP TABLE IF EXISTS 'GrassCoverErosionInwardsCalculationEntity'
;
-DROP TABLE IF EXISTS 'PipingSoilLayerEntity'
+DROP TABLE IF EXISTS 'GrassCoverErosionOutwardsFailureMechanismMetaEntity'
;
DROP TABLE IF EXISTS 'PipingSoilProfileEntity'
;
+DROP TABLE IF EXISTS 'PipingSoilLayerEntity'
+;
+
DROP TABLE IF EXISTS 'PipingStochasticSoilProfileEntity'
;
@@ -243,12 +243,6 @@
DROP TABLE IF EXISTS 'MacroStabilityInwardsStochasticSoilProfileEntity'
;
-DROP TABLE IF EXISTS 'MacroStabilityOutwardsFailureMechanismMetaEntity'
-;
-
-DROP TABLE IF EXISTS 'MacroStabilityOutwardsSectionResultEntity'
-;
-
DROP TABLE IF EXISTS 'MicrostabilityFailureMechanismMetaEntity'
;
@@ -312,24 +306,12 @@
DROP TABLE IF EXISTS 'StochastEntity'
;
-DROP TABLE IF EXISTS 'StrengthStabilityLengthwiseConstructionFailureMechanismMetaEntity'
-;
-
-DROP TABLE IF EXISTS 'StrengthStabilityLengthwiseConstructionSectionResultEntity'
-;
-
DROP TABLE IF EXISTS 'SubMechanismIllustrationPointEntity'
;
DROP TABLE IF EXISTS 'SubMechanismIllustrationPointStochastEntity'
;
-DROP TABLE IF EXISTS 'TechnicalInnovationFailureMechanismMetaEntity'
-;
-
-DROP TABLE IF EXISTS 'TechnicalInnovationSectionResultEntity'
-;
-
DROP TABLE IF EXISTS 'TopLevelFaultTreeIllustrationPointEntity'
;
@@ -393,7 +375,7 @@
'FailureMechanismEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
'AssessmentSectionEntityId' INTEGER NOT NULL,
'CalculationGroupEntityId' INTEGER NULL,
- 'FailureMechanismType' SMALLINT NOT NULL, -- Enum: 1 = Piping, 2 = Macrostabiliteit binnenwaarts, 3= Golfklappen op asfaltbekleding, 4= Grasbekleding erosie buitentalud, 5 = Grasbekleding afschuiven buitentalud, 6 = Grasbekleding erosie kruin en binnentalud, 7 = Stabiliteit steenzetting, 8 = Duinafslag, 9 = Hoogte kunstwerk, 10 = Betrouwbaarheid sluiten kunstwerk, 11 = Piping bij kunstwerk, 12 = Sterkte en stabiliteit puntconstructires, 13 = Macrostabiliteit buitenwaarts, 14 = Microstabiliteit, 15 = Wateroverdruk bij asfaltbekleding, 16 = Grasbekleding afschuiven binnentalud, 17 = Sterkte en stabiliteit langsconstructires, 18 = Technische innovaties
+ 'FailureMechanismType' SMALLINT NOT NULL, -- Enum: 1 = Piping, 2 = Macrostabiliteit binnenwaarts, 3= Golfklappen op asfaltbekleding, 4= Grasbekleding erosie buitentalud, 5 = Grasbekleding afschuiven buitentalud, 6 = Grasbekleding erosie kruin en binnentalud, 7 = Stabiliteit steenzetting, 8 = Duinafslag, 9 = Hoogte kunstwerk, 10 = Betrouwbaarheid sluiten kunstwerk, 11 = Piping bij kunstwerk, 12 = Sterkte en stabiliteit puntconstructires, 13 = Microstabiliteit, 14 = Wateroverdruk bij asfaltbekleding, 15 = Grasbekleding afschuiven binnentalud
'InAssembly' TINYINT (1) NOT NULL, -- true or false
'FailureMechanismSectionCollectionSourcePath' TEXT NULL,
'InAssemblyInputComments' TEXT NULL,
@@ -450,6 +432,17 @@
)
;
+CREATE TABLE 'GrassCoverErosionInwardsFailureMechanismMetaEntity'
+(
+ 'GrassCoverErosionInwardsFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+ 'FailureMechanismEntityId' INTEGER NOT NULL,
+ 'N' REAL NOT NULL,
+ 'DikeProfileCollectionSourcePath' TEXT NULL,
+ 'ApplyLengthEffectInSection' TINYINT (1) NOT NULL,
+ CONSTRAINT 'FK_GrassCoverErosionInwardsFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade
+)
+;
+
CREATE TABLE 'SemiProbabilisticPipingCalculationEntity'
(
'SemiProbabilisticPipingCalculationEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
@@ -477,14 +470,13 @@
)
;
-CREATE TABLE 'GrassCoverErosionInwardsFailureMechanismMetaEntity'
+CREATE TABLE 'GrassCoverSlipOffInwardsFailureMechanismMetaEntity'
(
- 'GrassCoverErosionInwardsFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+ 'GrassCoverSlipOffInwardsFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
'FailureMechanismEntityId' INTEGER NOT NULL,
'N' REAL NOT NULL,
- 'DikeProfileCollectionSourcePath' TEXT NULL,
'ApplyLengthEffectInSection' TINYINT (1) NOT NULL,
- CONSTRAINT 'FK_GrassCoverErosionInwardsFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade
+ CONSTRAINT 'FK_GrassCoverSlipOffInwardsFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade
)
;
@@ -520,16 +512,6 @@
)
;
-CREATE TABLE 'GrassCoverSlipOffInwardsFailureMechanismMetaEntity'
-(
- 'GrassCoverSlipOffInwardsFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
- 'FailureMechanismEntityId' INTEGER NOT NULL,
- 'N' REAL NOT NULL,
- 'ApplyLengthEffectInSection' TINYINT (1) NOT NULL,
- CONSTRAINT 'FK_GrassCoverSlipOffInwardsFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade
-)
-;
-
CREATE TABLE 'GrassCoverErosionOutwardsFailureMechanismMetaEntity'
(
'GrassCoverErosionOutwardsFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
@@ -541,6 +523,15 @@
)
;
+CREATE TABLE 'PipingSoilProfileEntity'
+(
+ 'PipingSoilProfileEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+ 'Bottom' REAL NULL,
+ 'Name' TEXT NOT NULL,
+ 'SourceType' TINYINT (1) NOT NULL -- Enum: 1 = SoilProfile1D, 2 = SoilProfile2D
+)
+;
+
CREATE TABLE 'PipingSoilLayerEntity'
(
'PipingSoilLayerEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
@@ -561,15 +552,6 @@
)
;
-CREATE TABLE 'PipingSoilProfileEntity'
-(
- 'PipingSoilProfileEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
- 'Bottom' REAL NULL,
- 'Name' TEXT NOT NULL,
- 'SourceType' TINYINT (1) NOT NULL -- Enum: 1 = SoilProfile1D, 2 = SoilProfile2D
-)
-;
-
CREATE TABLE 'PipingStochasticSoilProfileEntity'
(
'PipingStochasticSoilProfileEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
@@ -1623,31 +1605,6 @@
)
;
-CREATE TABLE 'MacroStabilityOutwardsFailureMechanismMetaEntity'
-(
- 'MacroStabilityOutwardsFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
- 'FailureMechanismEntityId' INTEGER NOT NULL,
- 'A' REAL NOT NULL,
- 'ApplyLengthEffectInSection' TINYINT (1) NOT NULL,
- CONSTRAINT 'FK_MacroStabilityOutwardsFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade
-)
-;
-
-CREATE TABLE 'MacroStabilityOutwardsSectionResultEntity'
-(
- 'MacroStabilityOutwardsSectionResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
- 'FailureMechanismSectionEntityId' INTEGER NOT NULL,
- 'SimpleAssessmentResult' TINYINT (1) NOT NULL, -- Enum: 1 = None, 2 = NotApplicable, 3 = ProbabilityNegligible, 4 = AssessFurther
- 'DetailedAssessmentResult' TINYINT (1) NOT NULL, -- Enum: 1 = Probability, 2 = NotAssessed
- 'DetailedAssessmentProbability' REAL NULL,
- 'TailorMadeAssessmentResult' TINYINT (1) NOT NULL, -- Enum: 1 = None, 2 = ProbabilityNegligible, 3 = Probability, 4 = Sufficient, 5 = Insufficient, 6 = NotAssessed
- 'TailorMadeAssessmentProbability' REAL NULL,
- 'UseManualAssembly' TINYINT (1) NOT NULL, -- true or false
- 'ManualAssemblyCategoryGroup' TINYINT (1) NOT NULL, -- Enum: 1 = None, 2 = NotApplicable, 3 = Iv, 4 = IIv, 5 = Vv, 6 = VIIv
- CONSTRAINT 'FK_MacroStabilityOutwardsSectionResultEntity_FailureMechanismSectionEntity' FOREIGN KEY ('FailureMechanismSectionEntityId') REFERENCES 'FailureMechanismSectionEntity' ('FailureMechanismSectionEntityId') ON DELETE Cascade ON UPDATE Cascade
-)
-;
-
CREATE TABLE 'MicrostabilityFailureMechanismMetaEntity'
(
'MicrostabilityFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
@@ -2072,27 +2029,6 @@
)
;
-CREATE TABLE 'StrengthStabilityLengthwiseConstructionFailureMechanismMetaEntity'
-(
- 'StrengthStabilityLengthwiseConstructionFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
- 'FailureMechanismEntityId' INTEGER NOT NULL,
- 'N' REAL NOT NULL,
- CONSTRAINT 'FK_StrengthStabilityLengthwiseConstructionFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade
-)
-;
-
-CREATE TABLE 'StrengthStabilityLengthwiseConstructionSectionResultEntity'
-(
- 'StrengthStabilityLengthwiseConstructionSectionResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
- 'FailureMechanismSectionEntityId' INTEGER NOT NULL,
- 'SimpleAssessmentResult' TINYINT (1) NOT NULL, -- Enum: 1 = None, 2 = NotApplicable, 3 = ProbabilityNegligible, 4 = AssessFurther
- 'TailorMadeAssessmentResult' TINYINT (1) NOT NULL, -- Enum: 1 = None, 2 = ProbabilityNegligible, 3 = Sufficient, 4 = Insufficient, 5 = NotAssessed
- 'UseManualAssembly' TINYINT (1) NOT NULL, -- true or false
- 'ManualAssemblyCategoryGroup' TINYINT (1) NOT NULL, -- Enum: 1 = None, 2 = NotApplicable, 3 = Iv, 4 = IIv, 5 = Vv, 6 = VIIv
- CONSTRAINT 'FK_StrengthStabilityLengthwiseConstructionSectionResultEntity_FailureMechanismSectionEntity' FOREIGN KEY ('FailureMechanismSectionEntityId') REFERENCES 'FailureMechanismSectionEntity' ('FailureMechanismSectionEntityId') ON DELETE Cascade ON UPDATE Cascade
-)
-;
-
CREATE TABLE 'SubMechanismIllustrationPointEntity'
(
'SubMechanismIllustrationPointEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
@@ -2116,28 +2052,6 @@
)
;
-CREATE TABLE 'TechnicalInnovationFailureMechanismMetaEntity'
-(
- 'TechnicalInnovationFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
- 'FailureMechanismEntityId' INTEGER NOT NULL,
- 'N' REAL NOT NULL,
- 'ApplyLengthEffectInSection' TINYINT (1) NOT NULL,
- CONSTRAINT 'FK_TechnicalInnovationFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade
-)
-;
-
-CREATE TABLE 'TechnicalInnovationSectionResultEntity'
-(
- 'TechnicalInnovationSectionResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
- 'FailureMechanismSectionEntityId' INTEGER NOT NULL,
- 'SimpleAssessmentResult' TINYINT (1) NOT NULL, -- Enum: 1 = None, 2 = NotApplicable, 3 = ProbabilityNegligible, 4 = AssessFurther
- 'TailorMadeAssessmentResult' TINYINT (1) NOT NULL, -- Enum: 1 = None, 2 = ProbabilityNegligible, 3 = Sufficient, 4 = Insufficient, 5 = NotAssessed
- 'UseManualAssembly' TINYINT (1) NOT NULL, -- true or false
- 'ManualAssemblyCategoryGroup' TINYINT (1) NOT NULL, -- Enum: 1 = None, 2 = NotApplicable, 3 = Iv, 4 = IIv, 5 = Vv, 6 = VIIv
- CONSTRAINT 'FK_TechnicalInnovationSectionResultEntity_FailureMechanismSectionEntity' FOREIGN KEY ('FailureMechanismSectionEntityId') REFERENCES 'FailureMechanismSectionEntity' ('FailureMechanismSectionEntityId') ON DELETE Cascade ON UPDATE Cascade
-)
-;
-
CREATE TABLE 'TopLevelFaultTreeIllustrationPointEntity'
(
'TopLevelFaultTreeIllustrationPointEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
@@ -2288,6 +2202,10 @@
ON 'HydraulicLocationEntity' ('AssessmentSectionEntityId' ASC)
;
+CREATE INDEX 'IXFK_GrassCoverErosionInwardsFailureMechanismMetaEntity_FailureMechanismEntity'
+ ON 'GrassCoverErosionInwardsFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC)
+;
+
CREATE INDEX 'IXFK_SemiProbabilisticPipingCalculationEntity_PipingStochasticSoilProfileEntity'
ON 'SemiProbabilisticPipingCalculationEntity' ('PipingStochasticSoilProfileEntityId' ASC)
;
@@ -2304,8 +2222,8 @@
ON 'SemiProbabilisticPipingCalculationEntity' ('CalculationGroupEntityId' ASC)
;
-CREATE INDEX 'IXFK_GrassCoverErosionInwardsFailureMechanismMetaEntity_FailureMechanismEntity'
- ON 'GrassCoverErosionInwardsFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC)
+CREATE INDEX 'IXFK_GrassCoverSlipOffInwardsFailureMechanismMetaEntity_FailureMechanismEntity'
+ ON 'GrassCoverSlipOffInwardsFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC)
;
CREATE INDEX 'IXFK_GrassCoverErosionInwardsCalculationEntity_CalculationGroupEntity'
@@ -2320,10 +2238,6 @@
ON 'GrassCoverErosionInwardsCalculationEntity' ('HydraulicLocationEntityId' ASC)
;
-CREATE INDEX 'IXFK_GrassCoverSlipOffInwardsFailureMechanismMetaEntity_FailureMechanismEntity'
- ON 'GrassCoverSlipOffInwardsFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC)
-;
-
CREATE INDEX 'IXFK_GrassCoverErosionOutwardsFailureMechanismMetaEntity_FailureMechanismEntity'
ON 'GrassCoverErosionOutwardsFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC)
;
@@ -2838,14 +2752,6 @@
END;
;
-CREATE INDEX 'IXFK_MacroStabilityOutwardsFailureMechanismMetaEntity_FailureMechanismEntity'
- ON 'MacroStabilityOutwardsFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC)
-;
-
-CREATE INDEX 'IXFK_MacroStabilityOutwardsSectionResultEntity_FailureMechanismSectionEntity'
- ON 'MacroStabilityOutwardsSectionResultEntity' ('FailureMechanismSectionEntityId' ASC)
-;
-
CREATE INDEX 'IXFK_MicrostabilityFailureMechanismMetaEntity_FailureMechanismEntity'
ON 'MicrostabilityFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC)
;
@@ -3004,26 +2910,10 @@
ON 'StabilityStoneCoverWaveConditionsOutputEntity' ('StabilityStoneCoverWaveConditionsCalculationEntityId' ASC)
;
-CREATE INDEX 'IXFK_StrengthStabilityLengthwiseConstructionFailureMechanismMetaEntity_FailureMechanismEntity'
- ON 'StrengthStabilityLengthwiseConstructionFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC)
-;
-
-CREATE INDEX 'IXFK_StrengthStabilityLengthwiseConstructionSectionResultEntity_FailureMechanismSectionEntity'
- ON 'StrengthStabilityLengthwiseConstructionSectionResultEntity' ('FailureMechanismSectionEntityId' ASC)
-;
-
CREATE INDEX 'IXFK_SubMechanismIllustrationPointStochast_SubMechanismIllustrationPointEntity'
ON 'SubMechanismIllustrationPointStochastEntity' ('SubMechanismIllustrationPointEntityId' ASC)
;
-CREATE INDEX 'IXFK_TechnicalInnovationFailureMechanismMetaEntity_FailureMechanismEntity'
- ON 'TechnicalInnovationFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC)
-;
-
-CREATE INDEX 'IXFK_TechnicalInnovationSectionResultEntity_FailureMechanismSectionEntity'
- ON 'TechnicalInnovationSectionResultEntity' ('FailureMechanismSectionEntityId' ASC)
-;
-
CREATE INDEX 'IXFK_TopLevelFaultTreeIllustrationPointEntity_FaultTreeIllustrationPointEntity'
ON 'TopLevelFaultTreeIllustrationPointEntity' ('FaultTreeIllustrationPointEntityId' ASC)
;
Index: Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/Migration_21.1_21.2.sql
===================================================================
diff -u -rb852981af93508838d3dcc0434b1349914ac0533 -r8dcce8b9957cc35a8425fc206c78b9e6bbf46e83
--- Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/Migration_21.1_21.2.sql (.../Migration_21.1_21.2.sql) (revision b852981af93508838d3dcc0434b1349914ac0533)
+++ Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/Migration_21.1_21.2.sql (.../Migration_21.1_21.2.sql) (revision 8dcce8b9957cc35a8425fc206c78b9e6bbf46e83)
@@ -116,7 +116,8 @@
THEN 14
WHEN [FailureMechanismType] = 16
THEN 15
- END
+ ELSE [FailureMechanismType]
+ END,
[IsRelevant],
[FailureMechanismSectionCollectionSourcePath],
[InputComments],
@@ -126,9 +127,9 @@
1,
NULL
FROM [SOURCEPROJECT].FailureMechanismEntity
-WHERE FailureMechanismType NOT 13 OR
- FailureMechanismType NOT 17 OR
- FailureMechanismType NOT 18;
+WHERE [FailureMechanismType] != 13 AND
+ [FailureMechanismType] != 17 AND
+ [FailureMechanismType] != 18;
INSERT INTO FailureMechanismFailureMechanismSectionEntity (
[FailureMechanismEntityId],
@@ -442,18 +443,6 @@
INSERT INTO MacroStabilityInwardsSoilProfileTwoDEntity SELECT * FROM [SOURCEPROJECT].MacroStabilityInwardsSoilProfileTwoDEntity;
INSERT INTO MacroStabilityInwardsSoilProfileTwoDSoilLayerTwoDEntity SELECT * FROM [SOURCEPROJECT].MacroStabilityInwardsSoilProfileTwoDSoilLayerTwoDEntity;
INSERT INTO MacroStabilityInwardsStochasticSoilProfileEntity SELECT * FROM [SOURCEPROJECT].MacroStabilityInwardsStochasticSoilProfileEntity;
-INSERT INTO MacroStabilityOutwardsFailureMechanismMetaEntity (
- [MacroStabilityOutwardsFailureMechanismMetaEntityId],
- [FailureMechanismEntityId],
- [A],
- [ApplyLengthEffectInSection])
-SELECT
- [MacroStabilityOutwardsFailureMechanismMetaEntityId],
- [FailureMechanismEntityId],
- [A],
- 0
-FROM [SOURCEPROJECT].MacroStabilityOutwardsFailureMechanismMetaEntity;
-INSERT INTO MacroStabilityOutwardsSectionResultEntity SELECT * FROM [SOURCEPROJECT].MacroStabilityOutwardsSectionResultEntity;
INSERT INTO MicrostabilityFailureMechanismMetaEntity (
[FailureMechanismEntityId],
[N],
Index: Riskeer/Migration/test/Riskeer.Migration.Integration.Test/MigrationTo212IntegrationTest.cs
===================================================================
diff -u -r648cae0cb9e1cb3124dfd88173b4b3b78b0e5b0d -r8dcce8b9957cc35a8425fc206c78b9e6bbf46e83
--- Riskeer/Migration/test/Riskeer.Migration.Integration.Test/MigrationTo212IntegrationTest.cs (.../MigrationTo212IntegrationTest.cs) (revision 648cae0cb9e1cb3124dfd88173b4b3b78b0e5b0d)
+++ Riskeer/Migration/test/Riskeer.Migration.Integration.Test/MigrationTo212IntegrationTest.cs (.../MigrationTo212IntegrationTest.cs) (revision 8dcce8b9957cc35a8425fc206c78b9e6bbf46e83)
@@ -80,8 +80,6 @@
AssertGrassCoverErosionOutwardsCalculations(reader, sourceFilePath);
AssertGrassCoverErosionOutwardsSectionResults(reader, sourceFilePath);
- AssertMacroStabilityOutwardsFailureMechanismMetaEntity(reader, sourceFilePath);
-
AssertStabilityStoneCoverFailureMechanismMetaEntity(reader, sourceFilePath);
AssertStabilityStoneCoverCalculations(reader, sourceFilePath);
@@ -100,7 +98,6 @@
AssertClosingStructuresSectionResults(reader, sourceFilePath);
AssertStabilityPointStructuresSectionResults(reader, sourceFilePath);
- AssertStrengthStabilityLengthwiseConstructionFailureMechanismMetaEntity(reader, sourceFilePath);
AssertStandAloneFailureMechanismMetaEntity(reader, sourceFilePath);
AssertPipingStructureFailureMechanismSectionResults(reader, sourceFilePath);
@@ -133,7 +130,6 @@
"DuneErosionFailureMechanismMetaEntity",
"DuneErosionSectionResultEntity",
"DuneLocationEntity",
- "FailureMechanismEntity",
"FailureMechanismSectionEntity",
"FaultTreeIllustrationPointEntity",
"FaultTreeIllustrationPointStochastEntity",
@@ -170,8 +166,6 @@
"MacroStabilityInwardsSoilProfileTwoDEntity",
"MacroStabilityInwardsSoilProfileTwoDSoilLayerTwoDEntity",
"MacroStabilityInwardsStochasticSoilProfileEntity",
- "MacroStabilityOutwardsFailureMechanismMetaEntity",
- "MacroStabilityOutwardsSectionResultEntity",
"MicrostabilitySectionResultEntity",
"PipingCharacteristicPointEntity",
"PipingFailureMechanismMetaEntity",
@@ -195,11 +189,9 @@
"StabilityStoneCoverSectionResultEntity",
"StochastEntity",
"StochasticSoilModelEntity",
- "StrengthStabilityLengthwiseConstructionSectionResultEntity",
"SubMechanismIllustrationPointEntity",
"SubMechanismIllustrationPointStochastEntity",
"SurfaceLineEntity",
- "TechnicalInnovationSectionResultEntity",
"TopLevelFaultTreeIllustrationPointEntity",
"TopLevelSubMechanismIllustrationPointEntity",
"VersionEntity",
@@ -302,12 +294,12 @@
"(" +
"SELECT COUNT() " +
"FROM SOURCEPROJECT.FailureMechanismEntity " +
+ "WHERE [FailureMechanismType] != 18 AND [FailureMechanismType] != 17 AND [FailureMechanismType] != 13 " +
") " +
"FROM FailureMechanismEntity NEW " +
"JOIN SOURCEPROJECT.FailureMechanismEntity OLD USING(FailureMechanismEntityId) " +
"WHERE NEW.[AssessmentSectionEntityId] = OLD.[AssessmentSectionEntityId] " +
"AND NEW.[CalculationGroupEntityId] IS OLD.[CalculationGroupEntityId] " +
- "AND NEW.[FailureMechanismType] = OLD.[FailureMechanismType] " +
"AND NEW.[InAssembly] = OLD.[IsRelevant] " +
"AND NEW.[FailureMechanismSectionCollectionSourcePath] IS OLD.[FailureMechanismSectionCollectionSourcePath] " +
"AND NEW.[InAssemblyInputComments] IS OLD.[InputComments] " +
@@ -317,7 +309,7 @@
"AND NEW.[FailurePathAssemblyProbabilityResultType] = 1 " +
"AND NEW.[ManualFailurePathAssemblyProbability] IS NULL; " +
"DETACH SOURCEPROJECT;";
-
+
reader.AssertReturnedDataIsValid(validateFailureMechanism);
}
@@ -367,29 +359,6 @@
#endregion
- #region MacroStabilityOutwards
-
- private static void AssertMacroStabilityOutwardsFailureMechanismMetaEntity(MigratedDatabaseReader reader, string sourceFilePath)
- {
- string validateFailureMechanismEntity =
- $"ATTACH DATABASE \"{sourceFilePath}\" AS SOURCEPROJECT; " +
- "SELECT COUNT() = " +
- "(" +
- "SELECT COUNT() " +
- "FROM SOURCEPROJECT.MacroStabilityOutwardsFailureMechanismMetaEntity " +
- ") " +
- "FROM MacroStabilityOutwardsFailureMechanismMetaEntity NEW " +
- "JOIN SOURCEPROJECT.MacroStabilityOutwardsFailureMechanismMetaEntity OLD USING(MacroStabilityOutwardsFailureMechanismMetaEntityId) " +
- "WHERE NEW.[FailureMechanismEntityId] = OLD.[FailureMechanismEntityId] " +
- "AND NEW.[A] IS OLD.[A] " +
- "AND NEW.[ApplyLengthEffectInSection] = 0;" +
- "DETACH SOURCEPROJECT;";
-
- reader.AssertReturnedDataIsValid(validateFailureMechanismEntity);
- }
-
- #endregion
-
#region MacroStabilityInwards
private static void AssertMacroStabilityInwardsFailureMechanismSectionResults(MigratedDatabaseReader reader, string sourceFilePath)
@@ -608,24 +577,6 @@
#region StandAlone
- private static void AssertStrengthStabilityLengthwiseConstructionFailureMechanismMetaEntity(MigratedDatabaseReader reader, string sourceFilePath)
- {
- string validateFailureMechanismMetaEntity =
- $"ATTACH DATABASE \"{sourceFilePath}\" AS SOURCEPROJECT; " +
- "SELECT COUNT() = (" +
- "SELECT COUNT()" +
- "FROM SOURCEPROJECT.FailureMechanismEntity " +
- "WHERE FailureMechanismType = {0}" +
- ") " +
- "FROM {1} NEW " +
- "JOIN SOURCEPROJECT.FailureMechanismEntity OLD USING(FailureMechanismEntityId) " +
- "WHERE OLD.[FailureMechanismType] = {0} " +
- "AND NEW.[N] = 1;" +
- "DETACH SOURCEPROJECT;";
-
- reader.AssertReturnedDataIsValid(string.Format(validateFailureMechanismMetaEntity, "17", "StrengthStabilityLengthwiseConstructionFailureMechanismMetaEntity"));
- }
-
private static void AssertStandAloneFailureMechanismMetaEntity(MigratedDatabaseReader reader, string sourceFilePath)
{
string validateFailureMechanismMetaEntity =
@@ -637,16 +588,15 @@
") " +
"FROM {1} NEW " +
"JOIN SOURCEPROJECT.FailureMechanismEntity OLD USING(FailureMechanismEntityId) " +
- "WHERE OLD.[FailureMechanismType] = {0} " +
+ "WHERE OLD.[FailureMechanismType] = {2} " +
"AND NEW.[N] = 1 " +
"AND NEW.[ApplyLengthEffectInSection] = 0;" +
"DETACH SOURCEPROJECT;";
- reader.AssertReturnedDataIsValid(string.Format(validateFailureMechanismMetaEntity, "16", "GrassCoverSlipOffInwardsFailureMechanismMetaEntity"));
- reader.AssertReturnedDataIsValid(string.Format(validateFailureMechanismMetaEntity, "5", "GrassCoverSlipOffOutwardsFailureMechanismMetaEntity"));
- reader.AssertReturnedDataIsValid(string.Format(validateFailureMechanismMetaEntity, "14", "MicrostabilityFailureMechanismMetaEntity"));
- reader.AssertReturnedDataIsValid(string.Format(validateFailureMechanismMetaEntity, "18", "TechnicalInnovationFailureMechanismMetaEntity"));
- reader.AssertReturnedDataIsValid(string.Format(validateFailureMechanismMetaEntity, "15", "WaterPressureAsphaltCoverFailureMechanismMetaEntity"));
+ reader.AssertReturnedDataIsValid(string.Format(validateFailureMechanismMetaEntity, "15", "GrassCoverSlipOffInwardsFailureMechanismMetaEntity", "16"));
+ reader.AssertReturnedDataIsValid(string.Format(validateFailureMechanismMetaEntity, "5", "GrassCoverSlipOffOutwardsFailureMechanismMetaEntity", "5"));
+ reader.AssertReturnedDataIsValid(string.Format(validateFailureMechanismMetaEntity, "13", "MicrostabilityFailureMechanismMetaEntity", "14"));
+ reader.AssertReturnedDataIsValid(string.Format(validateFailureMechanismMetaEntity, "14", "WaterPressureAsphaltCoverFailureMechanismMetaEntity", "15"));
}
private static void AssertPipingStructureFailureMechanismSectionResults(MigratedDatabaseReader reader, string sourceFilePath)
Index: Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/Types/FailureMechanismType.cs
===================================================================
diff -u -r6bc12dd86c8178f643f45bf4c1ea610ee32af9c8 -r8dcce8b9957cc35a8425fc206c78b9e6bbf46e83
--- Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/Types/FailureMechanismType.cs (.../FailureMechanismType.cs) (revision 6bc12dd86c8178f643f45bf4c1ea610ee32af9c8)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/Types/FailureMechanismType.cs (.../FailureMechanismType.cs) (revision 8dcce8b9957cc35a8425fc206c78b9e6bbf46e83)
@@ -89,16 +89,16 @@
///
/// Microstabiliteit - STMI
///
- Microstability = 14,
+ Microstability = 13,
///
/// Wateroverdruk bij asfaltbekleding - AWO
///
- WaterOverpressureAsphaltRevetment = 15,
+ WaterOverpressureAsphaltRevetment = 14,
///
/// Grasbekleding afschuiven binnentalud - GABI
///
- GrassRevetmentSlidingInwards = 16
+ GrassRevetmentSlidingInwards = 15
}
}
\ No newline at end of file