Index: Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql
===================================================================
diff -u -r680d50ac48c78aba5bcdb6cc459343ef6941f7a0 -r36d4b4090a4169cc8d25ede0029a3244df8fe74d
--- Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql (.../DatabaseStructure18.1.sql) (revision 680d50ac48c78aba5bcdb6cc459343ef6941f7a0)
+++ Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql (.../DatabaseStructure18.1.sql) (revision 36d4b4090a4169cc8d25ede0029a3244df8fe74d)
@@ -1,6 +1,6 @@
/* ---------------------------------------------------- */
/* Generated by Enterprise Architect Version 12.0 */
-/* Created On : 25-jan-2018 16:07:42 */
+/* Created On : 26-jan-2018 15:38:38 */
/* DBMS : SQLite */
/* ---------------------------------------------------- */
@@ -21,30 +21,30 @@
DROP TABLE IF EXISTS 'AssessmentSectionEntity'
;
-DROP TABLE IF EXISTS 'FailureMechanismSectionEntity'
+DROP TABLE IF EXISTS 'MacroStabilityOutwardsFailureMechanismMetaEntity'
;
-DROP TABLE IF EXISTS 'StabilityPointStructuresCalculationEntity'
+DROP TABLE IF EXISTS 'FailureMechanismSectionEntity'
;
DROP TABLE IF EXISTS 'FailureMechanismEntity'
;
-DROP TABLE IF EXISTS 'PipingFailureMechanismMetaEntity'
+DROP TABLE IF EXISTS 'StabilityPointStructuresCalculationEntity'
;
DROP TABLE IF EXISTS 'ClosingStructuresFailureMechanismMetaEntity'
;
+DROP TABLE IF EXISTS 'PipingFailureMechanismMetaEntity'
+;
+
DROP TABLE IF EXISTS 'StabilityStoneCoverFailureMechanismMetaEntity'
;
DROP TABLE IF EXISTS 'CalculationGroupEntity'
;
-DROP TABLE IF EXISTS 'StabilityPointStructuresFailureMechanismMetaEntity'
-;
-
DROP TABLE IF EXISTS 'HydraulicLocationEntity'
;
@@ -54,13 +54,13 @@
DROP TABLE IF EXISTS 'GrassCoverErosionInwardsFailureMechanismMetaEntity'
;
-DROP TABLE IF EXISTS 'DuneErosionFailureMechanismMetaEntity'
+DROP TABLE IF EXISTS 'StabilityPointStructuresFailureMechanismMetaEntity'
;
DROP TABLE IF EXISTS 'GrassCoverErosionInwardsCalculationEntity'
;
-DROP TABLE IF EXISTS 'HeightStructuresFailureMechanismMetaEntity'
+DROP TABLE IF EXISTS 'DuneErosionFailureMechanismMetaEntity'
;
DROP TABLE IF EXISTS 'GrassCoverErosionOutwardsFailureMechanismMetaEntity'
@@ -69,6 +69,9 @@
DROP TABLE IF EXISTS 'PipingSoilLayerEntity'
;
+DROP TABLE IF EXISTS 'HeightStructuresFailureMechanismMetaEntity'
+;
+
DROP TABLE IF EXISTS 'PipingSoilProfileEntity'
;
@@ -123,18 +126,18 @@
DROP TABLE IF EXISTS 'MacroStabilityInwardsSectionResultEntity'
;
-DROP TABLE IF EXISTS 'MacrostabilityOutwardsSectionResultEntity'
+DROP TABLE IF EXISTS 'MacroStabilityOutwardsSectionResultEntity'
;
+DROP TABLE IF EXISTS 'WaveImpactAsphaltCoverFailureMechanismMetaEntity'
+;
+
DROP TABLE IF EXISTS 'WaveImpactAsphaltCoverSectionResultEntity'
;
DROP TABLE IF EXISTS 'MicrostabilitySectionResultEntity'
;
-DROP TABLE IF EXISTS 'WaveImpactAsphaltCoverFailureMechanismMetaEntity'
-;
-
DROP TABLE IF EXISTS 'PipingStructureSectionResultEntity'
;
@@ -362,6 +365,15 @@
)
;
+CREATE TABLE 'MacroStabilityOutwardsFailureMechanismMetaEntity'
+(
+ 'MacroStabilityOutwardsFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+ 'FailureMechanismEntityId' INTEGER NOT NULL,
+ 'A' REAL NOT NULL,
+ CONSTRAINT 'FK_MacroStabilityOutwardsFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade
+)
+;
+
CREATE TABLE 'FailureMechanismSectionEntity'
(
'FailureMechanismSectionEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
@@ -372,6 +384,22 @@
)
;
+CREATE TABLE 'FailureMechanismEntity'
+(
+ 'FailureMechanismEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+ 'AssessmentSectionEntityId' INTEGER NOT NULL,
+ 'CalculationGroupEntityId' INTEGER,
+ '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
+ 'IsRelevant' TINYINT (1) NOT NULL, -- true or false
+ 'InputComments' TEXT,
+ 'OutputComments' TEXT,
+ 'NotRelevantComments' TEXT,
+ CONSTRAINT 'FK_FailureMechanismEntity_AssessmentSectionEntity' FOREIGN KEY ('AssessmentSectionEntityId') REFERENCES 'AssessmentSectionEntity' ('AssessmentSectionEntityId') ON DELETE Cascade ON UPDATE Cascade,
+ CONSTRAINT 'FK_FailureMechanismEntity_CalculationGroupEntity' FOREIGN KEY ('CalculationGroupEntityId') REFERENCES 'CalculationGroupEntity' ('CalculationGroupEntityId') ON DELETE Cascade ON UPDATE Cascade,
+ CONSTRAINT 'UI_AssessmentSectionEntityId_FailureMechanismType' UNIQUE ('AssessmentSectionEntityId','FailureMechanismType')
+)
+;
+
CREATE TABLE 'StabilityPointStructuresCalculationEntity'
(
'StabilityPointStructuresCalculationEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
@@ -445,19 +473,14 @@
)
;
-CREATE TABLE 'FailureMechanismEntity'
+CREATE TABLE 'ClosingStructuresFailureMechanismMetaEntity'
(
- 'FailureMechanismEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
- 'AssessmentSectionEntityId' INTEGER NOT NULL,
- 'CalculationGroupEntityId' INTEGER,
- '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
- 'IsRelevant' TINYINT (1) NOT NULL, -- true or false
- 'InputComments' TEXT,
- 'OutputComments' TEXT,
- 'NotRelevantComments' TEXT,
- CONSTRAINT 'FK_FailureMechanismEntity_AssessmentSectionEntity' FOREIGN KEY ('AssessmentSectionEntityId') REFERENCES 'AssessmentSectionEntity' ('AssessmentSectionEntityId') ON DELETE Cascade ON UPDATE Cascade,
- CONSTRAINT 'FK_FailureMechanismEntity_CalculationGroupEntity' FOREIGN KEY ('CalculationGroupEntityId') REFERENCES 'CalculationGroupEntity' ('CalculationGroupEntityId') ON DELETE Cascade ON UPDATE Cascade,
- CONSTRAINT 'UI_AssessmentSectionEntityId_FailureMechanismType' UNIQUE ('AssessmentSectionEntityId','FailureMechanismType')
+ 'ClosingStructuresFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+ 'FailureMechanismEntityId' INTEGER NOT NULL,
+ 'N2A' INT (4) NOT NULL,
+ 'ClosingStructureCollectionSourcePath' TEXT,
+ 'ForeshoreProfileCollectionSourcePath' TEXT,
+ CONSTRAINT 'FK_ClosingStructuresFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade
)
;
@@ -473,17 +496,6 @@
)
;
-CREATE TABLE 'ClosingStructuresFailureMechanismMetaEntity'
-(
- 'ClosingStructuresFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
- 'FailureMechanismEntityId' INTEGER NOT NULL,
- 'N2A' INT (4) NOT NULL,
- 'ClosingStructureCollectionSourcePath' TEXT,
- 'ForeshoreProfileCollectionSourcePath' TEXT,
- CONSTRAINT 'FK_ClosingStructuresFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade
-)
-;
-
CREATE TABLE 'StabilityStoneCoverFailureMechanismMetaEntity'
(
'StabilityStoneCoverFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
@@ -504,17 +516,6 @@
)
;
-CREATE TABLE 'StabilityPointStructuresFailureMechanismMetaEntity'
-(
- 'StabilityPointStructuresFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
- 'FailureMechanismEntityId' INTEGER NOT NULL,
- 'N' REAL NOT NULL,
- 'ForeshoreProfileCollectionSourcePath' TEXT,
- 'StabilityPointStructureCollectionSourcePath' TEXT,
- CONSTRAINT 'FK_StrengthStabilityPointConstructionFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade
-)
-;
-
CREATE TABLE 'HydraulicLocationEntity'
(
'HydraulicLocationEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
@@ -567,12 +568,14 @@
)
;
-CREATE TABLE 'DuneErosionFailureMechanismMetaEntity'
+CREATE TABLE 'StabilityPointStructuresFailureMechanismMetaEntity'
(
- 'DuneErosionFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+ 'StabilityPointStructuresFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
'FailureMechanismEntityId' INTEGER NOT NULL,
'N' REAL NOT NULL,
- CONSTRAINT 'FK_DuneErosionFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade
+ 'ForeshoreProfileCollectionSourcePath' TEXT,
+ 'StabilityPointStructureCollectionSourcePath' TEXT,
+ CONSTRAINT 'FK_StrengthStabilityPointConstructionFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade
)
;
@@ -604,14 +607,12 @@
)
;
-CREATE TABLE 'HeightStructuresFailureMechanismMetaEntity'
+CREATE TABLE 'DuneErosionFailureMechanismMetaEntity'
(
- 'HeightStructuresFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+ 'DuneErosionFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
'FailureMechanismEntityId' INTEGER NOT NULL,
'N' REAL NOT NULL,
- 'HeightStructureCollectionSourcePath' TEXT,
- 'ForeshoreProfileCollectionSourcePath' TEXT,
- CONSTRAINT 'FK_HeightStructuresFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade
+ CONSTRAINT 'FK_DuneErosionFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade
)
;
@@ -645,6 +646,17 @@
)
;
+CREATE TABLE 'HeightStructuresFailureMechanismMetaEntity'
+(
+ 'HeightStructuresFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+ 'FailureMechanismEntityId' INTEGER NOT NULL,
+ 'N' REAL NOT NULL,
+ 'HeightStructureCollectionSourcePath' TEXT,
+ 'ForeshoreProfileCollectionSourcePath' TEXT,
+ CONSTRAINT 'FK_HeightStructuresFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade
+)
+;
+
CREATE TABLE 'PipingSoilProfileEntity'
(
'PipingSoilProfileEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
@@ -868,17 +880,26 @@
)
;
-CREATE TABLE 'MacrostabilityOutwardsSectionResultEntity'
+CREATE TABLE 'MacroStabilityOutwardsSectionResultEntity'
(
- 'MacrostabilityOutwardsSectionResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+ 'MacroStabilityOutwardsSectionResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
'FailureMechanismSectionEntityId' INTEGER NOT NULL,
'LayerOne' TINYINT (1) NOT NULL, -- Enum: 1 = NotAssessed, 2 = Sufficient, 3 = NoVerdict
'LayerTwoA' REAL,
'LayerThree' REAL,
- CONSTRAINT 'FK_MacrostabilityOutwardsSectionResultEntity_FailureMechanismSectionEntity' FOREIGN KEY ('FailureMechanismSectionEntityId') REFERENCES 'FailureMechanismSectionEntity' ('FailureMechanismSectionEntityId') ON DELETE Cascade ON UPDATE Cascade
+ CONSTRAINT 'FK_MacroStabilityOutwardsSectionResultEntity_FailureMechanismSectionEntity' FOREIGN KEY ('FailureMechanismSectionEntityId') REFERENCES 'FailureMechanismSectionEntity' ('FailureMechanismSectionEntityId') ON DELETE Cascade ON UPDATE Cascade
)
;
+CREATE TABLE 'WaveImpactAsphaltCoverFailureMechanismMetaEntity'
+(
+ 'WaveImpactAsphaltCoverFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+ 'FailureMechanismEntityId' INTEGER NOT NULL,
+ 'ForeshoreProfileCollectionSourcePath' TEXT,
+ CONSTRAINT 'FK_WaveImpactAsphaltCoverFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade
+)
+;
+
CREATE TABLE 'WaveImpactAsphaltCoverSectionResultEntity'
(
'WaveImpactAsphaltCoverSectionResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
@@ -901,15 +922,6 @@
)
;
-CREATE TABLE 'WaveImpactAsphaltCoverFailureMechanismMetaEntity'
-(
- 'WaveImpactAsphaltCoverFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
- 'FailureMechanismEntityId' INTEGER NOT NULL,
- 'ForeshoreProfileCollectionSourcePath' TEXT,
- CONSTRAINT 'FK_WaveImpactAsphaltCoverFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade
-)
-;
-
CREATE TABLE 'PipingStructureSectionResultEntity'
(
'PipingStructureSectionResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
@@ -1970,10 +1982,22 @@
ON 'AssessmentSectionEntity' ('ProjectEntityId' ASC)
;
+CREATE INDEX 'IXFK_MacroStabilityOutwardsFailureMechanismMetaEntity_FailureMechanismEntity'
+ ON 'MacroStabilityOutwardsFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC)
+;
+
CREATE INDEX 'IXFK_FailureMechanismSectionEntity_FailureMechanismEntity'
ON 'FailureMechanismSectionEntity' ('FailureMechanismEntityId' ASC)
;
+CREATE INDEX 'IXFK_FailureMechanismEntity_AssessmentSectionEntity'
+ ON 'FailureMechanismEntity' ('AssessmentSectionEntityId' ASC)
+;
+
+CREATE INDEX 'IXFK_FailureMechanismEntity_CalculationGroupEntity'
+ ON 'FailureMechanismEntity' ('CalculationGroupEntityId' ASC)
+;
+
CREATE INDEX 'IXFK_StabilityPointStructuresCalculationEntity_CalculationGroupEntity'
ON 'StabilityPointStructuresCalculationEntity' ('CalculationGroupEntityId' ASC)
;
@@ -1990,22 +2014,14 @@
ON 'StabilityPointStructuresCalculationEntity' ('StabilityPointStructureEntityId' ASC)
;
-CREATE INDEX 'IXFK_FailureMechanismEntity_AssessmentSectionEntity'
- ON 'FailureMechanismEntity' ('AssessmentSectionEntityId' ASC)
+CREATE INDEX 'IXFK_ClosingStructuresFailureMechanismMetaEntity_FailureMechanismEntity'
+ ON 'ClosingStructuresFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC)
;
-CREATE INDEX 'IXFK_FailureMechanismEntity_CalculationGroupEntity'
- ON 'FailureMechanismEntity' ('CalculationGroupEntityId' ASC)
-;
-
CREATE INDEX 'IXFK_PipingFailureMechanismMetaEntity_FailureMechanismEntity'
ON 'PipingFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC)
;
-CREATE INDEX 'IXFK_ClosingStructuresFailureMechanismMetaEntity_FailureMechanismEntity'
- ON 'ClosingStructuresFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC)
-;
-
CREATE INDEX 'IXFK_StabilityStoneCoverFailureMechanismMetaEntity_FailureMechanismEntity'
ON 'StabilityStoneCoverFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC)
;
@@ -2014,10 +2030,6 @@
ON 'CalculationGroupEntity' ('ParentCalculationGroupEntityId' ASC)
;
-CREATE INDEX 'IXFK_StrengthStabilityPointConstructionFailureMechanismMetaEntity_FailureMechanismEntity'
- ON 'StabilityPointStructuresFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC)
-;
-
CREATE INDEX 'IXFK_HydraulicLocationEntity_AssessmentSectionEntity'
ON 'HydraulicLocationEntity' ('AssessmentSectionEntityId' ASC)
;
@@ -2042,8 +2054,8 @@
ON 'GrassCoverErosionInwardsFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC)
;
-CREATE INDEX 'IXFK_DuneErosionFailureMechanismMetaEntity_FailureMechanismEntity'
- ON 'DuneErosionFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC)
+CREATE INDEX 'IXFK_StrengthStabilityPointConstructionFailureMechanismMetaEntity_FailureMechanismEntity'
+ ON 'StabilityPointStructuresFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC)
;
CREATE INDEX 'IXFK_GrassCoverErosionInwardsCalculationEntity_CalculationGroupEntity'
@@ -2058,14 +2070,18 @@
ON 'GrassCoverErosionInwardsCalculationEntity' ('HydraulicLocationEntityId' ASC)
;
-CREATE INDEX 'IXFK_HeightStructuresFailureMechanismMetaEntity_FailureMechanismEntity'
- ON 'HeightStructuresFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC)
+CREATE INDEX 'IXFK_DuneErosionFailureMechanismMetaEntity_FailureMechanismEntity'
+ ON 'DuneErosionFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC)
;
CREATE INDEX 'IXFK_GrassCoverErosionOutwardsFailureMechanismMetaEntity_FailureMechanismEntity'
ON 'GrassCoverErosionOutwardsFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC)
;
+CREATE INDEX 'IXFK_HeightStructuresFailureMechanismMetaEntity_FailureMechanismEntity'
+ ON 'HeightStructuresFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC)
+;
+
CREATE INDEX 'IXFK_PipingStochasticSoilProfileEntity_SoilProfileEntity'
ON 'PipingStochasticSoilProfileEntity' ('PipingSoilProfileEntityId' ASC)
;
@@ -2150,10 +2166,14 @@
ON 'MacroStabilityInwardsSectionResultEntity' ('FailureMechanismSectionEntityId' ASC)
;
-CREATE INDEX 'IXFK_MacrostabilityOutwardsSectionResultEntity_FailureMechanismSectionEntity'
- ON 'MacrostabilityOutwardsSectionResultEntity' ('FailureMechanismSectionEntityId' ASC)
+CREATE INDEX 'IXFK_MacroStabilityOutwardsSectionResultEntity_FailureMechanismSectionEntity'
+ ON 'MacroStabilityOutwardsSectionResultEntity' ('FailureMechanismSectionEntityId' ASC)
;
+CREATE INDEX 'IXFK_WaveImpactAsphaltCoverFailureMechanismMetaEntity_FailureMechanismEntity'
+ ON 'WaveImpactAsphaltCoverFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC)
+;
+
CREATE INDEX 'IXFK_WaveImpactAsphaltCoverSectionResultEntity_FailureMechanismSectionEntity'
ON 'WaveImpactAsphaltCoverSectionResultEntity' ('FailureMechanismSectionEntityId' ASC)
;
@@ -2162,10 +2182,6 @@
ON 'MicrostabilitySectionResultEntity' ('FailureMechanismSectionEntityId' ASC)
;
-CREATE INDEX 'IXFK_WaveImpactAsphaltCoverFailureMechanismMetaEntity_FailureMechanismEntity'
- ON 'WaveImpactAsphaltCoverFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC)
-;
-
CREATE INDEX 'IXFK_PipingStructureSectionResultEntity_FailureMechanismSectionEntity'
ON 'PipingStructureSectionResultEntity' ('FailureMechanismSectionEntityId' ASC)
;
Index: Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_17.3_18.1.sql
===================================================================
diff -u -r680d50ac48c78aba5bcdb6cc459343ef6941f7a0 -r36d4b4090a4169cc8d25ede0029a3244df8fe74d
--- Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_17.3_18.1.sql (.../Migration_17.3_18.1.sql) (revision 680d50ac48c78aba5bcdb6cc459343ef6941f7a0)
+++ Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_17.3_18.1.sql (.../Migration_17.3_18.1.sql) (revision 36d4b4090a4169cc8d25ede0029a3244df8fe74d)
@@ -67,7 +67,7 @@
INSERT INTO MacroStabilityInwardsSoilProfileTwoDEntity SELECT * FROM [SOURCEPROJECT].MacroStabilityInwardsSoilProfileTwoDEntity;
INSERT INTO MacroStabilityInwardsSoilProfileTwoDSoilLayerTwoDEntity SELECT * FROM [SOURCEPROJECT].MacroStabilityInwardsSoilProfileTwoDSoilLayerTwoDEntity;
INSERT INTO MacroStabilityInwardsStochasticSoilProfileEntity SELECT * FROM [SOURCEPROJECT].MacroStabilityInwardsStochasticSoilProfileEntity;
-INSERT INTO MacrostabilityOutwardsSectionResultEntity SELECT * FROM [SOURCEPROJECT].MacrostabilityOutwardsSectionResultEntity;
+INSERT INTO MacrostabilityOutwardsSectionResultEntity SELECT * FROM [SOURCEPROJECT].MacroStabilityOutwardsSectionResultEntity;
INSERT INTO MicrostabilitySectionResultEntity SELECT * FROM [SOURCEPROJECT].MicrostabilitySectionResultEntity;
INSERT INTO PipingCalculationEntity SELECT * FROM [SOURCEPROJECT].PipingCalculationEntity;
INSERT INTO PipingCalculationOutputEntity SELECT * FROM [SOURCEPROJECT].PipingCalculationOutputEntity;
@@ -188,6 +188,16 @@
INSERT INTO WaveImpactAsphaltCoverWaveConditionsCalculationEntity SELECT * FROM [SOURCEPROJECT].WaveImpactAsphaltCoverWaveConditionsCalculationEntity;
INSERT INTO WaveImpactAsphaltCoverWaveConditionsOutputEntity SELECT * FROM [SOURCEPROJECT].WaveImpactAsphaltCoverWaveConditionsOutputEntity;
+/*
+Insert new data
+*/
+INSERT INTO MacroStabilityOutwardsFailureMechanismMetaEntity (
+ [FailureMechanismEntityId],
+ [A])
+SELECT FailureMechanismEntityId,
+ 0.033
+ FROM FailureMechanismEntity WHERE FailureMechanismType = 13;
+
/*
Write migration logging
*/
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj
===================================================================
diff -u -r2ef5183542af0464fab4ebadb3a6c2c4f7ff46b7 -r36d4b4090a4169cc8d25ede0029a3244df8fe74d
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision 2ef5183542af0464fab4ebadb3a6c2c4f7ff46b7)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision 36d4b4090a4169cc8d25ede0029a3244df8fe74d)
@@ -241,9 +241,12 @@
RingtoetsEntities.tt
-
+
RingtoetsEntities.tt
+
+ RingtoetsEntities.tt
+
RingtoetsEntities.tt
@@ -396,6 +399,7 @@
+
@@ -502,7 +506,7 @@
-
+
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/AssessmentSectionCreateExtensions.cs
===================================================================
diff -u -r2ef5183542af0464fab4ebadb3a6c2c4f7ff46b7 -r36d4b4090a4169cc8d25ede0029a3244df8fe74d
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/AssessmentSectionCreateExtensions.cs (.../AssessmentSectionCreateExtensions.cs) (revision 2ef5183542af0464fab4ebadb3a6c2c4f7ff46b7)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/AssessmentSectionCreateExtensions.cs (.../AssessmentSectionCreateExtensions.cs) (revision 36d4b4090a4169cc8d25ede0029a3244df8fe74d)
@@ -27,7 +27,7 @@
using Application.Ringtoets.Storage.Create.GrassCoverSlipOffInwards;
using Application.Ringtoets.Storage.Create.GrassCoverSlipOffOutwards;
using Application.Ringtoets.Storage.Create.HeightStructures;
-using Application.Ringtoets.Storage.Create.MacrostabilityOutwards;
+using Application.Ringtoets.Storage.Create.MacroStabilityOutwards;
using Application.Ringtoets.Storage.Create.MacroStabilityInwards;
using Application.Ringtoets.Storage.Create.Microstability;
using Application.Ringtoets.Storage.Create.Piping;
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/MacrostabilityOutwards/MacroStabilityOutwardsFailureMechanismCreateExtensions.cs
===================================================================
diff -u -r2ef5183542af0464fab4ebadb3a6c2c4f7ff46b7 -r36d4b4090a4169cc8d25ede0029a3244df8fe74d
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/MacrostabilityOutwards/MacroStabilityOutwardsFailureMechanismCreateExtensions.cs (.../MacroStabilityOutwardsFailureMechanismCreateExtensions.cs) (revision 2ef5183542af0464fab4ebadb3a6c2c4f7ff46b7)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/MacrostabilityOutwards/MacroStabilityOutwardsFailureMechanismCreateExtensions.cs (.../MacroStabilityOutwardsFailureMechanismCreateExtensions.cs) (revision 36d4b4090a4169cc8d25ede0029a3244df8fe74d)
@@ -25,7 +25,7 @@
using Ringtoets.Integration.Data.StandAlone;
using Ringtoets.Integration.Data.StandAlone.SectionResults;
-namespace Application.Ringtoets.Storage.Create.MacrostabilityOutwards
+namespace Application.Ringtoets.Storage.Create.MacroStabilityOutwards
{
///
/// Extension methods for related to creating a .
@@ -43,6 +43,7 @@
{
FailureMechanismEntity entity = mechanism.Create(FailureMechanismType.MacroStabilityOutwards, registry);
AddEntitiesForSectionResults(mechanism.SectionResults, registry);
+ AddEntitiesForFailureMechanismMeta(mechanism, entity);
return entity;
}
@@ -53,10 +54,21 @@
{
foreach (MacroStabilityOutwardsFailureMechanismSectionResult macroStabilityOutwardsFailureMechanismSectionResult in sectionResults)
{
- MacrostabilityOutwardsSectionResultEntity sectionResultEntity = macroStabilityOutwardsFailureMechanismSectionResult.Create();
+ MacroStabilityOutwardsSectionResultEntity sectionResultEntity = macroStabilityOutwardsFailureMechanismSectionResult.Create();
FailureMechanismSectionEntity section = registry.Get(macroStabilityOutwardsFailureMechanismSectionResult.Section);
- section.MacrostabilityOutwardsSectionResultEntities.Add(sectionResultEntity);
+ section.MacroStabilityOutwardsSectionResultEntities.Add(sectionResultEntity);
}
}
+
+ private static void AddEntitiesForFailureMechanismMeta(MacroStabilityOutwardsFailureMechanism mechanism,
+ FailureMechanismEntity entity)
+ {
+ var metaEntity = new MacroStabilityOutwardsFailureMechanismMetaEntity
+ {
+ A = mechanism.MacroStabilityOutwardsProbabilityAssessmentInput.A
+ };
+
+ entity.MacroStabilityOutwardsFailureMechanismMetaEntities.Add(metaEntity);
+ }
}
}
\ No newline at end of file
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/MacrostabilityOutwards/MacroStabilityOutwardsFailureMechanismSectionResultCreateExtensions.cs
===================================================================
diff -u -r2ef5183542af0464fab4ebadb3a6c2c4f7ff46b7 -r36d4b4090a4169cc8d25ede0029a3244df8fe74d
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/MacrostabilityOutwards/MacroStabilityOutwardsFailureMechanismSectionResultCreateExtensions.cs (.../MacroStabilityOutwardsFailureMechanismSectionResultCreateExtensions.cs) (revision 2ef5183542af0464fab4ebadb3a6c2c4f7ff46b7)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/MacrostabilityOutwards/MacroStabilityOutwardsFailureMechanismSectionResultCreateExtensions.cs (.../MacroStabilityOutwardsFailureMechanismSectionResultCreateExtensions.cs) (revision 36d4b4090a4169cc8d25ede0029a3244df8fe74d)
@@ -23,22 +23,22 @@
using Application.Ringtoets.Storage.DbContext;
using Ringtoets.Integration.Data.StandAlone.SectionResults;
-namespace Application.Ringtoets.Storage.Create.MacrostabilityOutwards
+namespace Application.Ringtoets.Storage.Create.MacroStabilityOutwards
{
///
/// Extension methods for related to creating a
- /// .
+ /// .
///
internal static class MacroStabilityOutwardsFailureMechanismSectionResultCreateExtensions
{
///
- /// Creates a based on the information of the .
+ /// Creates a based on the information of the .
///
/// The result to create a database entity for.
- /// A new .
- internal static MacrostabilityOutwardsSectionResultEntity Create(this MacroStabilityOutwardsFailureMechanismSectionResult result)
+ /// A new .
+ internal static MacroStabilityOutwardsSectionResultEntity Create(this MacroStabilityOutwardsFailureMechanismSectionResult result)
{
- var sectionResultEntity = new MacrostabilityOutwardsSectionResultEntity
+ var sectionResultEntity = new MacroStabilityOutwardsSectionResultEntity
{
LayerOne = Convert.ToByte(result.AssessmentLayerOne),
LayerTwoA = result.AssessmentLayerTwoA.ToNaNAsNull(),
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/FailureMechanismEntity.cs
===================================================================
diff -u -rbd21fbd130d32ac7d8f5acc37e20dc2e7fb3b6d4 -r36d4b4090a4169cc8d25ede0029a3244df8fe74d
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/FailureMechanismEntity.cs (.../FailureMechanismEntity.cs) (revision bd21fbd130d32ac7d8f5acc37e20dc2e7fb3b6d4)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/FailureMechanismEntity.cs (.../FailureMechanismEntity.cs) (revision 36d4b4090a4169cc8d25ede0029a3244df8fe74d)
@@ -51,6 +51,7 @@
HeightStructureEntities = new HashSet();
HeightStructuresFailureMechanismMetaEntities = new HashSet();
MacroStabilityInwardsFailureMechanismMetaEntities = new HashSet();
+ MacroStabilityOutwardsFailureMechanismMetaEntities = new HashSet();
PipingFailureMechanismMetaEntities = new HashSet();
StabilityPointStructureEntities = new HashSet();
StabilityPointStructuresFailureMechanismMetaEntities = new HashSet();
@@ -112,6 +113,9 @@
public virtual ICollection MacroStabilityInwardsFailureMechanismMetaEntities { get; set; }
[SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+ public virtual ICollection MacroStabilityOutwardsFailureMechanismMetaEntities { get; set; }
+
+ [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
public virtual ICollection PipingFailureMechanismMetaEntities { get; set; }
[SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/FailureMechanismSectionEntity.cs
===================================================================
diff -u -rf909c714921a6c7c24772a7510ce5ad134f70cf5 -r36d4b4090a4169cc8d25ede0029a3244df8fe74d
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/FailureMechanismSectionEntity.cs (.../FailureMechanismSectionEntity.cs) (revision f909c714921a6c7c24772a7510ce5ad134f70cf5)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/FailureMechanismSectionEntity.cs (.../FailureMechanismSectionEntity.cs) (revision 36d4b4090a4169cc8d25ede0029a3244df8fe74d)
@@ -46,7 +46,7 @@
GrassCoverSlipOffOutwardsSectionResultEntities = new HashSet();
HeightStructuresSectionResultEntities = new HashSet();
MacroStabilityInwardsSectionResultEntities = new HashSet();
- MacrostabilityOutwardsSectionResultEntities = new HashSet();
+ MacroStabilityOutwardsSectionResultEntities = new HashSet();
MicrostabilitySectionResultEntities = new HashSet();
PipingSectionResultEntities = new HashSet();
PipingStructureSectionResultEntities = new HashSet();
@@ -90,7 +90,7 @@
public virtual ICollection MacroStabilityInwardsSectionResultEntities { get; set; }
[SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
- public virtual ICollection MacrostabilityOutwardsSectionResultEntities { get; set; }
+ public virtual ICollection MacroStabilityOutwardsSectionResultEntities { get; set; }
[SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
public virtual ICollection MicrostabilitySectionResultEntities { get; set; }
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/MacroStabilityOutwardsFailureMechanismMetaEntity.cs
===================================================================
diff -u
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/MacroStabilityOutwardsFailureMechanismMetaEntity.cs (revision 0)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/MacroStabilityOutwardsFailureMechanismMetaEntity.cs (revision 36d4b4090a4169cc8d25ede0029a3244df8fe74d)
@@ -0,0 +1,41 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+//------------------------------------------------------------------------------
+//
+// This code was generated from a template.
+//
+// Manual changes to this file may cause unexpected behavior in your application.
+// Manual changes to this file will be overwritten if the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+namespace Application.Ringtoets.Storage.DbContext
+{
+ public class MacroStabilityOutwardsFailureMechanismMetaEntity
+ {
+ public long MacroStabilityOutwardsFailureMechanismMetaEntityId { get; set; }
+ public long FailureMechanismEntityId { get; set; }
+ public double A { get; set; }
+
+ public virtual FailureMechanismEntity FailureMechanismEntity { get; set; }
+ }
+}
\ No newline at end of file
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/MacroStabilityOutwardsSectionResultEntity.cs
===================================================================
diff -u
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/MacroStabilityOutwardsSectionResultEntity.cs (revision 0)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/MacroStabilityOutwardsSectionResultEntity.cs (revision 36d4b4090a4169cc8d25ede0029a3244df8fe74d)
@@ -0,0 +1,43 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+//------------------------------------------------------------------------------
+//
+// This code was generated from a template.
+//
+// Manual changes to this file may cause unexpected behavior in your application.
+// Manual changes to this file will be overwritten if the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+namespace Application.Ringtoets.Storage.DbContext
+{
+ public class MacroStabilityOutwardsSectionResultEntity
+ {
+ public long MacroStabilityOutwardsSectionResultEntityId { get; set; }
+ public long FailureMechanismSectionEntityId { get; set; }
+ public byte LayerOne { get; set; }
+ public double? LayerTwoA { get; set; }
+ public double? LayerThree { get; set; }
+
+ public virtual FailureMechanismSectionEntity FailureMechanismSectionEntity { get; set; }
+ }
+}
\ No newline at end of file
Fisheye: Tag 36d4b4090a4169cc8d25ede0029a3244df8fe74d refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/MacrostabilityOutwardsSectionResultEntity.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PartialRingtoetsEntities.cs
===================================================================
diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -r36d4b4090a4169cc8d25ede0029a3244df8fe74d
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PartialRingtoetsEntities.cs (.../PartialRingtoetsEntities.cs) (revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PartialRingtoetsEntities.cs (.../PartialRingtoetsEntities.cs) (revision 36d4b4090a4169cc8d25ede0029a3244df8fe74d)
@@ -96,7 +96,8 @@
MacroStabilityInwardsCalculationEntities.Load();
MacroStabilityInwardsCalculationOutputEntities.Load();
MacroStabilityInwardsSemiProbabilisticOutputEntities.Load();
- MacrostabilityOutwardsSectionResultEntities.Load();
+ MacroStabilityOutwardsSectionResultEntities.Load();
+ MacroStabilityOutwardsFailureMechanismMetaEntities.Load();
MicrostabilitySectionResultEntities.Load();
ProjectEntities.Load();
PipingCalculationEntities.Load();
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs
===================================================================
diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -r36d4b4090a4169cc8d25ede0029a3244df8fe74d
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs (.../RingtoetsEntities.Context.cs) (revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs (.../RingtoetsEntities.Context.cs) (revision 36d4b4090a4169cc8d25ede0029a3244df8fe74d)
@@ -35,6 +35,7 @@
{
public partial class RingtoetsEntities : System.Data.Entity.DbContext
{
+ public virtual DbSet MacroStabilityOutwardsSectionResultEntities { get; set; }
public virtual DbSet AssessmentSectionEntities { get; set; }
public virtual DbSet BackgroundDataEntities { get; set; }
public virtual DbSet BackgroundDataMetaEntities { get; set; }
@@ -90,7 +91,7 @@
public virtual DbSet MacroStabilityInwardsSoilProfileOneDEntities { get; set; }
public virtual DbSet MacroStabilityInwardsSoilProfileTwoDEntities { get; set; }
public virtual DbSet MacroStabilityInwardsStochasticSoilProfileEntities { get; set; }
- public virtual DbSet MacrostabilityOutwardsSectionResultEntities { get; set; }
+ public virtual DbSet MacroStabilityOutwardsFailureMechanismMetaEntities { get; set; }
public virtual DbSet MicrostabilitySectionResultEntities { get; set; }
public virtual DbSet PipingCalculationEntities { get; set; }
public virtual DbSet PipingCalculationOutputEntities { get; set; }
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx
===================================================================
diff -u -r680d50ac48c78aba5bcdb6cc459343ef6941f7a0 -r36d4b4090a4169cc8d25ede0029a3244df8fe74d
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 680d50ac48c78aba5bcdb6cc459343ef6941f7a0)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 36d4b4090a4169cc8d25ede0029a3244df8fe74d)
@@ -935,11 +935,19 @@
-
+
-
+
-
+
+
+
+
+
+
+
+
+
@@ -2538,14 +2546,26 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
@@ -3163,7 +3183,8 @@
-
+
+
@@ -3548,9 +3569,13 @@
-
+
+
+
+
+
-
+
@@ -3742,6 +3767,7 @@
+
@@ -3797,7 +3823,7 @@
-
+
@@ -3994,6 +4020,10 @@
+
+
+
+
@@ -4046,9 +4076,9 @@
-
+
-
+
@@ -4350,7 +4380,18 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -4651,6 +4692,7 @@
+
@@ -4676,7 +4718,7 @@
-
+
@@ -5428,16 +5470,14 @@
-
+
-
+
-
-
-
-
-
-
+
+
+
+
@@ -6538,6 +6578,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -6694,14 +6746,14 @@
-
+
-
+
-
+
@@ -7572,6 +7624,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -8517,14 +8580,12 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
@@ -9153,7 +9214,7 @@
-
+
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram
===================================================================
diff -u -r680d50ac48c78aba5bcdb6cc459343ef6941f7a0 -r36d4b4090a4169cc8d25ede0029a3244df8fe74d
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision 680d50ac48c78aba5bcdb6cc459343ef6941f7a0)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision 36d4b4090a4169cc8d25ede0029a3244df8fe74d)
@@ -4,99 +4,101 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
@@ -137,6 +139,7 @@
+
@@ -150,7 +153,6 @@
-
@@ -226,7 +228,7 @@
-
+
\ No newline at end of file
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs
===================================================================
diff -u -r2ef5183542af0464fab4ebadb3a6c2c4f7ff46b7 -r36d4b4090a4169cc8d25ede0029a3244df8fe74d
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs (.../FailureMechanismEntityReadExtensions.cs) (revision 2ef5183542af0464fab4ebadb3a6c2c4f7ff46b7)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs (.../FailureMechanismEntityReadExtensions.cs) (revision 36d4b4090a4169cc8d25ede0029a3244df8fe74d)
@@ -29,6 +29,7 @@
using Application.Ringtoets.Storage.Read.GrassCoverErosionOutwards;
using Application.Ringtoets.Storage.Read.HeightStructures;
using Application.Ringtoets.Storage.Read.MacroStabilityInwards;
+using Application.Ringtoets.Storage.Read.MacroStabilityOutwards;
using Application.Ringtoets.Storage.Read.Piping;
using Application.Ringtoets.Storage.Read.PipingStructures;
using Application.Ringtoets.Storage.Read.StabilityPointStructures;
@@ -594,14 +595,16 @@
ReadConversionCollector collector)
{
entity.ReadCommonFailureMechanismProperties(failureMechanism, collector);
- entity.ReadMacrostabilityOutwardsMechanismSectionResults(failureMechanism, collector);
+ entity.ReadMacroStabilityOutwardsMechanismSectionResults(failureMechanism, collector);
+ MacroStabilityOutwardsFailureMechanismMetaEntity metaEntity = entity.MacroStabilityOutwardsFailureMechanismMetaEntities.Single();
+ metaEntity.ReadProbabilityAssessmentInput(failureMechanism.MacroStabilityOutwardsProbabilityAssessmentInput);
}
- private static void ReadMacrostabilityOutwardsMechanismSectionResults(this FailureMechanismEntity entity,
+ private static void ReadMacroStabilityOutwardsMechanismSectionResults(this FailureMechanismEntity entity,
MacroStabilityOutwardsFailureMechanism failureMechanism,
ReadConversionCollector collector)
{
- foreach (MacrostabilityOutwardsSectionResultEntity sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.MacrostabilityOutwardsSectionResultEntities))
+ foreach (MacroStabilityOutwardsSectionResultEntity sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.MacroStabilityOutwardsSectionResultEntities))
{
FailureMechanismSection failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity);
MacroStabilityOutwardsFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection));
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/MacroStabilityOutwards/MacroStabilityOutwardsFailureMechanismMetaEntityReadExtensions.cs
===================================================================
diff -u
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/MacroStabilityOutwards/MacroStabilityOutwardsFailureMechanismMetaEntityReadExtensions.cs (revision 0)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/MacroStabilityOutwards/MacroStabilityOutwardsFailureMechanismMetaEntityReadExtensions.cs (revision 36d4b4090a4169cc8d25ede0029a3244df8fe74d)
@@ -0,0 +1,59 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using Application.Ringtoets.Storage.DbContext;
+using Ringtoets.Integration.Data.StandAlone.Input;
+
+namespace Application.Ringtoets.Storage.Read.MacroStabilityOutwards
+{
+ ///
+ /// This class defines extension methods for read operations for a
+ /// based on the .
+ ///
+ internal static class MacroStabilityOutwardsFailureMechanismMetaEntityReadExtensions
+ {
+ ///
+ /// Read the and use the information
+ /// to set properties of .
+ ///
+ /// The
+ /// to obtain properties from.
+ /// The
+ /// to set the properties of .
+ /// Thrown when any input parameter is null.
+ public static void ReadProbabilityAssessmentInput(this MacroStabilityOutwardsFailureMechanismMetaEntity entity,
+ MacroStabilityOutwardsProbabilityAssessmentInput probabilityAssessmentInput)
+ {
+ if (entity == null)
+ {
+ throw new ArgumentNullException(nameof(entity));
+ }
+
+ if (probabilityAssessmentInput == null)
+ {
+ throw new ArgumentNullException(nameof(probabilityAssessmentInput));
+ }
+
+ probabilityAssessmentInput.A = entity.A;
+ }
+ }
+}
\ No newline at end of file
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/MacroStabilityOutwards/MacroStabilityOutwardsSectionResultEntityReadExtensions.cs
===================================================================
diff -u
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/MacroStabilityOutwards/MacroStabilityOutwardsSectionResultEntityReadExtensions.cs (revision 0)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/MacroStabilityOutwards/MacroStabilityOutwardsSectionResultEntityReadExtensions.cs (revision 36d4b4090a4169cc8d25ede0029a3244df8fe74d)
@@ -0,0 +1,56 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using Application.Ringtoets.Storage.DbContext;
+using Core.Common.Base.Data;
+using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Integration.Data.StandAlone.SectionResults;
+
+namespace Application.Ringtoets.Storage.Read.MacroStabilityOutwards
+{
+ ///
+ /// This class defines extension methods for read operations for a based on the
+ /// .
+ ///
+ internal static class MacroStabilityOutwardsSectionResultEntityReadExtensions
+ {
+ ///
+ /// Reads the and use the information to update a
+ /// .
+ ///
+ /// The to create for.
+ /// The target of the read operation.
+ /// A new .
+ /// Thrown when is null.
+ internal static void Read(this MacroStabilityOutwardsSectionResultEntity entity, MacroStabilityOutwardsFailureMechanismSectionResult sectionResult)
+ {
+ if (sectionResult == null)
+ {
+ throw new ArgumentNullException(nameof(sectionResult));
+ }
+
+ sectionResult.AssessmentLayerOne = (AssessmentLayerOneState) entity.LayerOne;
+ sectionResult.AssessmentLayerTwoA = (RoundedDouble) entity.LayerTwoA.ToNullAsNaN();
+ sectionResult.AssessmentLayerThree = (RoundedDouble) entity.LayerThree.ToNullAsNaN();
+ }
+ }
+}
\ No newline at end of file
Fisheye: Tag 36d4b4090a4169cc8d25ede0029a3244df8fe74d refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/Read/MacroStabilityOutwardsSectionResultEntityReadExtensions.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Ringtoets.rtd
===================================================================
diff -u -r680d50ac48c78aba5bcdb6cc459343ef6941f7a0 -r36d4b4090a4169cc8d25ede0029a3244df8fe74d
Binary files differ
Index: Application/Ringtoets/test/Application.Ringtoets.Migration.Core.Test/test-data/FullTestProject181.rtd
===================================================================
diff -u -r7d89262d3b971dceec1e987e22d0027bf675c196 -r36d4b4090a4169cc8d25ede0029a3244df8fe74d
Binary files differ
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj
===================================================================
diff -u -r2ef5183542af0464fab4ebadb3a6c2c4f7ff46b7 -r36d4b4090a4169cc8d25ede0029a3244df8fe74d
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj (.../Application.Ringtoets.Storage.Test.csproj) (revision 2ef5183542af0464fab4ebadb3a6c2c4f7ff46b7)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj (.../Application.Ringtoets.Storage.Test.csproj) (revision 36d4b4090a4169cc8d25ede0029a3244df8fe74d)
@@ -115,6 +115,7 @@
+
@@ -162,8 +163,8 @@
-
-
+
+
@@ -227,7 +228,7 @@
-
+
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacrostabilityOutwards/MacroStabilityOutwardsFailureMechanismCreateExtensionsTest.cs
===================================================================
diff -u -r2ef5183542af0464fab4ebadb3a6c2c4f7ff46b7 -r36d4b4090a4169cc8d25ede0029a3244df8fe74d
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacrostabilityOutwards/MacroStabilityOutwardsFailureMechanismCreateExtensionsTest.cs (.../MacroStabilityOutwardsFailureMechanismCreateExtensionsTest.cs) (revision 2ef5183542af0464fab4ebadb3a6c2c4f7ff46b7)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacrostabilityOutwards/MacroStabilityOutwardsFailureMechanismCreateExtensionsTest.cs (.../MacroStabilityOutwardsFailureMechanismCreateExtensionsTest.cs) (revision 36d4b4090a4169cc8d25ede0029a3244df8fe74d)
@@ -22,13 +22,13 @@
using System;
using System.Linq;
using Application.Ringtoets.Storage.Create;
-using Application.Ringtoets.Storage.Create.MacrostabilityOutwards;
+using Application.Ringtoets.Storage.Create.MacroStabilityOutwards;
using Application.Ringtoets.Storage.DbContext;
using Application.Ringtoets.Storage.TestUtil;
using NUnit.Framework;
using Ringtoets.Integration.Data.StandAlone;
-namespace Application.Ringtoets.Storage.Test.Create.MacrostabilityOutwards
+namespace Application.Ringtoets.Storage.Test.Create.MacroStabilityOutwards
{
[TestFixture]
public class MacroStabilityOutwardsFailureMechanismCreateExtensionsTest
@@ -48,11 +48,35 @@
}
[Test]
+ public void Create_WithoutAllPropertiesSet_ReturnsFailureMechanismEntityWithPropertiesSet()
+ {
+ // Setup
+ var failureMechanism = new MacroStabilityOutwardsFailureMechanism();
+ var registry = new PersistenceRegistry();
+
+ // Call
+ FailureMechanismEntity entity = failureMechanism.Create(registry);
+
+ // Assert
+ Assert.IsNotNull(entity);
+ Assert.AreEqual((short) FailureMechanismType.MacroStabilityOutwards, entity.FailureMechanismType);
+ Assert.AreEqual(Convert.ToByte(failureMechanism.IsRelevant), entity.IsRelevant);
+ Assert.AreEqual(failureMechanism.InputComments.Body, entity.InputComments);
+ Assert.AreEqual(failureMechanism.OutputComments.Body, entity.OutputComments);
+ Assert.AreEqual(failureMechanism.NotRelevantComments.Body, entity.NotRelevantComments);
+
+ CollectionAssert.IsEmpty(entity.StochasticSoilModelEntities);
+ MacroStabilityOutwardsFailureMechanismMetaEntity failureMechanismMetaEntity = entity.MacroStabilityOutwardsFailureMechanismMetaEntities.First();
+ Assert.AreEqual(failureMechanism.MacroStabilityOutwardsProbabilityAssessmentInput.A, failureMechanismMetaEntity.A);
+ }
+
+ [Test]
[TestCase(true)]
[TestCase(false)]
public void Create_WithCollectorAndPropertiesSet_ReturnsFailureMechanismEntityWithPropertiesSet(bool isRelevant)
{
// Setup
+ var random = new Random(31);
var failureMechanism = new MacroStabilityOutwardsFailureMechanism
{
IsRelevant = isRelevant,
@@ -67,6 +91,10 @@
NotRelevantComments =
{
Body = "Really not relevant"
+ },
+ MacroStabilityOutwardsProbabilityAssessmentInput =
+ {
+ A = random.NextDouble()
}
};
var registry = new PersistenceRegistry();
@@ -81,6 +109,8 @@
Assert.AreEqual(failureMechanism.InputComments.Body, entity.InputComments);
Assert.AreEqual(failureMechanism.OutputComments.Body, entity.OutputComments);
Assert.AreEqual(failureMechanism.NotRelevantComments.Body, entity.NotRelevantComments);
+ MacroStabilityOutwardsFailureMechanismMetaEntity failureMechanismMetaEntity = entity.MacroStabilityOutwardsFailureMechanismMetaEntities.First();
+ Assert.AreEqual(failureMechanism.MacroStabilityOutwardsProbabilityAssessmentInput.A, failureMechanismMetaEntity.A);
}
[Test]
@@ -147,7 +177,7 @@
// Assert
Assert.AreEqual(1, entity.FailureMechanismSectionEntities.Count);
- Assert.AreEqual(1, entity.FailureMechanismSectionEntities.SelectMany(fms => fms.MacrostabilityOutwardsSectionResultEntities).Count());
+ Assert.AreEqual(1, entity.FailureMechanismSectionEntities.SelectMany(fms => fms.MacroStabilityOutwardsSectionResultEntities).Count());
}
}
}
\ No newline at end of file
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacrostabilityOutwards/MacroStabilityOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs
===================================================================
diff -u -r2ef5183542af0464fab4ebadb3a6c2c4f7ff46b7 -r36d4b4090a4169cc8d25ede0029a3244df8fe74d
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacrostabilityOutwards/MacroStabilityOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs (.../MacroStabilityOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs) (revision 2ef5183542af0464fab4ebadb3a6c2c4f7ff46b7)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacrostabilityOutwards/MacroStabilityOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs (.../MacroStabilityOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs) (revision 36d4b4090a4169cc8d25ede0029a3244df8fe74d)
@@ -20,7 +20,7 @@
// All rights reserved.
using System;
-using Application.Ringtoets.Storage.Create.MacrostabilityOutwards;
+using Application.Ringtoets.Storage.Create.MacroStabilityOutwards;
using Application.Ringtoets.Storage.DbContext;
using Application.Ringtoets.Storage.TestUtil;
using Core.Common.Base.Data;
@@ -29,7 +29,7 @@
using Ringtoets.Common.Data.FailureMechanism;
using Ringtoets.Integration.Data.StandAlone.SectionResults;
-namespace Application.Ringtoets.Storage.Test.Create.MacrostabilityOutwards
+namespace Application.Ringtoets.Storage.Test.Create.MacroStabilityOutwards
{
[TestFixture]
public class MacroStabilityOutwardsFailureMechanismSectionResultCreateExtensionsTest
@@ -51,7 +51,7 @@
};
// Call
- MacrostabilityOutwardsSectionResultEntity result = sectionResult.Create();
+ MacroStabilityOutwardsSectionResultEntity result = sectionResult.Create();
// Assert
Assert.AreEqual(Convert.ToByte(assessmentLayerOneResult), result.LayerOne);
@@ -69,7 +69,7 @@
};
// Call
- MacrostabilityOutwardsSectionResultEntity result = sectionResult.Create();
+ MacroStabilityOutwardsSectionResultEntity result = sectionResult.Create();
// Assert
Assert.IsNull(result.LayerTwoA);
@@ -85,7 +85,7 @@
};
// Call
- MacrostabilityOutwardsSectionResultEntity result = sectionResult.Create();
+ MacroStabilityOutwardsSectionResultEntity result = sectionResult.Create();
// Assert
Assert.IsNull(result.LayerThree);
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo181IntegrationTest.cs
===================================================================
diff -u -r680d50ac48c78aba5bcdb6cc459343ef6941f7a0 -r36d4b4090a4169cc8d25ede0029a3244df8fe74d
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo181IntegrationTest.cs (.../MigrationTo181IntegrationTest.cs) (revision 680d50ac48c78aba5bcdb6cc459343ef6941f7a0)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo181IntegrationTest.cs (.../MigrationTo181IntegrationTest.cs) (revision 36d4b4090a4169cc8d25ede0029a3244df8fe74d)
@@ -63,6 +63,7 @@
AssertPipingSoilLayers(reader);
AssertHydraRingPreprocessor(reader);
AssertStabilityStoneCoverFailureMechanism(reader);
+ AssertMacroStabilityOutwardsFailureMechanism(reader);
}
AssertLogDatabase(logFilePath);
@@ -133,7 +134,7 @@
"MacroStabilityInwardsSoilProfileTwoDEntity",
"MacroStabilityInwardsSoilProfileTwoDSoilLayerTwoDEntity",
"MacroStabilityInwardsStochasticSoilProfileEntity",
- "MacrostabilityOutwardsSectionResultEntity",
+ "MacroStabilityOutwardsSectionResultEntity",
"MicrostabilitySectionResultEntity",
"PipingCalculationEntity",
"PipingCalculationOutputEntity",
@@ -280,5 +281,16 @@
"WHERE [N] IS NOT 4;";
reader.AssertReturnedDataIsValid(validateStabilityStoneCoverFailureMechanism);
}
+
+ private static void AssertMacroStabilityOutwardsFailureMechanism(MigratedDatabaseReader reader)
+ {
+ const string validateFailureMechanisms =
+ "SELECT COUNT() = (SELECT COUNT() FROM FailureMechanismEntity WHERE FailureMechanismType = 13) " +
+ "FROM [MacroStabilityOutwardsFailureMechanismMetaEntity] " +
+ "WHERE [A] = 0.033 " +
+ "AND [FailureMechanismEntityId] IN " +
+ "(SELECT [FailureMechanismEntityId] FROM [FailureMechanismEntity] WHERE [FailureMechanismType] = 13);";
+ reader.AssertReturnedDataIsValid(validateFailureMechanisms);
+ }
}
}
\ No newline at end of file
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs
===================================================================
diff -u -r2ef5183542af0464fab4ebadb3a6c2c4f7ff46b7 -r36d4b4090a4169cc8d25ede0029a3244df8fe74d
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs (.../AssessmentSectionEntityReadExtensionsTest.cs) (revision 2ef5183542af0464fab4ebadb3a6c2c4f7ff46b7)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs (.../AssessmentSectionEntityReadExtensionsTest.cs) (revision 36d4b4090a4169cc8d25ede0029a3244df8fe74d)
@@ -39,6 +39,7 @@
using Ringtoets.Common.Data.Hydraulics;
using Ringtoets.Common.Data.TestUtil;
using Ringtoets.Integration.Data;
+using Ringtoets.Integration.Data.StandAlone.Input;
using Ringtoets.MacroStabilityInwards.Data;
namespace Application.Ringtoets.Storage.Test.Read
@@ -701,6 +702,53 @@
}
[Test]
+ public void Read_WithMacroStabilityOutwardsFailureMechanismProperties_ReturnsNewAssessmentSectionWithPropertiesInMacroStabilityInwardsFailureMechanism()
+ {
+ // Setup
+ AssessmentSectionEntity entity = CreateAssessmentSectionEntity();
+ var random = new Random(21);
+ bool isRelevant = random.NextBoolean();
+ double parameterA = random.NextDouble();
+ const string inputComments = "Some input text";
+ const string outputComments = "Some output text";
+ const string notRelevantComments = "Really not relevant";
+
+ var failureMechanismEntity = new FailureMechanismEntity
+ {
+ FailureMechanismType = (int) FailureMechanismType.MacroStabilityOutwards,
+ CalculationGroupEntity = new CalculationGroupEntity(),
+ IsRelevant = Convert.ToByte(isRelevant),
+ InputComments = inputComments,
+ OutputComments = outputComments,
+ NotRelevantComments = notRelevantComments,
+ MacroStabilityOutwardsFailureMechanismMetaEntities =
+ {
+ new MacroStabilityOutwardsFailureMechanismMetaEntity
+ {
+ A = parameterA
+ }
+ }
+ };
+ entity.FailureMechanismEntities.Add(failureMechanismEntity);
+ entity.BackgroundDataEntities.Add(CreateBackgroundDataEntity());
+
+ var collector = new ReadConversionCollector();
+
+ // Call
+ AssessmentSection section = entity.Read(collector);
+
+ // Assert
+ Assert.AreEqual(isRelevant, section.MacroStabilityOutwards.IsRelevant);
+ Assert.AreEqual(inputComments, section.MacroStabilityOutwards.InputComments.Body);
+ Assert.AreEqual(outputComments, section.MacroStabilityOutwards.OutputComments.Body);
+ Assert.AreEqual(notRelevantComments, section.MacroStabilityOutwards.NotRelevantComments.Body);
+
+ MacroStabilityOutwardsProbabilityAssessmentInput probabilityAssessmentInput = section.MacroStabilityOutwards
+ .MacroStabilityOutwardsProbabilityAssessmentInput;
+ Assert.AreEqual(parameterA, probabilityAssessmentInput.A);
+ }
+
+ [Test]
[TestCase(true)]
[TestCase(false)]
public void Read_WithGrassCoverErosionInwardsWithProperties_ReturnsGrassCoverErosionInwardsWithProperties(bool isRelevant)
@@ -1449,17 +1497,13 @@
var random = new Random(31);
AssessmentSectionEntity entity = CreateAssessmentSectionEntity();
- bool macrostabilityOutwardsIsRelevant = random.NextBoolean();
bool microstabilityIsRelevant = random.NextBoolean();
bool strengthAndStabilityParallelConstructionIsRelevant = random.NextBoolean();
bool waterOverpressureAsphaltRevetmentIsRelevant = random.NextBoolean();
bool grassRevetmentSlidingOutwardsIsRelevant = random.NextBoolean();
bool grassRevetmentSlidingInwardsIsRelevant = random.NextBoolean();
bool technicalInnovationsIsRelevant = random.NextBoolean();
- FailureMechanismEntity macrostabilityOutwards = CreateFailureMechanismEntity(
- macrostabilityOutwardsIsRelevant,
- FailureMechanismType.MacroStabilityOutwards);
FailureMechanismEntity microstability = CreateFailureMechanismEntity(
microstabilityIsRelevant,
FailureMechanismType.Microstability);
@@ -1479,7 +1523,6 @@
technicalInnovationsIsRelevant,
FailureMechanismType.TechnicalInnovations);
- entity.FailureMechanismEntities.Add(macrostabilityOutwards);
entity.FailureMechanismEntities.Add(microstability);
entity.FailureMechanismEntities.Add(strengthAndStabilityParallelConstruction);
entity.FailureMechanismEntities.Add(waterOverpressureAsphaltRevetment);
@@ -1494,12 +1537,6 @@
AssessmentSection section = entity.Read(collector);
// Assert
- AssertFailureMechanismEqual(macrostabilityOutwardsIsRelevant,
- 2,
- macrostabilityOutwards.InputComments,
- macrostabilityOutwards.OutputComments,
- macrostabilityOutwards.NotRelevantComments,
- section.MacroStabilityOutwards);
AssertFailureMechanismEqual(microstabilityIsRelevant,
2,
microstability.InputComments,
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/MacroStabilityOutwards/MacroStabilityOutwardsFailureMechanismMetaEntityReadExtensionsTest.cs
===================================================================
diff -u
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/MacroStabilityOutwards/MacroStabilityOutwardsFailureMechanismMetaEntityReadExtensionsTest.cs (revision 0)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/MacroStabilityOutwards/MacroStabilityOutwardsFailureMechanismMetaEntityReadExtensionsTest.cs (revision 36d4b4090a4169cc8d25ede0029a3244df8fe74d)
@@ -0,0 +1,79 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using Application.Ringtoets.Storage.DbContext;
+using Application.Ringtoets.Storage.Read.MacroStabilityOutwards;
+using NUnit.Framework;
+using Ringtoets.Integration.Data.StandAlone.Input;
+
+namespace Application.Ringtoets.Storage.Test.Read.MacroStabilityOutwards
+{
+ [TestFixture]
+ public class MacroStabilityOutwardsFailureMechanismMetaEntityReadExtensionsTest
+ {
+ [Test]
+ public void ReadMacroStabilityOutwardsProbabilityAssessmentInput_EntityNull_ThrowsArgumentNullException()
+ {
+ // Setup
+ var input = new MacroStabilityOutwardsProbabilityAssessmentInput();
+
+ // Call
+ TestDelegate test = () => ((MacroStabilityOutwardsFailureMechanismMetaEntity) null).ReadProbabilityAssessmentInput(input);
+
+ // Assert
+ var exception = Assert.Throws(test);
+ Assert.AreEqual("entity", exception.ParamName);
+ }
+
+ [Test]
+ public void ReadMacroStabilityOutwardsProbabilityAssessmentInput_MacroStabilityOutwardsProbabilityAssessmentInputNull_ThrowsArgumentNullException()
+ {
+ // Setup
+ var entity = new MacroStabilityOutwardsFailureMechanismMetaEntity();
+
+ // Call
+ TestDelegate test = () => entity.ReadProbabilityAssessmentInput(null);
+
+ // Assert
+ var exception = Assert.Throws(test);
+ Assert.AreEqual("probabilityAssessmentInput", exception.ParamName);
+ }
+
+ [Test]
+ public void ReadMacroStabilityOutwardsProbabilityAssessmentInput_ValidParameters_SetMacroStabilityOutwardsProbabilityAssessmentInputProperties()
+ {
+ // Setup
+ var random = new Random(31);
+ var entity = new MacroStabilityOutwardsFailureMechanismMetaEntity
+ {
+ A = random.NextDouble()
+ };
+ var input = new MacroStabilityOutwardsProbabilityAssessmentInput();
+
+ // Call
+ entity.ReadProbabilityAssessmentInput(input);
+
+ // Assert
+ Assert.AreEqual(entity.A, input.A);
+ }
+ }
+}
\ No newline at end of file
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/MacroStabilityOutwards/MacroStabilityOutwardsSectionResultEntityReadExtensionsTest.cs
===================================================================
diff -u
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/MacroStabilityOutwards/MacroStabilityOutwardsSectionResultEntityReadExtensionsTest.cs (revision 0)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/MacroStabilityOutwards/MacroStabilityOutwardsSectionResultEntityReadExtensionsTest.cs (revision 36d4b4090a4169cc8d25ede0029a3244df8fe74d)
@@ -0,0 +1,83 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using Application.Ringtoets.Storage.DbContext;
+using Application.Ringtoets.Storage.Read.MacroStabilityOutwards;
+using Application.Ringtoets.Storage.Read;
+using Application.Ringtoets.Storage.TestUtil;
+using NUnit.Framework;
+using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Integration.Data.StandAlone.SectionResults;
+
+namespace Application.Ringtoets.Storage.Test.Read.MacroStabilityOutwards
+{
+ [TestFixture]
+ public class MacroStabilityOutwardsSectionResultEntityReadExtensionsTest
+ {
+ [Test]
+ public void Read_SectionResultIsNull_ThrowArgumentNullException()
+ {
+ // Setup
+ var entity = new MacroStabilityOutwardsSectionResultEntity();
+
+ // Call
+ TestDelegate call = () => entity.Read(null);
+
+ // Assert
+ string paramName = Assert.Throws(call).ParamName;
+ Assert.AreEqual("sectionResult", paramName);
+ }
+
+ [Test]
+ [Combinatorial]
+ public void Read_ParameterValues_SectionResultWithParameterValues(
+ [Values(AssessmentLayerOneState.NotAssessed, AssessmentLayerOneState.NoVerdict,
+ AssessmentLayerOneState.Sufficient)]
+ AssessmentLayerOneState layerOne,
+ [Values(0.1, 0.2, null)] double? layerTwoA,
+ [Values(0.11, 0.22, null)] double? layerThree)
+ {
+ // Setup
+ var collector = new ReadConversionCollector();
+
+ var failureMechanismSectionEntity = new FailureMechanismSectionEntity();
+ collector.Read(failureMechanismSectionEntity, new TestFailureMechanismSection());
+ var entity = new MacroStabilityOutwardsSectionResultEntity
+ {
+ LayerThree = layerThree,
+ LayerTwoA = layerTwoA,
+ LayerOne = Convert.ToByte(layerOne),
+ FailureMechanismSectionEntity = failureMechanismSectionEntity
+ };
+ var sectionResult = new MacroStabilityOutwardsFailureMechanismSectionResult(new TestFailureMechanismSection());
+
+ // Call
+ entity.Read(sectionResult);
+
+ // Assert
+ Assert.IsNotNull(sectionResult);
+ Assert.AreEqual(layerOne, sectionResult.AssessmentLayerOne);
+ Assert.AreEqual(layerTwoA ?? double.NaN, sectionResult.AssessmentLayerTwoA, 1e-6);
+ Assert.AreEqual(layerThree ?? double.NaN, sectionResult.AssessmentLayerThree, 1e-6);
+ }
+ }
+}
\ No newline at end of file
Fisheye: Tag 36d4b4090a4169cc8d25ede0029a3244df8fe74d refers to a dead (removed) revision in file `Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/MacroStabilityOutwardsSectionResultEntityReadExtensionsTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/Properties/Resources.Designer.cs
===================================================================
diff -u -reb7ec35fde1008ba7e90ae4a11fee8695ba00d03 -r36d4b4090a4169cc8d25ede0029a3244df8fe74d
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision eb7ec35fde1008ba7e90ae4a11fee8695ba00d03)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 36d4b4090a4169cc8d25ede0029a3244df8fe74d)
@@ -40,7 +40,7 @@
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
public class Resources {
@@ -147,18 +147,18 @@
///
/// Looks up a localized string similar to STBU.
///
- public static string MacrostabilityOutwardFailureMechanism_Code {
+ public static string MacroStabilityOutwardsFailureMechanism_Code {
get {
- return ResourceManager.GetString("MacrostabilityOutwardFailureMechanism_Code", resourceCulture);
+ return ResourceManager.GetString("MacroStabilityOutwardsFailureMechanism_Code", resourceCulture);
}
}
///
/// Looks up a localized string similar to Dijken en dammen - Macrostabiliteit buitenwaarts.
///
- public static string MacrostabilityOutwardFailureMechanism_DisplayName {
+ public static string MacroStabilityOutwardsFailureMechanism_DisplayName {
get {
- return ResourceManager.GetString("MacrostabilityOutwardFailureMechanism_DisplayName", resourceCulture);
+ return ResourceManager.GetString("MacroStabilityOutwardsFailureMechanism_DisplayName", resourceCulture);
}
}
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/Properties/Resources.resx
===================================================================
diff -u -reb7ec35fde1008ba7e90ae4a11fee8695ba00d03 -r36d4b4090a4169cc8d25ede0029a3244df8fe74d
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/Properties/Resources.resx (.../Resources.resx) (revision eb7ec35fde1008ba7e90ae4a11fee8695ba00d03)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/Properties/Resources.resx (.../Resources.resx) (revision 36d4b4090a4169cc8d25ede0029a3244df8fe74d)
@@ -141,10 +141,10 @@
Dijken en dammen - Grasbekleding afschuiven binnentalud
-
+
STBU
-
+
Dijken en dammen - Macrostabiliteit buitenwaarts
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/MacroStabilityOutwardsFailureMechanism.cs
===================================================================
diff -u -r2ef5183542af0464fab4ebadb3a6c2c4f7ff46b7 -r36d4b4090a4169cc8d25ede0029a3244df8fe74d
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/MacroStabilityOutwardsFailureMechanism.cs (.../MacroStabilityOutwardsFailureMechanism.cs) (revision 2ef5183542af0464fab4ebadb3a6c2c4f7ff46b7)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/MacroStabilityOutwardsFailureMechanism.cs (.../MacroStabilityOutwardsFailureMechanism.cs) (revision 36d4b4090a4169cc8d25ede0029a3244df8fe74d)
@@ -40,7 +40,7 @@
/// Initializes a new instance of the class.
///
public MacroStabilityOutwardsFailureMechanism()
- : base(Resources.MacrostabilityOutwardFailureMechanism_DisplayName, Resources.MacrostabilityOutwardFailureMechanism_Code)
+ : base(Resources.MacroStabilityOutwardsFailureMechanism_DisplayName, Resources.MacroStabilityOutwardsFailureMechanism_Code)
{
sectionResults = new List();
MacroStabilityOutwardsProbabilityAssessmentInput = new MacroStabilityOutwardsProbabilityAssessmentInput();
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs
===================================================================
diff -u -r2ef5183542af0464fab4ebadb3a6c2c4f7ff46b7 -r36d4b4090a4169cc8d25ede0029a3244df8fe74d
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs (.../RingtoetsPluginTest.cs) (revision 2ef5183542af0464fab4ebadb3a6c2c4f7ff46b7)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs (.../RingtoetsPluginTest.cs) (revision 36d4b4090a4169cc8d25ede0029a3244df8fe74d)
@@ -53,6 +53,7 @@
using Ringtoets.Integration.Data;
using Ringtoets.Integration.Data.StandAlone.SectionResults;
using Ringtoets.Integration.Forms.PresentationObjects;
+using Ringtoets.Integration.Forms.PresentationObjects.StandAlone;
using Ringtoets.Integration.Forms.PropertyClasses;
using Ringtoets.Integration.Forms.Views;
using Ringtoets.Integration.Forms.Views.SectionResultViews;
@@ -221,7 +222,7 @@
PropertyInfo[] propertyInfos = plugin.GetPropertyInfos().ToArray();
// Assert
- Assert.AreEqual(21, propertyInfos.Length);
+ Assert.AreEqual(22, propertyInfos.Length);
PluginTestHelper.AssertPropertyInfoDefined(
propertyInfos,
@@ -255,6 +256,11 @@
PluginTestHelper.AssertPropertyInfoDefined(
propertyInfos,
+ typeof(MacroStabilityOutwardsFailureMechanismContext),
+ typeof(MacroStabilityOutwardsFailureMechanismProperties));
+
+ PluginTestHelper.AssertPropertyInfoDefined(
+ propertyInfos,
typeof(ICalculationContext),
typeof(CalculationGroupContextProperties));
@@ -469,11 +475,12 @@
TreeNodeInfo[] treeNodeInfos = plugin.GetTreeNodeInfos().ToArray();
// Assert
- Assert.AreEqual(25, treeNodeInfos.Length);
+ Assert.AreEqual(26, treeNodeInfos.Length);
Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(AssessmentSection)));
Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(BackgroundData)));
Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(ReferenceLineContext)));
Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(FailureMechanismContext)));
+ Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(MacroStabilityOutwardsFailureMechanismContext)));
Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(CategoryTreeFolder)));
Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(FailureMechanismSectionsContext)));
Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(FailureMechanismContributionContext)));
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs
===================================================================
diff -u -r2ef5183542af0464fab4ebadb3a6c2c4f7ff46b7 -r36d4b4090a4169cc8d25ede0029a3244df8fe74d
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs (.../AssessmentSectionTreeNodeInfoTest.cs) (revision 2ef5183542af0464fab4ebadb3a6c2c4f7ff46b7)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs (.../AssessmentSectionTreeNodeInfoTest.cs) (revision 36d4b4090a4169cc8d25ede0029a3244df8fe74d)
@@ -39,6 +39,7 @@
using Ringtoets.HeightStructures.Forms.PresentationObjects;
using Ringtoets.Integration.Data;
using Ringtoets.Integration.Forms.PresentationObjects;
+using Ringtoets.Integration.Forms.PresentationObjects.StandAlone;
using Ringtoets.MacroStabilityInwards.Forms.PresentationObjects;
using Ringtoets.Piping.Forms.PresentationObjects;
using Ringtoets.StabilityPointStructures.Forms.PresentationObjects;
@@ -210,9 +211,11 @@
var macroStabilityInwardsFailureMechanismContext = (MacroStabilityInwardsFailureMechanismContext) objects[7];
Assert.AreSame(assessmentSection.MacroStabilityInwards, macroStabilityInwardsFailureMechanismContext.WrappedData);
Assert.AreSame(assessmentSection, macroStabilityInwardsFailureMechanismContext.Parent);
- var macrostabilityOutwardsFailureMechanismContext = (FailureMechanismContext) objects[8];
+
+ var macrostabilityOutwardsFailureMechanismContext = (MacroStabilityOutwardsFailureMechanismContext) objects[8];
Assert.AreSame(assessmentSection.MacroStabilityOutwards, macrostabilityOutwardsFailureMechanismContext.WrappedData);
Assert.AreSame(assessmentSection, macrostabilityOutwardsFailureMechanismContext.Parent);
+
var microstabilityFailureMechanismContext = (FailureMechanismContext) objects[9];
Assert.AreSame(assessmentSection.Microstability, microstabilityFailureMechanismContext.WrappedData);
Assert.AreSame(assessmentSection, microstabilityFailureMechanismContext.Parent);
@@ -247,18 +250,23 @@
var closingStructuresFailureMechanismContext = (ClosingStructuresFailureMechanismContext) objects[17];
Assert.AreSame(assessmentSection.ClosingStructures, closingStructuresFailureMechanismContext.WrappedData);
Assert.AreSame(assessmentSection, closingStructuresFailureMechanismContext.Parent);
+
var pipingStructureFailureMechanismContext = (FailureMechanismContext) objects[18];
Assert.AreSame(assessmentSection.PipingStructure, pipingStructureFailureMechanismContext.WrappedData);
Assert.AreSame(assessmentSection, pipingStructureFailureMechanismContext.Parent);
+
var stabilityPointStructuresFailureMechanismContext = (StabilityPointStructuresFailureMechanismContext) objects[19];
Assert.AreSame(assessmentSection.StabilityPointStructures, stabilityPointStructuresFailureMechanismContext.WrappedData);
Assert.AreSame(assessmentSection, stabilityPointStructuresFailureMechanismContext.Parent);
+
var strengthStabilityLengthwiseConstructionFailureMechanismContext = (FailureMechanismContext) objects[20];
Assert.AreSame(assessmentSection.StrengthStabilityLengthwiseConstruction, strengthStabilityLengthwiseConstructionFailureMechanismContext.WrappedData);
Assert.AreSame(assessmentSection, strengthStabilityLengthwiseConstructionFailureMechanismContext.Parent);
+
var duneErosionFailureMechanismContext = (DuneErosionFailureMechanismContext) objects[21];
Assert.AreSame(assessmentSection.DuneErosion, duneErosionFailureMechanismContext.WrappedData);
Assert.AreSame(assessmentSection, duneErosionFailureMechanismContext.Parent);
+
var technicalInnovationFailureMechanismContext = (FailureMechanismContext) objects[22];
Assert.AreSame(assessmentSection.TechnicalInnovation, technicalInnovationFailureMechanismContext.WrappedData);
Assert.AreSame(assessmentSection, technicalInnovationFailureMechanismContext.Parent);
Index: build/DatabaseStructure.sql
===================================================================
diff -u -r680d50ac48c78aba5bcdb6cc459343ef6941f7a0 -r36d4b4090a4169cc8d25ede0029a3244df8fe74d
--- build/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 680d50ac48c78aba5bcdb6cc459343ef6941f7a0)
+++ build/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 36d4b4090a4169cc8d25ede0029a3244df8fe74d)
@@ -1,6 +1,6 @@
/* ---------------------------------------------------- */
/* Generated by Enterprise Architect Version 12.0 */
-/* Created On : 25-jan-2018 16:07:42 */
+/* Created On : 26-jan-2018 15:38:38 */
/* DBMS : SQLite */
/* ---------------------------------------------------- */
@@ -21,30 +21,30 @@
DROP TABLE IF EXISTS 'AssessmentSectionEntity'
;
-DROP TABLE IF EXISTS 'FailureMechanismSectionEntity'
+DROP TABLE IF EXISTS 'MacroStabilityOutwardsFailureMechanismMetaEntity'
;
-DROP TABLE IF EXISTS 'StabilityPointStructuresCalculationEntity'
+DROP TABLE IF EXISTS 'FailureMechanismSectionEntity'
;
DROP TABLE IF EXISTS 'FailureMechanismEntity'
;
-DROP TABLE IF EXISTS 'PipingFailureMechanismMetaEntity'
+DROP TABLE IF EXISTS 'StabilityPointStructuresCalculationEntity'
;
DROP TABLE IF EXISTS 'ClosingStructuresFailureMechanismMetaEntity'
;
+DROP TABLE IF EXISTS 'PipingFailureMechanismMetaEntity'
+;
+
DROP TABLE IF EXISTS 'StabilityStoneCoverFailureMechanismMetaEntity'
;
DROP TABLE IF EXISTS 'CalculationGroupEntity'
;
-DROP TABLE IF EXISTS 'StabilityPointStructuresFailureMechanismMetaEntity'
-;
-
DROP TABLE IF EXISTS 'HydraulicLocationEntity'
;
@@ -54,13 +54,13 @@
DROP TABLE IF EXISTS 'GrassCoverErosionInwardsFailureMechanismMetaEntity'
;
-DROP TABLE IF EXISTS 'DuneErosionFailureMechanismMetaEntity'
+DROP TABLE IF EXISTS 'StabilityPointStructuresFailureMechanismMetaEntity'
;
DROP TABLE IF EXISTS 'GrassCoverErosionInwardsCalculationEntity'
;
-DROP TABLE IF EXISTS 'HeightStructuresFailureMechanismMetaEntity'
+DROP TABLE IF EXISTS 'DuneErosionFailureMechanismMetaEntity'
;
DROP TABLE IF EXISTS 'GrassCoverErosionOutwardsFailureMechanismMetaEntity'
@@ -69,6 +69,9 @@
DROP TABLE IF EXISTS 'PipingSoilLayerEntity'
;
+DROP TABLE IF EXISTS 'HeightStructuresFailureMechanismMetaEntity'
+;
+
DROP TABLE IF EXISTS 'PipingSoilProfileEntity'
;
@@ -123,18 +126,18 @@
DROP TABLE IF EXISTS 'MacroStabilityInwardsSectionResultEntity'
;
-DROP TABLE IF EXISTS 'MacrostabilityOutwardsSectionResultEntity'
+DROP TABLE IF EXISTS 'MacroStabilityOutwardsSectionResultEntity'
;
+DROP TABLE IF EXISTS 'WaveImpactAsphaltCoverFailureMechanismMetaEntity'
+;
+
DROP TABLE IF EXISTS 'WaveImpactAsphaltCoverSectionResultEntity'
;
DROP TABLE IF EXISTS 'MicrostabilitySectionResultEntity'
;
-DROP TABLE IF EXISTS 'WaveImpactAsphaltCoverFailureMechanismMetaEntity'
-;
-
DROP TABLE IF EXISTS 'PipingStructureSectionResultEntity'
;
@@ -362,6 +365,15 @@
)
;
+CREATE TABLE 'MacroStabilityOutwardsFailureMechanismMetaEntity'
+(
+ 'MacroStabilityOutwardsFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+ 'FailureMechanismEntityId' INTEGER NOT NULL,
+ 'A' REAL NOT NULL,
+ CONSTRAINT 'FK_MacroStabilityOutwardsFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade
+)
+;
+
CREATE TABLE 'FailureMechanismSectionEntity'
(
'FailureMechanismSectionEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
@@ -372,6 +384,22 @@
)
;
+CREATE TABLE 'FailureMechanismEntity'
+(
+ 'FailureMechanismEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+ 'AssessmentSectionEntityId' INTEGER NOT NULL,
+ 'CalculationGroupEntityId' INTEGER,
+ '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
+ 'IsRelevant' TINYINT (1) NOT NULL, -- true or false
+ 'InputComments' TEXT,
+ 'OutputComments' TEXT,
+ 'NotRelevantComments' TEXT,
+ CONSTRAINT 'FK_FailureMechanismEntity_AssessmentSectionEntity' FOREIGN KEY ('AssessmentSectionEntityId') REFERENCES 'AssessmentSectionEntity' ('AssessmentSectionEntityId') ON DELETE Cascade ON UPDATE Cascade,
+ CONSTRAINT 'FK_FailureMechanismEntity_CalculationGroupEntity' FOREIGN KEY ('CalculationGroupEntityId') REFERENCES 'CalculationGroupEntity' ('CalculationGroupEntityId') ON DELETE Cascade ON UPDATE Cascade,
+ CONSTRAINT 'UI_AssessmentSectionEntityId_FailureMechanismType' UNIQUE ('AssessmentSectionEntityId','FailureMechanismType')
+)
+;
+
CREATE TABLE 'StabilityPointStructuresCalculationEntity'
(
'StabilityPointStructuresCalculationEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
@@ -445,19 +473,14 @@
)
;
-CREATE TABLE 'FailureMechanismEntity'
+CREATE TABLE 'ClosingStructuresFailureMechanismMetaEntity'
(
- 'FailureMechanismEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
- 'AssessmentSectionEntityId' INTEGER NOT NULL,
- 'CalculationGroupEntityId' INTEGER,
- '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
- 'IsRelevant' TINYINT (1) NOT NULL, -- true or false
- 'InputComments' TEXT,
- 'OutputComments' TEXT,
- 'NotRelevantComments' TEXT,
- CONSTRAINT 'FK_FailureMechanismEntity_AssessmentSectionEntity' FOREIGN KEY ('AssessmentSectionEntityId') REFERENCES 'AssessmentSectionEntity' ('AssessmentSectionEntityId') ON DELETE Cascade ON UPDATE Cascade,
- CONSTRAINT 'FK_FailureMechanismEntity_CalculationGroupEntity' FOREIGN KEY ('CalculationGroupEntityId') REFERENCES 'CalculationGroupEntity' ('CalculationGroupEntityId') ON DELETE Cascade ON UPDATE Cascade,
- CONSTRAINT 'UI_AssessmentSectionEntityId_FailureMechanismType' UNIQUE ('AssessmentSectionEntityId','FailureMechanismType')
+ 'ClosingStructuresFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+ 'FailureMechanismEntityId' INTEGER NOT NULL,
+ 'N2A' INT (4) NOT NULL,
+ 'ClosingStructureCollectionSourcePath' TEXT,
+ 'ForeshoreProfileCollectionSourcePath' TEXT,
+ CONSTRAINT 'FK_ClosingStructuresFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade
)
;
@@ -473,17 +496,6 @@
)
;
-CREATE TABLE 'ClosingStructuresFailureMechanismMetaEntity'
-(
- 'ClosingStructuresFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
- 'FailureMechanismEntityId' INTEGER NOT NULL,
- 'N2A' INT (4) NOT NULL,
- 'ClosingStructureCollectionSourcePath' TEXT,
- 'ForeshoreProfileCollectionSourcePath' TEXT,
- CONSTRAINT 'FK_ClosingStructuresFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade
-)
-;
-
CREATE TABLE 'StabilityStoneCoverFailureMechanismMetaEntity'
(
'StabilityStoneCoverFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
@@ -504,17 +516,6 @@
)
;
-CREATE TABLE 'StabilityPointStructuresFailureMechanismMetaEntity'
-(
- 'StabilityPointStructuresFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
- 'FailureMechanismEntityId' INTEGER NOT NULL,
- 'N' REAL NOT NULL,
- 'ForeshoreProfileCollectionSourcePath' TEXT,
- 'StabilityPointStructureCollectionSourcePath' TEXT,
- CONSTRAINT 'FK_StrengthStabilityPointConstructionFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade
-)
-;
-
CREATE TABLE 'HydraulicLocationEntity'
(
'HydraulicLocationEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
@@ -567,12 +568,14 @@
)
;
-CREATE TABLE 'DuneErosionFailureMechanismMetaEntity'
+CREATE TABLE 'StabilityPointStructuresFailureMechanismMetaEntity'
(
- 'DuneErosionFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+ 'StabilityPointStructuresFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
'FailureMechanismEntityId' INTEGER NOT NULL,
'N' REAL NOT NULL,
- CONSTRAINT 'FK_DuneErosionFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade
+ 'ForeshoreProfileCollectionSourcePath' TEXT,
+ 'StabilityPointStructureCollectionSourcePath' TEXT,
+ CONSTRAINT 'FK_StrengthStabilityPointConstructionFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade
)
;
@@ -604,14 +607,12 @@
)
;
-CREATE TABLE 'HeightStructuresFailureMechanismMetaEntity'
+CREATE TABLE 'DuneErosionFailureMechanismMetaEntity'
(
- 'HeightStructuresFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+ 'DuneErosionFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
'FailureMechanismEntityId' INTEGER NOT NULL,
'N' REAL NOT NULL,
- 'HeightStructureCollectionSourcePath' TEXT,
- 'ForeshoreProfileCollectionSourcePath' TEXT,
- CONSTRAINT 'FK_HeightStructuresFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade
+ CONSTRAINT 'FK_DuneErosionFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade
)
;
@@ -645,6 +646,17 @@
)
;
+CREATE TABLE 'HeightStructuresFailureMechanismMetaEntity'
+(
+ 'HeightStructuresFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+ 'FailureMechanismEntityId' INTEGER NOT NULL,
+ 'N' REAL NOT NULL,
+ 'HeightStructureCollectionSourcePath' TEXT,
+ 'ForeshoreProfileCollectionSourcePath' TEXT,
+ CONSTRAINT 'FK_HeightStructuresFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade
+)
+;
+
CREATE TABLE 'PipingSoilProfileEntity'
(
'PipingSoilProfileEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
@@ -868,17 +880,26 @@
)
;
-CREATE TABLE 'MacrostabilityOutwardsSectionResultEntity'
+CREATE TABLE 'MacroStabilityOutwardsSectionResultEntity'
(
- 'MacrostabilityOutwardsSectionResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+ 'MacroStabilityOutwardsSectionResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
'FailureMechanismSectionEntityId' INTEGER NOT NULL,
'LayerOne' TINYINT (1) NOT NULL, -- Enum: 1 = NotAssessed, 2 = Sufficient, 3 = NoVerdict
'LayerTwoA' REAL,
'LayerThree' REAL,
- CONSTRAINT 'FK_MacrostabilityOutwardsSectionResultEntity_FailureMechanismSectionEntity' FOREIGN KEY ('FailureMechanismSectionEntityId') REFERENCES 'FailureMechanismSectionEntity' ('FailureMechanismSectionEntityId') ON DELETE Cascade ON UPDATE Cascade
+ CONSTRAINT 'FK_MacroStabilityOutwardsSectionResultEntity_FailureMechanismSectionEntity' FOREIGN KEY ('FailureMechanismSectionEntityId') REFERENCES 'FailureMechanismSectionEntity' ('FailureMechanismSectionEntityId') ON DELETE Cascade ON UPDATE Cascade
)
;
+CREATE TABLE 'WaveImpactAsphaltCoverFailureMechanismMetaEntity'
+(
+ 'WaveImpactAsphaltCoverFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+ 'FailureMechanismEntityId' INTEGER NOT NULL,
+ 'ForeshoreProfileCollectionSourcePath' TEXT,
+ CONSTRAINT 'FK_WaveImpactAsphaltCoverFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade
+)
+;
+
CREATE TABLE 'WaveImpactAsphaltCoverSectionResultEntity'
(
'WaveImpactAsphaltCoverSectionResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
@@ -901,15 +922,6 @@
)
;
-CREATE TABLE 'WaveImpactAsphaltCoverFailureMechanismMetaEntity'
-(
- 'WaveImpactAsphaltCoverFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
- 'FailureMechanismEntityId' INTEGER NOT NULL,
- 'ForeshoreProfileCollectionSourcePath' TEXT,
- CONSTRAINT 'FK_WaveImpactAsphaltCoverFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade
-)
-;
-
CREATE TABLE 'PipingStructureSectionResultEntity'
(
'PipingStructureSectionResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
@@ -1970,10 +1982,22 @@
ON 'AssessmentSectionEntity' ('ProjectEntityId' ASC)
;
+CREATE INDEX 'IXFK_MacroStabilityOutwardsFailureMechanismMetaEntity_FailureMechanismEntity'
+ ON 'MacroStabilityOutwardsFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC)
+;
+
CREATE INDEX 'IXFK_FailureMechanismSectionEntity_FailureMechanismEntity'
ON 'FailureMechanismSectionEntity' ('FailureMechanismEntityId' ASC)
;
+CREATE INDEX 'IXFK_FailureMechanismEntity_AssessmentSectionEntity'
+ ON 'FailureMechanismEntity' ('AssessmentSectionEntityId' ASC)
+;
+
+CREATE INDEX 'IXFK_FailureMechanismEntity_CalculationGroupEntity'
+ ON 'FailureMechanismEntity' ('CalculationGroupEntityId' ASC)
+;
+
CREATE INDEX 'IXFK_StabilityPointStructuresCalculationEntity_CalculationGroupEntity'
ON 'StabilityPointStructuresCalculationEntity' ('CalculationGroupEntityId' ASC)
;
@@ -1990,22 +2014,14 @@
ON 'StabilityPointStructuresCalculationEntity' ('StabilityPointStructureEntityId' ASC)
;
-CREATE INDEX 'IXFK_FailureMechanismEntity_AssessmentSectionEntity'
- ON 'FailureMechanismEntity' ('AssessmentSectionEntityId' ASC)
+CREATE INDEX 'IXFK_ClosingStructuresFailureMechanismMetaEntity_FailureMechanismEntity'
+ ON 'ClosingStructuresFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC)
;
-CREATE INDEX 'IXFK_FailureMechanismEntity_CalculationGroupEntity'
- ON 'FailureMechanismEntity' ('CalculationGroupEntityId' ASC)
-;
-
CREATE INDEX 'IXFK_PipingFailureMechanismMetaEntity_FailureMechanismEntity'
ON 'PipingFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC)
;
-CREATE INDEX 'IXFK_ClosingStructuresFailureMechanismMetaEntity_FailureMechanismEntity'
- ON 'ClosingStructuresFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC)
-;
-
CREATE INDEX 'IXFK_StabilityStoneCoverFailureMechanismMetaEntity_FailureMechanismEntity'
ON 'StabilityStoneCoverFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC)
;
@@ -2014,10 +2030,6 @@
ON 'CalculationGroupEntity' ('ParentCalculationGroupEntityId' ASC)
;
-CREATE INDEX 'IXFK_StrengthStabilityPointConstructionFailureMechanismMetaEntity_FailureMechanismEntity'
- ON 'StabilityPointStructuresFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC)
-;
-
CREATE INDEX 'IXFK_HydraulicLocationEntity_AssessmentSectionEntity'
ON 'HydraulicLocationEntity' ('AssessmentSectionEntityId' ASC)
;
@@ -2042,8 +2054,8 @@
ON 'GrassCoverErosionInwardsFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC)
;
-CREATE INDEX 'IXFK_DuneErosionFailureMechanismMetaEntity_FailureMechanismEntity'
- ON 'DuneErosionFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC)
+CREATE INDEX 'IXFK_StrengthStabilityPointConstructionFailureMechanismMetaEntity_FailureMechanismEntity'
+ ON 'StabilityPointStructuresFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC)
;
CREATE INDEX 'IXFK_GrassCoverErosionInwardsCalculationEntity_CalculationGroupEntity'
@@ -2058,14 +2070,18 @@
ON 'GrassCoverErosionInwardsCalculationEntity' ('HydraulicLocationEntityId' ASC)
;
-CREATE INDEX 'IXFK_HeightStructuresFailureMechanismMetaEntity_FailureMechanismEntity'
- ON 'HeightStructuresFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC)
+CREATE INDEX 'IXFK_DuneErosionFailureMechanismMetaEntity_FailureMechanismEntity'
+ ON 'DuneErosionFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC)
;
CREATE INDEX 'IXFK_GrassCoverErosionOutwardsFailureMechanismMetaEntity_FailureMechanismEntity'
ON 'GrassCoverErosionOutwardsFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC)
;
+CREATE INDEX 'IXFK_HeightStructuresFailureMechanismMetaEntity_FailureMechanismEntity'
+ ON 'HeightStructuresFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC)
+;
+
CREATE INDEX 'IXFK_PipingStochasticSoilProfileEntity_SoilProfileEntity'
ON 'PipingStochasticSoilProfileEntity' ('PipingSoilProfileEntityId' ASC)
;
@@ -2150,10 +2166,14 @@
ON 'MacroStabilityInwardsSectionResultEntity' ('FailureMechanismSectionEntityId' ASC)
;
-CREATE INDEX 'IXFK_MacrostabilityOutwardsSectionResultEntity_FailureMechanismSectionEntity'
- ON 'MacrostabilityOutwardsSectionResultEntity' ('FailureMechanismSectionEntityId' ASC)
+CREATE INDEX 'IXFK_MacroStabilityOutwardsSectionResultEntity_FailureMechanismSectionEntity'
+ ON 'MacroStabilityOutwardsSectionResultEntity' ('FailureMechanismSectionEntityId' ASC)
;
+CREATE INDEX 'IXFK_WaveImpactAsphaltCoverFailureMechanismMetaEntity_FailureMechanismEntity'
+ ON 'WaveImpactAsphaltCoverFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC)
+;
+
CREATE INDEX 'IXFK_WaveImpactAsphaltCoverSectionResultEntity_FailureMechanismSectionEntity'
ON 'WaveImpactAsphaltCoverSectionResultEntity' ('FailureMechanismSectionEntityId' ASC)
;
@@ -2162,10 +2182,6 @@
ON 'MicrostabilitySectionResultEntity' ('FailureMechanismSectionEntityId' ASC)
;
-CREATE INDEX 'IXFK_WaveImpactAsphaltCoverFailureMechanismMetaEntity_FailureMechanismEntity'
- ON 'WaveImpactAsphaltCoverFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC)
-;
-
CREATE INDEX 'IXFK_PipingStructureSectionResultEntity_FailureMechanismSectionEntity'
ON 'PipingStructureSectionResultEntity' ('FailureMechanismSectionEntityId' ASC)
;
Index: design/DatabaseDesign.eap
===================================================================
diff -u -r680d50ac48c78aba5bcdb6cc459343ef6941f7a0 -r36d4b4090a4169cc8d25ede0029a3244df8fe74d
Binary files differ