Index: Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql =================================================================== diff -u -rf0c02c8a606ab59690e05a782e622243e7632dd8 -rbca00b0e437aeea92c5ef6fd0947ac64acf359cf --- Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql (.../DatabaseStructure18.1.sql) (revision f0c02c8a606ab59690e05a782e622243e7632dd8) +++ Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql (.../DatabaseStructure18.1.sql) (revision bca00b0e437aeea92c5ef6fd0947ac64acf359cf) @@ -1,6 +1,6 @@ /* ---------------------------------------------------- */ /* Generated by Enterprise Architect Version 12.0 */ -/* Created On : 30-Jan-2018 17:15:23 */ +/* Created On : 01-Feb-2018 15:56:25 */ /* DBMS : SQLite */ /* ---------------------------------------------------- */ @@ -21,10 +21,10 @@ DROP TABLE IF EXISTS 'AssessmentSectionEntity' ; -DROP TABLE IF EXISTS 'FailureMechanismSectionEntity' +DROP TABLE IF EXISTS 'MacroStabilityOutwardsFailureMechanismMetaEntity' ; -DROP TABLE IF EXISTS 'MacroStabilityOutwardsFailureMechanismMetaEntity' +DROP TABLE IF EXISTS 'FailureMechanismSectionEntity' ; DROP TABLE IF EXISTS 'FailureMechanismEntity' @@ -51,27 +51,27 @@ DROP TABLE IF EXISTS 'PipingCalculationEntity' ; -DROP TABLE IF EXISTS 'StabilityPointStructuresFailureMechanismMetaEntity' -; - DROP TABLE IF EXISTS 'GrassCoverErosionInwardsFailureMechanismMetaEntity' ; -DROP TABLE IF EXISTS 'DuneErosionFailureMechanismMetaEntity' +DROP TABLE IF EXISTS 'StabilityPointStructuresFailureMechanismMetaEntity' ; DROP TABLE IF EXISTS 'GrassCoverErosionInwardsCalculationEntity' ; -DROP TABLE IF EXISTS 'GrassCoverErosionOutwardsFailureMechanismMetaEntity' +DROP TABLE IF EXISTS 'DuneErosionFailureMechanismMetaEntity' ; -DROP TABLE IF EXISTS 'HeightStructuresFailureMechanismMetaEntity' +DROP TABLE IF EXISTS 'GrassCoverErosionOutwardsFailureMechanismMetaEntity' ; DROP TABLE IF EXISTS 'PipingSoilLayerEntity' ; +DROP TABLE IF EXISTS 'HeightStructuresFailureMechanismMetaEntity' +; + DROP TABLE IF EXISTS 'PipingSoilProfileEntity' ; @@ -93,9 +93,6 @@ DROP TABLE IF EXISTS 'PipingStructureFailureMechanismMetaEntity' ; -DROP TABLE IF EXISTS 'PipingSemiProbabilisticOutputEntity' -; - DROP TABLE IF EXISTS 'PipingSectionResultEntity' ; @@ -129,10 +126,10 @@ DROP TABLE IF EXISTS 'MacroStabilityInwardsSectionResultEntity' ; -DROP TABLE IF EXISTS 'WaveImpactAsphaltCoverFailureMechanismMetaEntity' +DROP TABLE IF EXISTS 'MacroStabilityOutwardsSectionResultEntity' ; -DROP TABLE IF EXISTS 'MacroStabilityOutwardsSectionResultEntity' +DROP TABLE IF EXISTS 'WaveImpactAsphaltCoverFailureMechanismMetaEntity' ; DROP TABLE IF EXISTS 'WaveImpactAsphaltCoverSectionResultEntity' @@ -294,9 +291,6 @@ DROP TABLE IF EXISTS 'MacroStabilityInwardsPreconsolidationStressEntity' ; -DROP TABLE IF EXISTS 'MacroStabilityInwardsSemiProbabilisticOutputEntity' -; - DROP TABLE IF EXISTS 'MacroStabilityInwardsSoilProfileTwoDSoilLayerTwoDEntity' ; @@ -371,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, @@ -381,15 +384,6 @@ ) ; -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 'FailureMechanismEntity' ( 'FailureMechanismEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -586,17 +580,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 'GrassCoverErosionInwardsFailureMechanismMetaEntity' ( 'GrassCoverErosionInwardsFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -607,12 +590,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 ) ; @@ -644,24 +629,22 @@ ) ; -CREATE TABLE 'GrassCoverErosionOutwardsFailureMechanismMetaEntity' +CREATE TABLE 'DuneErosionFailureMechanismMetaEntity' ( - 'GrassCoverErosionOutwardsFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + 'DuneErosionFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, 'FailureMechanismEntityId' INTEGER NOT NULL, 'N' REAL NOT NULL, - 'ForeshoreProfileCollectionSourcePath' TEXT, - CONSTRAINT 'FK_GrassCoverErosionOutwardsFailureMechanismMetaEntity_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 ) ; -CREATE TABLE 'HeightStructuresFailureMechanismMetaEntity' +CREATE TABLE 'GrassCoverErosionOutwardsFailureMechanismMetaEntity' ( - 'HeightStructuresFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + 'GrassCoverErosionOutwardsFailureMechanismMetaEntityId' 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_GrassCoverErosionOutwardsFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade ) ; @@ -685,6 +668,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, @@ -774,30 +768,6 @@ ) ; -CREATE TABLE 'PipingSemiProbabilisticOutputEntity' -( - 'PipingSemiProbabilisticOutputEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, - 'PipingCalculationEntityId' INTEGER NOT NULL, - 'Order' INT (4) NOT NULL, - 'UpliftFactorOfSafety' REAL, - 'UpliftReliability' REAL, - 'UpliftProbability' REAL, - 'HeaveFactorOfSafety' REAL, - 'HeaveReliability' REAL, - 'HeaveProbability' REAL, - 'SellmeijerFactorOfSafety' REAL, - 'SellmeijerReliability' REAL, - 'SellmeijerProbability' REAL, - 'RequiredProbability' REAL, - 'RequiredReliability' REAL, - 'PipingProbability' REAL, - 'PipingReliability' REAL, - 'PipingFactorOfSafety' REAL, - CONSTRAINT 'FK_PipingSemiProbabilisticOutputEntity_PipingCalculationEntity' FOREIGN KEY ('PipingCalculationEntityId') REFERENCES 'PipingCalculationEntity' ('PipingCalculationEntityId') ON DELETE Cascade ON UPDATE Cascade, - CONSTRAINT 'U_PipingCalculationEntity' UNIQUE ('PipingCalculationEntityId') -) -; - CREATE TABLE 'PipingSectionResultEntity' ( 'PipingSectionResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -917,16 +887,6 @@ ) ; -CREATE TABLE 'WaveImpactAsphaltCoverFailureMechanismMetaEntity' -( - 'WaveImpactAsphaltCoverFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, - 'FailureMechanismEntityId' INTEGER NOT NULL, - 'ForeshoreProfileCollectionSourcePath' TEXT, - 'DeltaL' REAL NOT NULL, - CONSTRAINT 'FK_WaveImpactAsphaltCoverFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade -) -; - CREATE TABLE 'MacroStabilityOutwardsSectionResultEntity' ( 'MacroStabilityOutwardsSectionResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -938,6 +898,16 @@ ) ; +CREATE TABLE 'WaveImpactAsphaltCoverFailureMechanismMetaEntity' +( + 'WaveImpactAsphaltCoverFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + 'FailureMechanismEntityId' INTEGER NOT NULL, + 'ForeshoreProfileCollectionSourcePath' TEXT, + 'DeltaL' REAL NOT NULL, + 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, @@ -1034,11 +1004,7 @@ 'Order' INT (4) NOT NULL, 'IsOvertoppingDominant' TINYINT (1) NOT NULL, -- true or false 'WaveHeight' REAL, - 'RequiredProbability' REAL, - 'RequiredReliability' REAL, - 'Probability' REAL, 'Reliability' REAL, - 'FactorOfSafety' REAL, CONSTRAINT 'FK_GrassCoverErosionInwardsOutputEntity_GeneralResultFaultTreeIllustrationPointEntity' FOREIGN KEY ('GeneralResultFaultTreeIllustrationPointEntityId') REFERENCES 'GeneralResultFaultTreeIllustrationPointEntity' ('GeneralResultFaultTreeIllustrationPointEntityId') ON DELETE Set Null ON UPDATE Cascade, CONSTRAINT 'FK_GrassCoverErosionInwardsOutputEntity_GrassCoverErosionInwardsCalculationEntity' FOREIGN KEY ('GrassCoverErosionInwardsCalculationEntityId') REFERENCES 'GrassCoverErosionInwardsCalculationEntity' ('GrassCoverErosionInwardsCalculationEntityId') ON DELETE Cascade ON UPDATE Cascade, CONSTRAINT 'U_GrassCoverErosionInwardsCalculationEntity' UNIQUE ('GrassCoverErosionInwardsCalculationEntityId') @@ -1217,11 +1183,7 @@ 'HeightStructuresOutputEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, 'HeightStructuresCalculationEntityId' INTEGER NOT NULL, 'GeneralResultFaultTreeIllustrationPointEntityId' INTEGER, - 'RequiredProbability' REAL, - 'RequiredReliability' REAL, - 'Probability' REAL, 'Reliability' REAL, - 'FactorOfSafety' REAL, CONSTRAINT 'FK_HeightStructuresOutputEntity_GeneralResultFaultTreeIllustrationPointEntity' FOREIGN KEY ('GeneralResultFaultTreeIllustrationPointEntityId') REFERENCES 'GeneralResultFaultTreeIllustrationPointEntity' ('GeneralResultFaultTreeIllustrationPointEntityId') ON DELETE Set Null ON UPDATE Cascade, CONSTRAINT 'FK_HeightStructuresOutputEntity_HeightStructuresCalculationEntity' FOREIGN KEY ('HeightStructuresCalculationEntityId') REFERENCES 'HeightStructuresCalculationEntity' ('HeightStructuresCalculationEntityId') ON DELETE Cascade ON UPDATE Cascade, CONSTRAINT 'U_HeightStructuresCalculationEntity' UNIQUE ('HeightStructuresCalculationEntityId') @@ -1391,11 +1353,7 @@ 'ClosingStructuresOutputEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, 'ClosingStructuresCalculationEntityId' INTEGER NOT NULL, 'GeneralResultFaultTreeIllustrationPointEntityId' INTEGER, - 'RequiredProbability' REAL, - 'RequiredReliability' REAL, - 'Probability' REAL, 'Reliability' REAL, - 'FactorOfSafety' REAL, CONSTRAINT 'FK_ClosingStructuresOutputEntity_ClosingStructuresCalculationEntity' FOREIGN KEY ('ClosingStructuresCalculationEntityId') REFERENCES 'ClosingStructuresCalculationEntity' ('ClosingStructuresCalculationEntityId') ON DELETE Cascade ON UPDATE Cascade, CONSTRAINT 'FK_ClosingStructuresOutputEntity_GeneralResultFaultTreeIllustrationPointEntity' FOREIGN KEY ('GeneralResultFaultTreeIllustrationPointEntityId') REFERENCES 'GeneralResultFaultTreeIllustrationPointEntity' ('GeneralResultFaultTreeIllustrationPointEntityId') ON DELETE Set Null ON UPDATE Cascade, CONSTRAINT 'U_ClosingStructuresCalculationEntity' UNIQUE ('ClosingStructuresCalculationEntityId') @@ -1462,14 +1420,10 @@ CREATE TABLE 'StabilityPointStructuresOutputEntity' ( - 'StabilityPointStructuresOutputEntity' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + 'StabilityPointStructuresOutputEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, 'StabilityPointStructuresCalculationEntityId' INTEGER NOT NULL, 'GeneralResultFaultTreeIllustrationPointEntityId' INTEGER, - 'RequiredProbability' REAL, - 'RequiredReliability' REAL, - 'Probability' REAL, 'Reliability' REAL, - 'FactorOfSafety' REAL, CONSTRAINT 'FK_StabilityPointStructuresOutputEntity_GeneralResultFaultTreeIllustrationPointEntity' FOREIGN KEY ('GeneralResultFaultTreeIllustrationPointEntityId') REFERENCES 'GeneralResultFaultTreeIllustrationPointEntity' ('GeneralResultFaultTreeIllustrationPointEntityId') ON DELETE Set Null ON UPDATE Cascade, CONSTRAINT 'FK_StabilityPointStructuresOutputEntity_StabilityPointStructuresCalculationEntity' FOREIGN KEY ('StabilityPointStructuresCalculationEntityId') REFERENCES 'StabilityPointStructuresCalculationEntity' ('StabilityPointStructuresCalculationEntityId') ON DELETE Cascade ON UPDATE Cascade, CONSTRAINT 'U_StabilityPointStructuresCalculationEntity' UNIQUE ('StabilityPointStructuresCalculationEntityId') @@ -1955,20 +1909,6 @@ ) ; -CREATE TABLE 'MacroStabilityInwardsSemiProbabilisticOutputEntity' -( - 'MacroStabilityInwardsSemiProbabilisticOutputEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, - 'MacroStabilityInwardsCalculationEntityId' INTEGER NOT NULL, - 'FactorOfStability' REAL, - 'RequiredProbability' REAL, - 'RequiredReliability' REAL, - 'MacroStabilityInwardsProbability' REAL, - 'MacroStabilityInwardsReliability' REAL, - 'MacroStabilityInwardsFactorOfSafety' REAL, - CONSTRAINT 'FK_MacroStabilityInwardsSemiProbabilisticOutputEntity_MacroStabilityInwardsCalculationEntity' FOREIGN KEY ('MacroStabilityInwardsCalculationEntityId') REFERENCES 'MacroStabilityInwardsCalculationEntity' ('MacroStabilityInwardsCalculationEntityId') ON DELETE Cascade ON UPDATE Cascade -) -; - CREATE TABLE 'MacroStabilityInwardsSoilProfileTwoDSoilLayerTwoDEntity' ( 'MacroStabilityInwardsSoilProfileTwoDEntityId' INTEGER NOT NULL, @@ -2025,14 +1965,14 @@ ON 'AssessmentSectionEntity' ('ProjectEntityId' ASC) ; -CREATE INDEX 'IXFK_FailureMechanismSectionEntity_FailureMechanismEntity' - ON 'FailureMechanismSectionEntity' ('FailureMechanismEntityId' 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) ; @@ -2220,16 +2160,12 @@ ON 'PipingCalculationEntity' ('CalculationGroupEntityId' ASC) ; -CREATE INDEX 'IXFK_StrengthStabilityPointConstructionFailureMechanismMetaEntity_FailureMechanismEntity' - ON 'StabilityPointStructuresFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC) -; - CREATE INDEX 'IXFK_GrassCoverErosionInwardsFailureMechanismMetaEntity_FailureMechanismEntity' 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' @@ -2244,6 +2180,10 @@ ON 'GrassCoverErosionInwardsCalculationEntity' ('HydraulicLocationEntityId' ASC) ; +CREATE INDEX 'IXFK_DuneErosionFailureMechanismMetaEntity_FailureMechanismEntity' + ON 'DuneErosionFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC) +; + CREATE INDEX 'IXFK_GrassCoverErosionOutwardsFailureMechanismMetaEntity_FailureMechanismEntity' ON 'GrassCoverErosionOutwardsFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC) ; @@ -2280,10 +2220,6 @@ ON 'PipingStructureFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC) ; -CREATE INDEX 'IXFK_PipingSemiProbabilisticOutputEntity_PipingCalculationEntity' - ON 'PipingSemiProbabilisticOutputEntity' ('PipingCalculationEntityId' ASC) -; - CREATE INDEX 'IXFK_PipingSectionResultEntity_FailureMechanismSectionEntity' ON 'PipingSectionResultEntity' ('FailureMechanismSectionEntityId' ASC) ; @@ -2340,14 +2276,14 @@ ON 'MacroStabilityInwardsSectionResultEntity' ('FailureMechanismSectionEntityId' ASC) ; -CREATE INDEX 'IXFK_WaveImpactAsphaltCoverFailureMechanismMetaEntity_FailureMechanismEntity' - ON 'WaveImpactAsphaltCoverFailureMechanismMetaEntity' ('FailureMechanismEntityId' 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) ; Index: Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_17.3_18.1.sql =================================================================== diff -u -rfbe227cf3a6743302f63c1bd3281feda0273192c -rbca00b0e437aeea92c5ef6fd0947ac64acf359cf --- Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_17.3_18.1.sql (.../Migration_17.3_18.1.sql) (revision fbe227cf3a6743302f63c1bd3281feda0273192c) +++ Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_17.3_18.1.sql (.../Migration_17.3_18.1.sql) (revision bca00b0e437aeea92c5ef6fd0947ac64acf359cf) @@ -14,7 +14,17 @@ INSERT INTO ClosingStructureEntity SELECT * FROM [SOURCEPROJECT].ClosingStructureEntity; INSERT INTO ClosingStructuresCalculationEntity SELECT * FROM [SOURCEPROJECT].ClosingStructuresCalculationEntity; INSERT INTO ClosingStructuresFailureMechanismMetaEntity SELECT * FROM [SOURCEPROJECT].ClosingStructuresFailureMechanismMetaEntity; -INSERT INTO ClosingStructuresOutputEntity SELECT * FROM [SOURCEPROJECT].ClosingStructuresOutputEntity; +INSERT INTO ClosingStructuresOutputEntity( + [ClosingStructuresOutputEntityId], + [ClosingStructuresCalculationEntityId], + [GeneralResultFaultTreeIllustrationPointEntityId], + [Reliability]) +SELECT + [ClosingStructuresOutputEntityId], + [ClosingStructuresCalculationEntityId], + [GeneralResultFaultTreeIllustrationPointEntityId], + [Reliability] +FROM [SOURCEPROJECT].ClosingStructuresOutputEntity; INSERT INTO ClosingStructuresSectionResultEntity SELECT * FROM [SOURCEPROJECT].ClosingStructuresSectionResultEntity; INSERT INTO DikeProfileEntity SELECT * FROM [SOURCEPROJECT].DikeProfileEntity; INSERT INTO DuneErosionFailureMechanismMetaEntity SELECT * FROM [SOURCEPROJECT].DuneErosionFailureMechanismMetaEntity; @@ -34,7 +44,23 @@ INSERT INTO GrassCoverErosionInwardsCalculationEntity SELECT * FROM [SOURCEPROJECT].GrassCoverErosionInwardsCalculationEntity; INSERT INTO GrassCoverErosionInwardsDikeHeightOutputEntity SELECT * FROM [SOURCEPROJECT].GrassCoverErosionInwardsDikeHeightOutputEntity; INSERT INTO GrassCoverErosionInwardsFailureMechanismMetaEntity SELECT * FROM [SOURCEPROJECT].GrassCoverErosionInwardsFailureMechanismMetaEntity; -INSERT INTO GrassCoverErosionInwardsOutputEntity SELECT * FROM [SOURCEPROJECT].GrassCoverErosionInwardsOutputEntity; +INSERT INTO GrassCoverErosionInwardsOutputEntity( + [GrassCoverErosionInwardsOutputEntityId], + [GrassCoverErosionInwardsCalculationEntityId], + [GeneralResultFaultTreeIllustrationPointEntityId], + [Order], + [IsOvertoppingDominant], + [WaveHeight], + [Reliability]) +SELECT + [GrassCoverErosionInwardsOutputEntityId], + [GrassCoverErosionInwardsCalculationEntityId], + [GeneralResultFaultTreeIllustrationPointEntityId], + [Order], + [IsOvertoppingDominant], + [WaveHeight], + [Reliability] +FROM [SOURCEPROJECT].GrassCoverErosionInwardsOutputEntity; INSERT INTO GrassCoverErosionInwardsOvertoppingRateOutputEntity SELECT * FROM [SOURCEPROJECT].GrassCoverErosionInwardsOvertoppingRateOutputEntity; INSERT INTO GrassCoverErosionInwardsSectionResultEntity SELECT * FROM [SOURCEPROJECT].GrassCoverErosionInwardsSectionResultEntity; INSERT INTO GrassCoverErosionOutwardsFailureMechanismMetaEntity SELECT * FROM [SOURCEPROJECT].GrassCoverErosionOutwardsFailureMechanismMetaEntity; @@ -48,7 +74,17 @@ INSERT INTO HeightStructureEntity SELECT * FROM [SOURCEPROJECT].HeightStructureEntity; INSERT INTO HeightStructuresCalculationEntity SELECT * FROM [SOURCEPROJECT].HeightStructuresCalculationEntity; INSERT INTO HeightStructuresFailureMechanismMetaEntity SELECT * FROM [SOURCEPROJECT].HeightStructuresFailureMechanismMetaEntity; -INSERT INTO HeightStructuresOutputEntity SELECT * FROM [SOURCEPROJECT].HeightStructuresOutputEntity; +INSERT INTO HeightStructuresOutputEntity( + [HeightStructuresOutputEntityId], + [HeightStructuresCalculationEntityId], + [GeneralResultFaultTreeIllustrationPointEntityId], + [Reliability]) +SELECT + [HeightStructuresOutputEntityId], + [HeightStructuresCalculationEntityId], + [GeneralResultFaultTreeIllustrationPointEntityId], + [Reliability] +FROM [SOURCEPROJECT].HeightStructuresOutputEntity; INSERT INTO HeightStructuresSectionResultEntity SELECT * FROM [SOURCEPROJECT].HeightStructuresSectionResultEntity; INSERT INTO HydraRingPreprocessorEntity SELECT * FROM [SOURCEPROJECT].HydraRingPreprocessorEntity; INSERT INTO IllustrationPointResultEntity SELECT * FROM [SOURCEPROJECT].IllustrationPointResultEntity; @@ -58,7 +94,6 @@ INSERT INTO MacroStabilityInwardsFailureMechanismMetaEntity SELECT * FROM [SOURCEPROJECT].MacroStabilityInwardsFailureMechanismMetaEntity; INSERT INTO MacroStabilityInwardsPreconsolidationStressEntity SELECT * FROM [SOURCEPROJECT].MacroStabilityInwardsPreconsolidationStressEntity; INSERT INTO MacroStabilityInwardsSectionResultEntity SELECT * FROM [SOURCEPROJECT].MacroStabilityInwardsSectionResultEntity; -INSERT INTO MacroStabilityInwardsSemiProbabilisticOutputEntity SELECT * FROM [SOURCEPROJECT].MacroStabilityInwardsSemiProbabilisticOutputEntity; INSERT INTO MacroStabilityInwardsSoilLayerOneDEntity SELECT * FROM [SOURCEPROJECT].MacroStabilityInwardsSoilLayerOneDEntity; INSERT INTO MacroStabilityInwardsSoilLayerTwoDEntity SELECT * FROM [SOURCEPROJECT].MacroStabilityInwardsSoilLayerTwoDEntity; INSERT INTO MacroStabilityInwardsSoilProfileOneDEntity SELECT * FROM [SOURCEPROJECT].MacroStabilityInwardsSoilProfileOneDEntity; @@ -72,7 +107,6 @@ INSERT INTO PipingCharacteristicPointEntity SELECT * FROM [SOURCEPROJECT].PipingCharacteristicPointEntity; INSERT INTO PipingFailureMechanismMetaEntity SELECT * FROM [SOURCEPROJECT].PipingFailureMechanismMetaEntity; INSERT INTO PipingSectionResultEntity SELECT * FROM [SOURCEPROJECT].PipingSectionResultEntity; -INSERT INTO PipingSemiProbabilisticOutputEntity SELECT * FROM [SOURCEPROJECT].PipingSemiProbabilisticOutputEntity; INSERT INTO PipingSoilLayerEntity( [PipingSoilLayerEntityId], [PipingSoilProfileEntityId], @@ -146,7 +180,17 @@ INSERT INTO StabilityPointStructureEntity SELECT * FROM [SOURCEPROJECT].StabilityPointStructureEntity; INSERT INTO StabilityPointStructuresCalculationEntity SELECT * FROM [SOURCEPROJECT].StabilityPointStructuresCalculationEntity; INSERT INTO StabilityPointStructuresFailureMechanismMetaEntity SELECT * FROM [SOURCEPROJECT].StabilityPointStructuresFailureMechanismMetaEntity; -INSERT INTO StabilityPointStructuresOutputEntity SELECT * FROM [SOURCEPROJECT].StabilityPointStructuresOutputEntity; +INSERT INTO StabilityPointStructuresOutputEntity( + [StabilityPointStructuresOutputEntityId], + [StabilityPointStructuresCalculationEntityId], + [GeneralResultFaultTreeIllustrationPointEntityId], + [Reliability]) +SELECT + [StabilityPointStructuresOutputEntity], + [StabilityPointStructuresCalculationEntityId], + [GeneralResultFaultTreeIllustrationPointEntityId], + [Reliability] +FROM [SOURCEPROJECT].StabilityPointStructuresOutputEntity; INSERT INTO StabilityPointStructuresSectionResultEntity SELECT * FROM [SOURCEPROJECT].StabilityPointStructuresSectionResultEntity; INSERT INTO StabilityStoneCoverFailureMechanismMetaEntity ( [StabilityStoneCoverFailureMechanismMetaEntityId], Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj =================================================================== diff -u -r2814beac7c7cac3323e8711e6b2828434350091b -rbca00b0e437aeea92c5ef6fd0947ac64acf359cf --- Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision 2814beac7c7cac3323e8711e6b2828434350091b) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision bca00b0e437aeea92c5ef6fd0947ac64acf359cf) @@ -225,9 +225,6 @@ RingtoetsEntities.tt - - RingtoetsEntities.tt - RingtoetsEntities.tt @@ -253,7 +250,7 @@ RingtoetsEntities.tt - + @@ -277,9 +274,6 @@ RingtoetsEntities.tt - - RingtoetsEntities.tt - RingtoetsEntities.tt Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StructuresOutputCreateExtensions.cs =================================================================== diff -u -r3b741a615556cb874f09820d4cc28ceebe40538c -rbca00b0e437aeea92c5ef6fd0947ac64acf359cf --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StructuresOutputCreateExtensions.cs (.../StructuresOutputCreateExtensions.cs) (revision 3b741a615556cb874f09820d4cc28ceebe40538c) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StructuresOutputCreateExtensions.cs (.../StructuresOutputCreateExtensions.cs) (revision bca00b0e437aeea92c5ef6fd0947ac64acf359cf) @@ -22,7 +22,6 @@ using System; using Application.Ringtoets.Storage.Create.IllustrationPoints; using Application.Ringtoets.Storage.DbContext; -using Ringtoets.Common.Data.Probability; using Ringtoets.Common.Data.Structures; namespace Application.Ringtoets.Storage.Create @@ -42,7 +41,7 @@ /// Thrown when /// is null. public static TOutputEntity Create(this StructuresOutput structuresOutput) - where TOutputEntity : IProbabilityAssessmentOutputEntity, + where TOutputEntity : IStructuresOutputEntity, IHasGeneralResultFaultTreeIllustrationPointEntity, new() { Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructuresOutputEntity.cs =================================================================== diff -u -r3dbf451144dc23d8abe649913baee1a5e544c48c -rbca00b0e437aeea92c5ef6fd0947ac64acf359cf --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructuresOutputEntity.cs (.../ClosingStructuresOutputEntity.cs) (revision 3dbf451144dc23d8abe649913baee1a5e544c48c) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructuresOutputEntity.cs (.../ClosingStructuresOutputEntity.cs) (revision bca00b0e437aeea92c5ef6fd0947ac64acf359cf) @@ -38,10 +38,6 @@ public virtual ClosingStructuresCalculationEntity ClosingStructuresCalculationEntity { get; set; } public virtual GeneralResultFaultTreeIllustrationPointEntity GeneralResultFaultTreeIllustrationPointEntity { get; set; } - public double? RequiredProbability { get; set; } - public double? RequiredReliability { get; set; } - public double? Probability { get; set; } public double? Reliability { get; set; } - public double? FactorOfSafety { get; set; } } } \ No newline at end of file Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionInwardsOutputEntity.cs =================================================================== diff -u -r3dbf451144dc23d8abe649913baee1a5e544c48c -rbca00b0e437aeea92c5ef6fd0947ac64acf359cf --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionInwardsOutputEntity.cs (.../GrassCoverErosionInwardsOutputEntity.cs) (revision 3dbf451144dc23d8abe649913baee1a5e544c48c) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionInwardsOutputEntity.cs (.../GrassCoverErosionInwardsOutputEntity.cs) (revision bca00b0e437aeea92c5ef6fd0947ac64acf359cf) @@ -48,11 +48,7 @@ public int Order { get; set; } public byte IsOvertoppingDominant { get; set; } public double? WaveHeight { get; set; } - public double? RequiredProbability { get; set; } - public double? RequiredReliability { get; set; } - public double? Probability { get; set; } public double? Reliability { get; set; } - public double? FactorOfSafety { get; set; } public virtual GeneralResultFaultTreeIllustrationPointEntity GeneralResultFaultTreeIllustrationPointEntity { get; set; } public virtual GrassCoverErosionInwardsCalculationEntity GrassCoverErosionInwardsCalculationEntity { get; set; } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructuresOutputEntity.cs =================================================================== diff -u -r3dbf451144dc23d8abe649913baee1a5e544c48c -rbca00b0e437aeea92c5ef6fd0947ac64acf359cf --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructuresOutputEntity.cs (.../HeightStructuresOutputEntity.cs) (revision 3dbf451144dc23d8abe649913baee1a5e544c48c) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructuresOutputEntity.cs (.../HeightStructuresOutputEntity.cs) (revision bca00b0e437aeea92c5ef6fd0947ac64acf359cf) @@ -38,10 +38,6 @@ public virtual HeightStructuresCalculationEntity HeightStructuresCalculationEntity { get; set; } public virtual GeneralResultFaultTreeIllustrationPointEntity GeneralResultFaultTreeIllustrationPointEntity { get; set; } - public double? RequiredProbability { get; set; } - public double? RequiredReliability { get; set; } - public double? Probability { get; set; } public double? Reliability { get; set; } - public double? FactorOfSafety { get; set; } } } \ No newline at end of file Fisheye: Tag bca00b0e437aeea92c5ef6fd0947ac64acf359cf refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/IProbabilityAssessmentOutputEntity.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/IStructuresOutputEntity.cs =================================================================== diff -u --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/IStructuresOutputEntity.cs (revision 0) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/IStructuresOutputEntity.cs (revision bca00b0e437aeea92c5ef6fd0947ac64acf359cf) @@ -0,0 +1,34 @@ +// 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. + +namespace Application.Ringtoets.Storage.DbContext +{ + /// + /// Interface for an output entity that represents structures output. + /// + public interface IStructuresOutputEntity + { + /// + /// Gets or sets the reliability of the failure mechanism. + /// + double? Reliability { get; set; } + } +} \ No newline at end of file Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/MacroStabilityInwardsCalculationEntity.cs =================================================================== diff -u -r3dbf451144dc23d8abe649913baee1a5e544c48c -rbca00b0e437aeea92c5ef6fd0947ac64acf359cf --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/MacroStabilityInwardsCalculationEntity.cs (.../MacroStabilityInwardsCalculationEntity.cs) (revision 3dbf451144dc23d8abe649913baee1a5e544c48c) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/MacroStabilityInwardsCalculationEntity.cs (.../MacroStabilityInwardsCalculationEntity.cs) (revision bca00b0e437aeea92c5ef6fd0947ac64acf359cf) @@ -39,7 +39,6 @@ public MacroStabilityInwardsCalculationEntity() { MacroStabilityInwardsCalculationOutputEntities = new HashSet(); - MacroStabilityInwardsSemiProbabilisticOutputEntities = new HashSet(); } public long MacroStabilityInwardsCalculationEntityId { get; set; } @@ -114,8 +113,5 @@ [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection MacroStabilityInwardsCalculationOutputEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection MacroStabilityInwardsSemiProbabilisticOutputEntities { get; set; } } } \ No newline at end of file Fisheye: Tag bca00b0e437aeea92c5ef6fd0947ac64acf359cf refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/MacroStabilityInwardsSemiProbabilisticOutputEntity.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PartialClosingStructuresOutputEntity.cs =================================================================== diff -u -r9c830d5c8a9e1a18eecba12531147ee223622268 -rbca00b0e437aeea92c5ef6fd0947ac64acf359cf --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PartialClosingStructuresOutputEntity.cs (.../PartialClosingStructuresOutputEntity.cs) (revision 9c830d5c8a9e1a18eecba12531147ee223622268) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PartialClosingStructuresOutputEntity.cs (.../PartialClosingStructuresOutputEntity.cs) (revision bca00b0e437aeea92c5ef6fd0947ac64acf359cf) @@ -23,8 +23,8 @@ { /// /// Partial implementation of that implements - /// and . + /// and . /// - public partial class ClosingStructuresOutputEntity : IProbabilityAssessmentOutputEntity, + public partial class ClosingStructuresOutputEntity : IStructuresOutputEntity, IHasGeneralResultFaultTreeIllustrationPointEntity {} } \ No newline at end of file Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PartialHeightStructuresOutputEntity.cs =================================================================== diff -u -r9c830d5c8a9e1a18eecba12531147ee223622268 -rbca00b0e437aeea92c5ef6fd0947ac64acf359cf --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PartialHeightStructuresOutputEntity.cs (.../PartialHeightStructuresOutputEntity.cs) (revision 9c830d5c8a9e1a18eecba12531147ee223622268) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PartialHeightStructuresOutputEntity.cs (.../PartialHeightStructuresOutputEntity.cs) (revision bca00b0e437aeea92c5ef6fd0947ac64acf359cf) @@ -23,8 +23,8 @@ { /// /// Partial implementation of that implements - /// and . + /// and . /// - public partial class HeightStructuresOutputEntity : IProbabilityAssessmentOutputEntity, + public partial class HeightStructuresOutputEntity : IStructuresOutputEntity, IHasGeneralResultFaultTreeIllustrationPointEntity {} } \ No newline at end of file Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PartialRingtoetsEntities.cs =================================================================== diff -u -r3dbf451144dc23d8abe649913baee1a5e544c48c -rbca00b0e437aeea92c5ef6fd0947ac64acf359cf --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PartialRingtoetsEntities.cs (.../PartialRingtoetsEntities.cs) (revision 3dbf451144dc23d8abe649913baee1a5e544c48c) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PartialRingtoetsEntities.cs (.../PartialRingtoetsEntities.cs) (revision bca00b0e437aeea92c5ef6fd0947ac64acf359cf) @@ -96,7 +96,6 @@ MacroStabilityInwardsPreconsolidationStressEntities.Load(); MacroStabilityInwardsCalculationEntities.Load(); MacroStabilityInwardsCalculationOutputEntities.Load(); - MacroStabilityInwardsSemiProbabilisticOutputEntities.Load(); MacroStabilityOutwardsSectionResultEntities.Load(); MacroStabilityOutwardsFailureMechanismMetaEntities.Load(); MicrostabilitySectionResultEntities.Load(); @@ -106,7 +105,6 @@ PipingCharacteristicPointEntities.Load(); PipingFailureMechanismMetaEntities.Load(); PipingSectionResultEntities.Load(); - PipingSemiProbabilisticOutputEntities.Load(); PipingSoilLayerEntities.Load(); PipingSoilProfileEntities.Load(); PipingStructureFailureMechanismMetaEntities.Load(); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PartialStabilityPointStructuresOutputEntity.cs =================================================================== diff -u -r9c830d5c8a9e1a18eecba12531147ee223622268 -rbca00b0e437aeea92c5ef6fd0947ac64acf359cf --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PartialStabilityPointStructuresOutputEntity.cs (.../PartialStabilityPointStructuresOutputEntity.cs) (revision 9c830d5c8a9e1a18eecba12531147ee223622268) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PartialStabilityPointStructuresOutputEntity.cs (.../PartialStabilityPointStructuresOutputEntity.cs) (revision bca00b0e437aeea92c5ef6fd0947ac64acf359cf) @@ -23,8 +23,8 @@ { /// /// Partial implementation of that implements - /// and . + /// and . /// - public partial class StabilityPointStructuresOutputEntity : IProbabilityAssessmentOutputEntity, + public partial class StabilityPointStructuresOutputEntity : IStructuresOutputEntity, IHasGeneralResultFaultTreeIllustrationPointEntity {} } \ No newline at end of file Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingCalculationEntity.cs =================================================================== diff -u -r3dbf451144dc23d8abe649913baee1a5e544c48c -rbca00b0e437aeea92c5ef6fd0947ac64acf359cf --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingCalculationEntity.cs (.../PipingCalculationEntity.cs) (revision 3dbf451144dc23d8abe649913baee1a5e544c48c) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingCalculationEntity.cs (.../PipingCalculationEntity.cs) (revision bca00b0e437aeea92c5ef6fd0947ac64acf359cf) @@ -39,7 +39,6 @@ public PipingCalculationEntity() { PipingCalculationOutputEntities = new HashSet(); - PipingSemiProbabilisticOutputEntities = new HashSet(); } public long PipingCalculationEntityId { get; set; } @@ -68,8 +67,5 @@ [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection PipingCalculationOutputEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection PipingSemiProbabilisticOutputEntities { get; set; } } } \ No newline at end of file Fisheye: Tag bca00b0e437aeea92c5ef6fd0947ac64acf359cf refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingSemiProbabilisticOutputEntity.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs =================================================================== diff -u -r3dbf451144dc23d8abe649913baee1a5e544c48c -rbca00b0e437aeea92c5ef6fd0947ac64acf359cf --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs (.../RingtoetsEntities.Context.cs) (revision 3dbf451144dc23d8abe649913baee1a5e544c48c) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs (.../RingtoetsEntities.Context.cs) (revision bca00b0e437aeea92c5ef6fd0947ac64acf359cf) @@ -85,7 +85,6 @@ public virtual DbSet MacroStabilityInwardsFailureMechanismMetaEntities { get; set; } public virtual DbSet MacroStabilityInwardsPreconsolidationStressEntities { get; set; } public virtual DbSet MacroStabilityInwardsSectionResultEntities { get; set; } - public virtual DbSet MacroStabilityInwardsSemiProbabilisticOutputEntities { get; set; } public virtual DbSet MacroStabilityInwardsSoilLayerOneDEntities { get; set; } public virtual DbSet MacroStabilityInwardsSoilLayerTwoDEntities { get; set; } public virtual DbSet MacroStabilityInwardsSoilProfileOneDEntities { get; set; } @@ -99,7 +98,6 @@ public virtual DbSet PipingCharacteristicPointEntities { get; set; } public virtual DbSet PipingFailureMechanismMetaEntities { get; set; } public virtual DbSet PipingSectionResultEntities { get; set; } - public virtual DbSet PipingSemiProbabilisticOutputEntities { get; set; } public virtual DbSet PipingSoilLayerEntities { get; set; } public virtual DbSet PipingSoilProfileEntities { get; set; } public virtual DbSet PipingStochasticSoilProfileEntities { get; set; } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx =================================================================== diff -u -rfbe227cf3a6743302f63c1bd3281feda0273192c -rbca00b0e437aeea92c5ef6fd0947ac64acf359cf --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision fbe227cf3a6743302f63c1bd3281feda0273192c) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision bca00b0e437aeea92c5ef6fd0947ac64acf359cf) @@ -4,7 +4,7 @@ - + @@ -154,11 +154,7 @@ - - - - @@ -394,11 +390,7 @@ - - - - @@ -610,11 +602,7 @@ - - - - @@ -840,19 +828,6 @@ - - - - - - - - - - - - - @@ -1048,28 +1023,6 @@ - - - - - - - - - - - - - - - - - - - - - - @@ -1270,16 +1223,12 @@ - + - + - - - - @@ -2567,18 +2516,6 @@ - - - - - - - - - - - - @@ -2795,18 +2732,6 @@ - - - - - - - - - - - - @@ -3306,7 +3231,6 @@ - @@ -3321,7 +3245,6 @@ - @@ -3700,10 +3623,6 @@ - - - - @@ -3776,10 +3695,6 @@ - - - - @@ -3984,7 +3899,6 @@ - @@ -3998,7 +3912,6 @@ - @@ -4473,10 +4386,6 @@ - - - - @@ -4517,10 +4426,6 @@ - - - - @@ -4780,11 +4685,7 @@ - - - - @@ -5074,11 +4975,7 @@ - - - - @@ -5321,11 +5218,7 @@ - - - - @@ -5488,7 +5381,6 @@ - @@ -5580,20 +5472,6 @@ - - - - - - - - - - - - - - @@ -5751,7 +5629,6 @@ - @@ -5807,29 +5684,6 @@ - - - - - - - - - - - - - - - - - - - - - - - @@ -6048,16 +5902,12 @@ - + - + - - - - @@ -7674,18 +7524,6 @@ - - - - - - - - - - - - @@ -7806,18 +7644,6 @@ - - - - - - - - - - - - @@ -8136,11 +7962,7 @@ - - - - @@ -8357,11 +8179,7 @@ - - - - @@ -8590,11 +8408,7 @@ - - - - @@ -8829,20 +8643,6 @@ - - - - - - - - - - - - - - @@ -9043,29 +8843,6 @@ - - - - - - - - - - - - - - - - - - - - - - - @@ -9276,14 +9053,10 @@ - - - - - + Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram =================================================================== diff -u -rfbe227cf3a6743302f63c1bd3281feda0273192c -rbca00b0e437aeea92c5ef6fd0947ac64acf359cf --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision fbe227cf3a6743302f63c1bd3281feda0273192c) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision bca00b0e437aeea92c5ef6fd0947ac64acf359cf) @@ -336,100 +336,98 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - - + + + + + @@ -532,7 +530,6 @@ - @@ -543,7 +540,6 @@ - Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructuresOutputEntity.cs =================================================================== diff -u -r3dbf451144dc23d8abe649913baee1a5e544c48c -rbca00b0e437aeea92c5ef6fd0947ac64acf359cf --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructuresOutputEntity.cs (.../StabilityPointStructuresOutputEntity.cs) (revision 3dbf451144dc23d8abe649913baee1a5e544c48c) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructuresOutputEntity.cs (.../StabilityPointStructuresOutputEntity.cs) (revision bca00b0e437aeea92c5ef6fd0947ac64acf359cf) @@ -32,16 +32,12 @@ { public partial class StabilityPointStructuresOutputEntity { - public long StabilityPointStructuresOutputEntity1 { get; set; } + public long StabilityPointStructuresOutputEntityId { get; set; } public long StabilityPointStructuresCalculationEntityId { get; set; } public long? GeneralResultFaultTreeIllustrationPointEntityId { get; set; } public virtual StabilityPointStructuresCalculationEntity StabilityPointStructuresCalculationEntity { get; set; } public virtual GeneralResultFaultTreeIllustrationPointEntity GeneralResultFaultTreeIllustrationPointEntity { get; set; } - public double? RequiredProbability { get; set; } - public double? RequiredReliability { get; set; } - public double? Probability { get; set; } public double? Reliability { get; set; } - public double? FactorOfSafety { get; set; } } } \ No newline at end of file Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputEntityReadExtensions.cs =================================================================== diff -u -r9726c1ed2a69caa0792394721d1bcf6dc587f421 -rbca00b0e437aeea92c5ef6fd0947ac64acf359cf --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputEntityReadExtensions.cs (.../GrassCoverErosionInwardsOutputEntityReadExtensions.cs) (revision 9726c1ed2a69caa0792394721d1bcf6dc587f421) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputEntityReadExtensions.cs (.../GrassCoverErosionInwardsOutputEntityReadExtensions.cs) (revision bca00b0e437aeea92c5ef6fd0947ac64acf359cf) @@ -23,7 +23,6 @@ using System.Linq; using Application.Ringtoets.Storage.DbContext; using Application.Ringtoets.Storage.Read.IllustrationPoints; -using Ringtoets.Common.Data.Probability; using Ringtoets.GrassCoverErosionInwards.Data; namespace Application.Ringtoets.Storage.Read.GrassCoverErosionInwards @@ -62,15 +61,6 @@ entity.GeneralResultFaultTreeIllustrationPointEntity?.Read()); } - private static ProbabilityAssessmentOutput ReadProbabilityAssessmentOutput(GrassCoverErosionInwardsOutputEntity entity) - { - return new ProbabilityAssessmentOutput(entity.RequiredProbability.ToNullAsNaN(), - entity.RequiredReliability.ToNullAsNaN(), - entity.Probability.ToNullAsNaN(), - entity.Reliability.ToNullAsNaN(), - entity.FactorOfSafety.ToNullAsNaN()); - } - private static DikeHeightOutput GetDikeHeightOutput(GrassCoverErosionInwardsOutputEntity entity) { GrassCoverErosionInwardsDikeHeightOutputEntity dikeHeightOutputEntity = entity.GrassCoverErosionInwardsDikeHeightOutputEntities.FirstOrDefault(); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Ringtoets.rtd =================================================================== diff -u -rfbe227cf3a6743302f63c1bd3281feda0273192c -rbca00b0e437aeea92c5ef6fd0947ac64acf359cf Binary files differ Index: Application/Ringtoets/test/Application.Ringtoets.Migration.Core.Test/test-data/FullTestProject173.rtd =================================================================== diff -u -r0603ceccd7d126c95612923d0d13b78c7a2e8ad2 -rbca00b0e437aeea92c5ef6fd0947ac64acf359cf Binary files differ Index: Application/Ringtoets/test/Application.Ringtoets.Migration.Core.Test/test-data/FullTestProject181.rtd =================================================================== diff -u -rfbe227cf3a6743302f63c1bd3281feda0273192c -rbca00b0e437aeea92c5ef6fd0947ac64acf359cf Binary files differ Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputCreateExtensionsTest.cs =================================================================== diff -u -r9726c1ed2a69caa0792394721d1bcf6dc587f421 -rbca00b0e437aeea92c5ef6fd0947ac64acf359cf --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputCreateExtensionsTest.cs (.../GrassCoverErosionInwardsOutputCreateExtensionsTest.cs) (revision 9726c1ed2a69caa0792394721d1bcf6dc587f421) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputCreateExtensionsTest.cs (.../GrassCoverErosionInwardsOutputCreateExtensionsTest.cs) (revision bca00b0e437aeea92c5ef6fd0947ac64acf359cf) @@ -97,11 +97,7 @@ // Assert Assert.IsNull(entity.WaveHeight); Assert.AreEqual(Convert.ToByte(overtoppingOutput.IsOvertoppingDominant), entity.IsOvertoppingDominant); - Assert.IsNull(entity.FactorOfSafety); - Assert.IsNull(entity.Probability); Assert.IsNull(entity.Reliability); - Assert.IsNull(entity.RequiredProbability); - Assert.IsNull(entity.RequiredReliability); Assert.IsNull(entity.GeneralResultFaultTreeIllustrationPointEntity); GrassCoverErosionInwardsDikeHeightOutputEntity dikeHeightEntity = entity.GrassCoverErosionInwardsDikeHeightOutputEntities.First(); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StructuresCalculationCreateExtensionsTest.cs =================================================================== diff -u -r3b741a615556cb874f09820d4cc28ceebe40538c -rbca00b0e437aeea92c5ef6fd0947ac64acf359cf --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StructuresCalculationCreateExtensionsTest.cs (.../StructuresCalculationCreateExtensionsTest.cs) (revision 3b741a615556cb874f09820d4cc28ceebe40538c) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StructuresCalculationCreateExtensionsTest.cs (.../StructuresCalculationCreateExtensionsTest.cs) (revision bca00b0e437aeea92c5ef6fd0947ac64acf359cf) @@ -43,7 +43,7 @@ public class StructuresCalculationCreateExtensionsTest { private static void AssertStructuresOutputEntity(StructuresOutput output, T outputEntity) - where T : IHasGeneralResultFaultTreeIllustrationPointEntity, IProbabilityAssessmentOutputEntity + where T : IHasGeneralResultFaultTreeIllustrationPointEntity, IStructuresOutputEntity { Assert.AreEqual(output.Reliability, outputEntity.Reliability); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StructuresOutputCreateExtensionsTest.cs =================================================================== diff -u -r339e1d134a2208f180b9f369d275cb98f9736a7c -rbca00b0e437aeea92c5ef6fd0947ac64acf359cf --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StructuresOutputCreateExtensionsTest.cs (.../StructuresOutputCreateExtensionsTest.cs) (revision 339e1d134a2208f180b9f369d275cb98f9736a7c) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StructuresOutputCreateExtensionsTest.cs (.../StructuresOutputCreateExtensionsTest.cs) (revision bca00b0e437aeea92c5ef6fd0947ac64acf359cf) @@ -93,7 +93,7 @@ GeneralResultEntityTestHelper.AssertGeneralResultPropertyValues(output.GeneralResult, entity.GeneralResultFaultTreeIllustrationPointEntity); } - private class TestStructureOutputEntity : IProbabilityAssessmentOutputEntity, + private class TestStructureOutputEntity : IStructuresOutputEntity, IHasGeneralResultFaultTreeIllustrationPointEntity { public GeneralResultFaultTreeIllustrationPointEntity GeneralResultFaultTreeIllustrationPointEntity { get; set; } Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo181IntegrationTest.cs =================================================================== diff -u -r9412472b340ac9877994ef7537801c9c270268a8 -rbca00b0e437aeea92c5ef6fd0947ac64acf359cf --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo181IntegrationTest.cs (.../MigrationTo181IntegrationTest.cs) (revision 9412472b340ac9877994ef7537801c9c270268a8) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo181IntegrationTest.cs (.../MigrationTo181IntegrationTest.cs) (revision bca00b0e437aeea92c5ef6fd0947ac64acf359cf) @@ -68,6 +68,10 @@ AssertMacroStabilityOutwardsFailureMechanism(reader); AssertPipingStructureFailureMechanism(reader); AssertWaveImpactAsphaltCoverFailureMechanism(reader); + AssertGrassCoverErosionInwardsOutput(reader, sourceFilePath); + AssertClosingStructuresOutput(reader, sourceFilePath); + AssertHeightStructuresOutput(reader, sourceFilePath); + AssertStabilityPointStructuresOutput(reader, sourceFilePath); } AssertLogDatabase(logFilePath); @@ -317,6 +321,64 @@ reader.AssertReturnedDataIsValid(validateWaveImpactAsphaltCoverFailureMechanism); } + private static void AssertGrassCoverErosionInwardsOutput(MigratedDatabaseReader reader, string sourceFilePath) + { + string validateGrassCoverErosionInwardsOutputEntities = + $"ATTACH DATABASE \"{sourceFilePath}\" AS SOURCEPROJECT; " + + "SELECT COUNT() = (SELECT COUNT() FROM [SOURCEPROJECT].GrassCoverErosionInwardsOutputEntity) " + + "FROM GrassCoverErosionInwardsOutputEntity NEW " + + "JOIN [SOURCEPROJECT].GrassCoverErosionInwardsOutputEntity OLD USING(GrassCoverErosionInwardsOutputEntityId) " + + "WHERE NEW.GrassCoverErosionInwardsCalculationEntityId = OLD.GrassCoverErosionInwardsCalculationEntityId " + + "AND NEW.GeneralResultFaultTreeIllustrationPointEntityId IS OLD.GeneralResultFaultTreeIllustrationPointEntityId " + + "AND NEW.IsOvertoppingDominant = OLD.IsOvertoppingDominant " + + "AND NEW.WaveHeight IS OLD.WaveHeight " + + "AND NEW.Reliability IS OLD.Reliability;" + + "DETACH DATABASE SOURCEPROJECT;"; + reader.AssertReturnedDataIsValid(validateGrassCoverErosionInwardsOutputEntities); + } + + private static void AssertClosingStructuresOutput(MigratedDatabaseReader reader, string sourceFilePath) + { + string validateClosingStructuresOutputEntities = + $"ATTACH DATABASE \"{sourceFilePath}\" AS SOURCEPROJECT; " + + "SELECT COUNT() = (SELECT COUNT() FROM [SOURCEPROJECT].ClosingStructuresOutputEntity) " + + "FROM ClosingStructuresOutputEntity NEW " + + "JOIN [SOURCEPROJECT].ClosingStructuresOutputEntity OLD USING(ClosingStructuresOutputEntityId) " + + "WHERE NEW.ClosingStructuresCalculationEntityId = OLD.ClosingStructuresCalculationEntityId " + + "AND NEW.GeneralResultFaultTreeIllustrationPointEntityId IS OLD.GeneralResultFaultTreeIllustrationPointEntityId " + + "AND NEW.Reliability IS OLD.Reliability;" + + "DETACH DATABASE SOURCEPROJECT;"; + reader.AssertReturnedDataIsValid(validateClosingStructuresOutputEntities); + } + + private static void AssertHeightStructuresOutput(MigratedDatabaseReader reader, string sourceFilePath) + { + string validateHeightStructuresOutputEntities = + $"ATTACH DATABASE \"{sourceFilePath}\" AS SOURCEPROJECT; " + + "SELECT COUNT() = (SELECT COUNT() FROM [SOURCEPROJECT].HeightStructuresOutputEntity) " + + "FROM HeightStructuresOutputEntity NEW " + + "JOIN [SOURCEPROJECT].HeightStructuresOutputEntity OLD USING(HeightStructuresOutputEntityId) " + + "WHERE NEW.HeightStructuresCalculationEntityId = OLD.HeightStructuresCalculationEntityId " + + "AND NEW.GeneralResultFaultTreeIllustrationPointEntityId IS OLD.GeneralResultFaultTreeIllustrationPointEntityId " + + "AND NEW.Reliability IS OLD.Reliability;" + + "DETACH DATABASE SOURCEPROJECT;"; + reader.AssertReturnedDataIsValid(validateHeightStructuresOutputEntities); + } + + private static void AssertStabilityPointStructuresOutput(MigratedDatabaseReader reader, string sourceFilePath) + { + string validateStabilityPointStructuresOutputEntities = + $"ATTACH DATABASE \"{sourceFilePath}\" AS SOURCEPROJECT; " + + "SELECT COUNT() = (SELECT COUNT() FROM [SOURCEPROJECT].StabilityPointStructuresOutputEntity) " + + "FROM StabilityPointStructuresOutputEntity NEW " + + "JOIN [SOURCEPROJECT].StabilityPointStructuresOutputEntity OLD ON OLD.StabilityPointStructuresOutputEntity = NEW.StabilityPointStructuresOutputEntityId " + + "WHERE NEW.StabilityPointStructuresCalculationEntityId = OLD.StabilityPointStructuresCalculationEntityId " + + "AND NEW.GeneralResultFaultTreeIllustrationPointEntityId IS OLD.GeneralResultFaultTreeIllustrationPointEntityId " + + "AND NEW.Reliability IS OLD.Reliability;" + + "DETACH DATABASE SOURCEPROJECT;"; + reader.AssertReturnedDataIsValid(validateStabilityPointStructuresOutputEntities); + } + #region Migrated Hydraulic Boundary Locations private static void AssertHydraulicBoundaryLocations(MigratedDatabaseReader reader, string sourceFilePath) @@ -423,7 +485,7 @@ reader.AssertReturnedDataIsValid(validateCalculation4Entities); } - private static void AssertWaveHeightCalculations(MigratedDatabaseReader reader, + private static void AssertWaveHeightCalculations(MigratedDatabaseReader reader, HydraulicLocationValidationQueryGenerator queryGenerator) { string validateCalculation5Entities = @@ -451,8 +513,6 @@ /// private class HydraulicLocationValidationQueryGenerator { - private readonly string sourceFilePath; - /// /// Enum to indicate the hydraulic location output types. /// @@ -486,6 +546,8 @@ SignalingNorm = 2 } + private readonly string sourceFilePath; + /// /// Creates a new instance of . /// Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputEntityReadExtensionsTest.cs =================================================================== diff -u -r9726c1ed2a69caa0792394721d1bcf6dc587f421 -rbca00b0e437aeea92c5ef6fd0947ac64acf359cf --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputEntityReadExtensionsTest.cs (.../GrassCoverErosionInwardsOutputEntityReadExtensionsTest.cs) (revision 9726c1ed2a69caa0792394721d1bcf6dc587f421) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputEntityReadExtensionsTest.cs (.../GrassCoverErosionInwardsOutputEntityReadExtensionsTest.cs) (revision bca00b0e437aeea92c5ef6fd0947ac64acf359cf) @@ -50,11 +50,7 @@ { WaveHeight = 1.1, IsOvertoppingDominant = Convert.ToByte(false), - Probability = 0.7, - RequiredProbability = 0.4, - RequiredReliability = 0.5, Reliability = 0.2, - FactorOfSafety = 9.5 }; // Call @@ -78,11 +74,7 @@ { WaveHeight = null, IsOvertoppingDominant = Convert.ToByte(true), - Probability = null, - RequiredProbability = null, - RequiredReliability = null, Reliability = null, - FactorOfSafety = null, GeneralResultFaultTreeIllustrationPointEntity = null }; @@ -113,11 +105,7 @@ { WaveHeight = null, IsOvertoppingDominant = Convert.ToByte(true), - Probability = null, - RequiredProbability = null, - RequiredReliability = null, Reliability = null, - FactorOfSafety = null, GeneralResultFaultTreeIllustrationPointEntity = generalResultEntity }; Index: build/DatabaseStructure.sql =================================================================== diff -u -rf0c02c8a606ab59690e05a782e622243e7632dd8 -rbca00b0e437aeea92c5ef6fd0947ac64acf359cf --- build/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision f0c02c8a606ab59690e05a782e622243e7632dd8) +++ build/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision bca00b0e437aeea92c5ef6fd0947ac64acf359cf) @@ -1,6 +1,6 @@ /* ---------------------------------------------------- */ /* Generated by Enterprise Architect Version 12.0 */ -/* Created On : 30-Jan-2018 17:15:23 */ +/* Created On : 01-Feb-2018 15:56:25 */ /* DBMS : SQLite */ /* ---------------------------------------------------- */ @@ -21,10 +21,10 @@ DROP TABLE IF EXISTS 'AssessmentSectionEntity' ; -DROP TABLE IF EXISTS 'FailureMechanismSectionEntity' +DROP TABLE IF EXISTS 'MacroStabilityOutwardsFailureMechanismMetaEntity' ; -DROP TABLE IF EXISTS 'MacroStabilityOutwardsFailureMechanismMetaEntity' +DROP TABLE IF EXISTS 'FailureMechanismSectionEntity' ; DROP TABLE IF EXISTS 'FailureMechanismEntity' @@ -51,27 +51,27 @@ DROP TABLE IF EXISTS 'PipingCalculationEntity' ; -DROP TABLE IF EXISTS 'StabilityPointStructuresFailureMechanismMetaEntity' -; - DROP TABLE IF EXISTS 'GrassCoverErosionInwardsFailureMechanismMetaEntity' ; -DROP TABLE IF EXISTS 'DuneErosionFailureMechanismMetaEntity' +DROP TABLE IF EXISTS 'StabilityPointStructuresFailureMechanismMetaEntity' ; DROP TABLE IF EXISTS 'GrassCoverErosionInwardsCalculationEntity' ; -DROP TABLE IF EXISTS 'GrassCoverErosionOutwardsFailureMechanismMetaEntity' +DROP TABLE IF EXISTS 'DuneErosionFailureMechanismMetaEntity' ; -DROP TABLE IF EXISTS 'HeightStructuresFailureMechanismMetaEntity' +DROP TABLE IF EXISTS 'GrassCoverErosionOutwardsFailureMechanismMetaEntity' ; DROP TABLE IF EXISTS 'PipingSoilLayerEntity' ; +DROP TABLE IF EXISTS 'HeightStructuresFailureMechanismMetaEntity' +; + DROP TABLE IF EXISTS 'PipingSoilProfileEntity' ; @@ -93,9 +93,6 @@ DROP TABLE IF EXISTS 'PipingStructureFailureMechanismMetaEntity' ; -DROP TABLE IF EXISTS 'PipingSemiProbabilisticOutputEntity' -; - DROP TABLE IF EXISTS 'PipingSectionResultEntity' ; @@ -129,10 +126,10 @@ DROP TABLE IF EXISTS 'MacroStabilityInwardsSectionResultEntity' ; -DROP TABLE IF EXISTS 'WaveImpactAsphaltCoverFailureMechanismMetaEntity' +DROP TABLE IF EXISTS 'MacroStabilityOutwardsSectionResultEntity' ; -DROP TABLE IF EXISTS 'MacroStabilityOutwardsSectionResultEntity' +DROP TABLE IF EXISTS 'WaveImpactAsphaltCoverFailureMechanismMetaEntity' ; DROP TABLE IF EXISTS 'WaveImpactAsphaltCoverSectionResultEntity' @@ -294,9 +291,6 @@ DROP TABLE IF EXISTS 'MacroStabilityInwardsPreconsolidationStressEntity' ; -DROP TABLE IF EXISTS 'MacroStabilityInwardsSemiProbabilisticOutputEntity' -; - DROP TABLE IF EXISTS 'MacroStabilityInwardsSoilProfileTwoDSoilLayerTwoDEntity' ; @@ -371,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, @@ -381,15 +384,6 @@ ) ; -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 'FailureMechanismEntity' ( 'FailureMechanismEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -586,17 +580,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 'GrassCoverErosionInwardsFailureMechanismMetaEntity' ( 'GrassCoverErosionInwardsFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -607,12 +590,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 ) ; @@ -644,24 +629,22 @@ ) ; -CREATE TABLE 'GrassCoverErosionOutwardsFailureMechanismMetaEntity' +CREATE TABLE 'DuneErosionFailureMechanismMetaEntity' ( - 'GrassCoverErosionOutwardsFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + 'DuneErosionFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, 'FailureMechanismEntityId' INTEGER NOT NULL, 'N' REAL NOT NULL, - 'ForeshoreProfileCollectionSourcePath' TEXT, - CONSTRAINT 'FK_GrassCoverErosionOutwardsFailureMechanismMetaEntity_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 ) ; -CREATE TABLE 'HeightStructuresFailureMechanismMetaEntity' +CREATE TABLE 'GrassCoverErosionOutwardsFailureMechanismMetaEntity' ( - 'HeightStructuresFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + 'GrassCoverErosionOutwardsFailureMechanismMetaEntityId' 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_GrassCoverErosionOutwardsFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade ) ; @@ -685,6 +668,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, @@ -774,30 +768,6 @@ ) ; -CREATE TABLE 'PipingSemiProbabilisticOutputEntity' -( - 'PipingSemiProbabilisticOutputEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, - 'PipingCalculationEntityId' INTEGER NOT NULL, - 'Order' INT (4) NOT NULL, - 'UpliftFactorOfSafety' REAL, - 'UpliftReliability' REAL, - 'UpliftProbability' REAL, - 'HeaveFactorOfSafety' REAL, - 'HeaveReliability' REAL, - 'HeaveProbability' REAL, - 'SellmeijerFactorOfSafety' REAL, - 'SellmeijerReliability' REAL, - 'SellmeijerProbability' REAL, - 'RequiredProbability' REAL, - 'RequiredReliability' REAL, - 'PipingProbability' REAL, - 'PipingReliability' REAL, - 'PipingFactorOfSafety' REAL, - CONSTRAINT 'FK_PipingSemiProbabilisticOutputEntity_PipingCalculationEntity' FOREIGN KEY ('PipingCalculationEntityId') REFERENCES 'PipingCalculationEntity' ('PipingCalculationEntityId') ON DELETE Cascade ON UPDATE Cascade, - CONSTRAINT 'U_PipingCalculationEntity' UNIQUE ('PipingCalculationEntityId') -) -; - CREATE TABLE 'PipingSectionResultEntity' ( 'PipingSectionResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -917,16 +887,6 @@ ) ; -CREATE TABLE 'WaveImpactAsphaltCoverFailureMechanismMetaEntity' -( - 'WaveImpactAsphaltCoverFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, - 'FailureMechanismEntityId' INTEGER NOT NULL, - 'ForeshoreProfileCollectionSourcePath' TEXT, - 'DeltaL' REAL NOT NULL, - CONSTRAINT 'FK_WaveImpactAsphaltCoverFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade -) -; - CREATE TABLE 'MacroStabilityOutwardsSectionResultEntity' ( 'MacroStabilityOutwardsSectionResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -938,6 +898,16 @@ ) ; +CREATE TABLE 'WaveImpactAsphaltCoverFailureMechanismMetaEntity' +( + 'WaveImpactAsphaltCoverFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + 'FailureMechanismEntityId' INTEGER NOT NULL, + 'ForeshoreProfileCollectionSourcePath' TEXT, + 'DeltaL' REAL NOT NULL, + 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, @@ -1034,11 +1004,7 @@ 'Order' INT (4) NOT NULL, 'IsOvertoppingDominant' TINYINT (1) NOT NULL, -- true or false 'WaveHeight' REAL, - 'RequiredProbability' REAL, - 'RequiredReliability' REAL, - 'Probability' REAL, 'Reliability' REAL, - 'FactorOfSafety' REAL, CONSTRAINT 'FK_GrassCoverErosionInwardsOutputEntity_GeneralResultFaultTreeIllustrationPointEntity' FOREIGN KEY ('GeneralResultFaultTreeIllustrationPointEntityId') REFERENCES 'GeneralResultFaultTreeIllustrationPointEntity' ('GeneralResultFaultTreeIllustrationPointEntityId') ON DELETE Set Null ON UPDATE Cascade, CONSTRAINT 'FK_GrassCoverErosionInwardsOutputEntity_GrassCoverErosionInwardsCalculationEntity' FOREIGN KEY ('GrassCoverErosionInwardsCalculationEntityId') REFERENCES 'GrassCoverErosionInwardsCalculationEntity' ('GrassCoverErosionInwardsCalculationEntityId') ON DELETE Cascade ON UPDATE Cascade, CONSTRAINT 'U_GrassCoverErosionInwardsCalculationEntity' UNIQUE ('GrassCoverErosionInwardsCalculationEntityId') @@ -1217,11 +1183,7 @@ 'HeightStructuresOutputEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, 'HeightStructuresCalculationEntityId' INTEGER NOT NULL, 'GeneralResultFaultTreeIllustrationPointEntityId' INTEGER, - 'RequiredProbability' REAL, - 'RequiredReliability' REAL, - 'Probability' REAL, 'Reliability' REAL, - 'FactorOfSafety' REAL, CONSTRAINT 'FK_HeightStructuresOutputEntity_GeneralResultFaultTreeIllustrationPointEntity' FOREIGN KEY ('GeneralResultFaultTreeIllustrationPointEntityId') REFERENCES 'GeneralResultFaultTreeIllustrationPointEntity' ('GeneralResultFaultTreeIllustrationPointEntityId') ON DELETE Set Null ON UPDATE Cascade, CONSTRAINT 'FK_HeightStructuresOutputEntity_HeightStructuresCalculationEntity' FOREIGN KEY ('HeightStructuresCalculationEntityId') REFERENCES 'HeightStructuresCalculationEntity' ('HeightStructuresCalculationEntityId') ON DELETE Cascade ON UPDATE Cascade, CONSTRAINT 'U_HeightStructuresCalculationEntity' UNIQUE ('HeightStructuresCalculationEntityId') @@ -1391,11 +1353,7 @@ 'ClosingStructuresOutputEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, 'ClosingStructuresCalculationEntityId' INTEGER NOT NULL, 'GeneralResultFaultTreeIllustrationPointEntityId' INTEGER, - 'RequiredProbability' REAL, - 'RequiredReliability' REAL, - 'Probability' REAL, 'Reliability' REAL, - 'FactorOfSafety' REAL, CONSTRAINT 'FK_ClosingStructuresOutputEntity_ClosingStructuresCalculationEntity' FOREIGN KEY ('ClosingStructuresCalculationEntityId') REFERENCES 'ClosingStructuresCalculationEntity' ('ClosingStructuresCalculationEntityId') ON DELETE Cascade ON UPDATE Cascade, CONSTRAINT 'FK_ClosingStructuresOutputEntity_GeneralResultFaultTreeIllustrationPointEntity' FOREIGN KEY ('GeneralResultFaultTreeIllustrationPointEntityId') REFERENCES 'GeneralResultFaultTreeIllustrationPointEntity' ('GeneralResultFaultTreeIllustrationPointEntityId') ON DELETE Set Null ON UPDATE Cascade, CONSTRAINT 'U_ClosingStructuresCalculationEntity' UNIQUE ('ClosingStructuresCalculationEntityId') @@ -1462,14 +1420,10 @@ CREATE TABLE 'StabilityPointStructuresOutputEntity' ( - 'StabilityPointStructuresOutputEntity' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + 'StabilityPointStructuresOutputEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, 'StabilityPointStructuresCalculationEntityId' INTEGER NOT NULL, 'GeneralResultFaultTreeIllustrationPointEntityId' INTEGER, - 'RequiredProbability' REAL, - 'RequiredReliability' REAL, - 'Probability' REAL, 'Reliability' REAL, - 'FactorOfSafety' REAL, CONSTRAINT 'FK_StabilityPointStructuresOutputEntity_GeneralResultFaultTreeIllustrationPointEntity' FOREIGN KEY ('GeneralResultFaultTreeIllustrationPointEntityId') REFERENCES 'GeneralResultFaultTreeIllustrationPointEntity' ('GeneralResultFaultTreeIllustrationPointEntityId') ON DELETE Set Null ON UPDATE Cascade, CONSTRAINT 'FK_StabilityPointStructuresOutputEntity_StabilityPointStructuresCalculationEntity' FOREIGN KEY ('StabilityPointStructuresCalculationEntityId') REFERENCES 'StabilityPointStructuresCalculationEntity' ('StabilityPointStructuresCalculationEntityId') ON DELETE Cascade ON UPDATE Cascade, CONSTRAINT 'U_StabilityPointStructuresCalculationEntity' UNIQUE ('StabilityPointStructuresCalculationEntityId') @@ -1955,20 +1909,6 @@ ) ; -CREATE TABLE 'MacroStabilityInwardsSemiProbabilisticOutputEntity' -( - 'MacroStabilityInwardsSemiProbabilisticOutputEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, - 'MacroStabilityInwardsCalculationEntityId' INTEGER NOT NULL, - 'FactorOfStability' REAL, - 'RequiredProbability' REAL, - 'RequiredReliability' REAL, - 'MacroStabilityInwardsProbability' REAL, - 'MacroStabilityInwardsReliability' REAL, - 'MacroStabilityInwardsFactorOfSafety' REAL, - CONSTRAINT 'FK_MacroStabilityInwardsSemiProbabilisticOutputEntity_MacroStabilityInwardsCalculationEntity' FOREIGN KEY ('MacroStabilityInwardsCalculationEntityId') REFERENCES 'MacroStabilityInwardsCalculationEntity' ('MacroStabilityInwardsCalculationEntityId') ON DELETE Cascade ON UPDATE Cascade -) -; - CREATE TABLE 'MacroStabilityInwardsSoilProfileTwoDSoilLayerTwoDEntity' ( 'MacroStabilityInwardsSoilProfileTwoDEntityId' INTEGER NOT NULL, @@ -2025,14 +1965,14 @@ ON 'AssessmentSectionEntity' ('ProjectEntityId' ASC) ; -CREATE INDEX 'IXFK_FailureMechanismSectionEntity_FailureMechanismEntity' - ON 'FailureMechanismSectionEntity' ('FailureMechanismEntityId' 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) ; @@ -2220,16 +2160,12 @@ ON 'PipingCalculationEntity' ('CalculationGroupEntityId' ASC) ; -CREATE INDEX 'IXFK_StrengthStabilityPointConstructionFailureMechanismMetaEntity_FailureMechanismEntity' - ON 'StabilityPointStructuresFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC) -; - CREATE INDEX 'IXFK_GrassCoverErosionInwardsFailureMechanismMetaEntity_FailureMechanismEntity' 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' @@ -2244,6 +2180,10 @@ ON 'GrassCoverErosionInwardsCalculationEntity' ('HydraulicLocationEntityId' ASC) ; +CREATE INDEX 'IXFK_DuneErosionFailureMechanismMetaEntity_FailureMechanismEntity' + ON 'DuneErosionFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC) +; + CREATE INDEX 'IXFK_GrassCoverErosionOutwardsFailureMechanismMetaEntity_FailureMechanismEntity' ON 'GrassCoverErosionOutwardsFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC) ; @@ -2280,10 +2220,6 @@ ON 'PipingStructureFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC) ; -CREATE INDEX 'IXFK_PipingSemiProbabilisticOutputEntity_PipingCalculationEntity' - ON 'PipingSemiProbabilisticOutputEntity' ('PipingCalculationEntityId' ASC) -; - CREATE INDEX 'IXFK_PipingSectionResultEntity_FailureMechanismSectionEntity' ON 'PipingSectionResultEntity' ('FailureMechanismSectionEntityId' ASC) ; @@ -2340,14 +2276,14 @@ ON 'MacroStabilityInwardsSectionResultEntity' ('FailureMechanismSectionEntityId' ASC) ; -CREATE INDEX 'IXFK_WaveImpactAsphaltCoverFailureMechanismMetaEntity_FailureMechanismEntity' - ON 'WaveImpactAsphaltCoverFailureMechanismMetaEntity' ('FailureMechanismEntityId' 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) ; Index: design/DatabaseDesign.eap =================================================================== diff -u -rf0c02c8a606ab59690e05a782e622243e7632dd8 -rbca00b0e437aeea92c5ef6fd0947ac64acf359cf Binary files differ