Index: Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/DatabaseStructure21.1.sql =================================================================== diff -u -re38c008871f9e763f7f3c1b2dbdf7c15cd9f3e94 -rbfac6a6e9a2fd50b24af4aac9f7c21249aaedb81 --- Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/DatabaseStructure21.1.sql (.../DatabaseStructure21.1.sql) (revision e38c008871f9e763f7f3c1b2dbdf7c15cd9f3e94) +++ Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/DatabaseStructure21.1.sql (.../DatabaseStructure21.1.sql) (revision bfac6a6e9a2fd50b24af4aac9f7c21249aaedb81) @@ -1,6 +1,6 @@ /* ---------------------------------------------------- */ /* Generated by Enterprise Architect Version 14.1 */ -/* Created On : 11-nov-2021 07:48:54 */ +/* Created On : 08-feb-2021 09:53:06 */ /* DBMS : SQLite */ /* ---------------------------------------------------- */ @@ -30,10 +30,10 @@ DROP TABLE IF EXISTS 'HydraulicLocationEntity' ; -DROP TABLE IF EXISTS 'SemiProbabilisticPipingCalculationEntity' +DROP TABLE IF EXISTS 'GrassCoverErosionInwardsFailureMechanismMetaEntity' ; -DROP TABLE IF EXISTS 'GrassCoverErosionInwardsFailureMechanismMetaEntity' +DROP TABLE IF EXISTS 'SemiProbabilisticPipingCalculationEntity' ; DROP TABLE IF EXISTS 'GrassCoverErosionInwardsCalculationEntity' @@ -42,10 +42,10 @@ DROP TABLE IF EXISTS 'GrassCoverErosionOutwardsFailureMechanismMetaEntity' ; -DROP TABLE IF EXISTS 'PipingSoilProfileEntity' +DROP TABLE IF EXISTS 'PipingSoilLayerEntity' ; -DROP TABLE IF EXISTS 'PipingSoilLayerEntity' +DROP TABLE IF EXISTS 'PipingSoilProfileEntity' ; DROP TABLE IF EXISTS 'PipingStochasticSoilProfileEntity' @@ -90,10 +90,10 @@ DROP TABLE IF EXISTS 'DuneErosionSectionResultEntity' ; -DROP TABLE IF EXISTS 'DuneLocationCalculationEntity' +DROP TABLE IF EXISTS 'DuneLocationCalculationCollectionEntity' ; -DROP TABLE IF EXISTS 'DuneLocationCalculationForTargetProbabilityCollectionEntity' +DROP TABLE IF EXISTS 'DuneLocationCalculationEntity' ; DROP TABLE IF EXISTS 'DuneLocationCalculationOutputEntity' @@ -102,9 +102,6 @@ DROP TABLE IF EXISTS 'DuneLocationEntity' ; -DROP TABLE IF EXISTS 'FailureMechanismFailureMechanismSectionEntity' -; - DROP TABLE IF EXISTS 'FaultTreeIllustrationPointEntity' ; @@ -177,18 +174,9 @@ DROP TABLE IF EXISTS 'HydraulicLocationCalculationCollectionEntity' ; -DROP TABLE IF EXISTS 'HydraulicLocationCalculationCollectionHydraulicLocationCalculationEntity' -; - DROP TABLE IF EXISTS 'HydraulicLocationCalculationEntity' ; -DROP TABLE IF EXISTS 'HydraulicLocationCalculationForTargetProbabilityCollectionEntity' -; - -DROP TABLE IF EXISTS 'HydraulicLocationCalculationForTargetProbabilityCollectionHydraulicLocationCalculationEntity' -; - DROP TABLE IF EXISTS 'HydraulicLocationOutputEntity' ; @@ -261,12 +249,6 @@ DROP TABLE IF EXISTS 'SemiProbabilisticPipingCalculationOutputEntity' ; -DROP TABLE IF EXISTS 'SpecificFailurePathEntity' -; - -DROP TABLE IF EXISTS 'SpecificFailurePathFailureMechanismSectionEntity' -; - DROP TABLE IF EXISTS 'StabilityPointStructureEntity' ; @@ -349,8 +331,14 @@ ( 'AssessmentSectionEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, 'ProjectEntityId' INTEGER NOT NULL, - 'HydraulicLocationCalculationCollectionEntity1Id' INTEGER NOT NULL, -- Represents the design water level signaling norm - 'HydraulicLocationCalculationCollectionEntity2Id' INTEGER NOT NULL, -- Represents the design water level lower limit norm + 'HydraulicLocationCalculationCollectionEntity1Id' INTEGER NOT NULL, -- Represents the design water level factorized signaling norm + 'HydraulicLocationCalculationCollectionEntity2Id' INTEGER NOT NULL, -- Represents the design water level signaling norm + 'HydraulicLocationCalculationCollectionEntity3Id' INTEGER NOT NULL, -- Represents the design water level lower limit norm + 'HydraulicLocationCalculationCollectionEntity4Id' INTEGER NOT NULL, -- Represents the design water level factorized lower limit norm + 'HydraulicLocationCalculationCollectionEntity5Id' INTEGER NOT NULL, -- Represents the wave height factorized signaling norm + 'HydraulicLocationCalculationCollectionEntity6Id' INTEGER NOT NULL, -- Represents the wave height signaling norm + 'HydraulicLocationCalculationCollectionEntity7Id' INTEGER NOT NULL, -- Represents the wave height lower limit norm + 'HydraulicLocationCalculationCollectionEntity8Id' INTEGER NOT NULL, -- Represents the wave height factorized lower limit norm 'Id' TEXT NULL, 'Name' VARCHAR (260) NULL, 'Comments' TEXT NULL, @@ -362,9 +350,21 @@ 'Order' INT (4) NOT NULL, CONSTRAINT 'FK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity1' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntity1Id') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade, CONSTRAINT 'FK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity2' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntity2Id') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade, + CONSTRAINT 'FK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity3' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntity3Id') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade, + CONSTRAINT 'FK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity4' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntity4Id') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade, + CONSTRAINT 'FK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity5' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntity5Id') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade, + CONSTRAINT 'FK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity6' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntity6Id') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade, + CONSTRAINT 'FK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity7' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntity7Id') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade, + CONSTRAINT 'FK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity8' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntity8Id') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade, CONSTRAINT 'FK_AssessmentSectionEntity_ProjectEntity' FOREIGN KEY ('ProjectEntityId') REFERENCES 'ProjectEntity' ('ProjectEntityId') ON DELETE Cascade ON UPDATE Cascade, CONSTRAINT 'U_HydraulicLocationCalculationCollectionEntity1Id' UNIQUE ('HydraulicLocationCalculationCollectionEntity1Id'), - CONSTRAINT 'U_HydraulicLocationCalculationCollectionEntity2Id' UNIQUE ('HydraulicLocationCalculationCollectionEntity2Id') + CONSTRAINT 'U_HydraulicLocationCalculationCollectionEntity2Id' UNIQUE ('HydraulicLocationCalculationCollectionEntity2Id'), + CONSTRAINT 'U_HydraulicLocationCalculationCollectionEntity3Id' UNIQUE ('HydraulicLocationCalculationCollectionEntity3Id'), + CONSTRAINT 'U_HydraulicLocationCalculationCollectionEntity4Id' UNIQUE ('HydraulicLocationCalculationCollectionEntity4Id'), + CONSTRAINT 'U_HydraulicLocationCalculationCollectionEntity5Id' UNIQUE ('HydraulicLocationCalculationCollectionEntity5Id'), + CONSTRAINT 'U_HydraulicLocationCalculationCollectionEntity6Id' UNIQUE ('HydraulicLocationCalculationCollectionEntity6Id'), + CONSTRAINT 'U_HydraulicLocationCalculationCollectionEntity7Id' UNIQUE ('HydraulicLocationCalculationCollectionEntity7Id'), + CONSTRAINT 'U_HydraulicLocationCalculationCollectionEntity8Id' UNIQUE ('HydraulicLocationCalculationCollectionEntity8Id') ) ; @@ -374,12 +374,11 @@ 'AssessmentSectionEntityId' INTEGER NOT NULL, 'CalculationGroupEntityId' INTEGER NULL, 'FailureMechanismType' SMALLINT NOT NULL, -- Enum: 1 = Piping, 2 = Macrostabiliteit binnenwaarts, 3= Golfklappen op asfaltbekleding, 4= Grasbekleding erosie buitentalud, 5 = Grasbekleding afschuiven buitentalud, 6 = Grasbekleding erosie kruin en binnentalud, 7 = Stabiliteit steenzetting, 8 = Duinafslag, 9 = Hoogte kunstwerk, 10 = Betrouwbaarheid sluiten kunstwerk, 11 = Piping bij kunstwerk, 12 = Sterkte en stabiliteit puntconstructires, 13 = Macrostabiliteit buitenwaarts, 14 = Microstabiliteit, 15 = Wateroverdruk bij asfaltbekleding, 16 = Grasbekleding afschuiven binnentalud, 17 = Sterkte en stabiliteit langsconstructires, 18 = Technische innovaties - 'InAssembly' TINYINT (1) NOT NULL, -- true or false + 'IsRelevant' TINYINT (1) NOT NULL, -- true or false 'FailureMechanismSectionCollectionSourcePath' TEXT NULL, - 'InAssemblyInputComments' TEXT NULL, - 'InAssemblyOutputComments' TEXT NULL, - 'NotInAssemblyComments' TEXT NULL, - 'CalculationsInputComments' TEXT NULL, + 'InputComments' TEXT NULL, + 'OutputComments' TEXT NULL, + 'NotRelevantComments' TEXT NULL, 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') @@ -389,8 +388,10 @@ CREATE TABLE 'FailureMechanismSectionEntity' ( 'FailureMechanismSectionEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + 'FailureMechanismEntityId' INTEGER NOT NULL, 'Name' VARCHAR (260) NOT NULL, - 'FailureMechanismSectionPointXml' TEXT NOT NULL + 'FailureMechanismSectionPointXml' TEXT NOT NULL, + CONSTRAINT 'FK_FailureMechanismSectionEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade ) ; @@ -428,6 +429,16 @@ ) ; +CREATE TABLE 'GrassCoverErosionInwardsFailureMechanismMetaEntity' +( + 'GrassCoverErosionInwardsFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + 'FailureMechanismEntityId' INTEGER NOT NULL, + 'N' REAL NOT NULL, + 'DikeProfileCollectionSourcePath' TEXT NULL, + CONSTRAINT 'FK_GrassCoverErosionInwardsFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade +) +; + CREATE TABLE 'SemiProbabilisticPipingCalculationEntity' ( 'SemiProbabilisticPipingCalculationEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -455,16 +466,6 @@ ) ; -CREATE TABLE 'GrassCoverErosionInwardsFailureMechanismMetaEntity' -( - 'GrassCoverErosionInwardsFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, - 'FailureMechanismEntityId' INTEGER NOT NULL, - 'N' REAL NOT NULL, - 'DikeProfileCollectionSourcePath' TEXT NULL, - CONSTRAINT 'FK_GrassCoverErosionInwardsFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade -) -; - CREATE TABLE 'GrassCoverErosionInwardsCalculationEntity' ( 'GrassCoverErosionInwardsCalculationEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -478,17 +479,15 @@ 'CriticalFlowRateMean' REAL NULL, 'CriticalFlowRateStandardDeviation' REAL NULL, 'UseForeshore' TINYINT (1) NOT NULL, -- true or false + 'DikeHeightCalculationType' TINYINT (1) NOT NULL, -- Enum: 1 = NoCalculation, 2 = CalculateByAssessmentSectionNorm, 3 = CalculateByProfileSpecificRequiredProbability 'DikeHeight' REAL NULL, 'UseBreakWater' TINYINT (1) NOT NULL, -- true or false 'BreakWaterType' TINYINT (1) NOT NULL, -- Enum: 1 = Wall, 2 = Caisson, 3 = Dam 'BreakWaterHeight' REAL NULL, - 'ShouldOvertoppingOutputIllustrationPointsBeCalculated' TINYINT (1) NOT NULL, -- true or false - 'ShouldDikeHeightBeCalculated' TINYINT (1) NOT NULL, -- true or false - 'DikeHeightTargetProbability' REAL NOT NULL, + 'OvertoppingRateCalculationType' TINYINT (1) NOT NULL, -- Enum: 1 = NoCalculation, 2 = CalculateByAssessmentSectionNorm, 3 = CalculateByProfileSpecificRequiredProbability 'ShouldDikeHeightIllustrationPointsBeCalculated' TINYINT (1) NOT NULL, -- true or false - 'ShouldOvertoppingRateBeCalculated' TINYINT (1) NOT NULL, -- true or false - 'OvertoppingRateTargetProbability' REAL NOT NULL, 'ShouldOvertoppingRateIllustrationPointsBeCalculated' TINYINT (1) NOT NULL, -- true or false + 'ShouldOvertoppingOutputIllustrationPointsBeCalculated' TINYINT (1) NOT NULL, -- true or false 'RelevantForScenario' TINYINT (1) NOT NULL, -- true or false 'ScenarioContribution' REAL NOT NULL, CONSTRAINT 'FK_GrassCoverErosionInwardsCalculationEntity_CalculationGroupEntity' FOREIGN KEY ('CalculationGroupEntityId') REFERENCES 'CalculationGroupEntity' ('CalculationGroupEntityId') ON DELETE Cascade ON UPDATE Cascade, @@ -501,21 +500,30 @@ ( 'GrassCoverErosionOutwardsFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, 'FailureMechanismEntityId' INTEGER NOT NULL, + 'HydraulicLocationCalculationCollectionEntity1Id' INTEGER NOT NULL, -- Represents the design water level failure mechanism specific factorized signaling norm + 'HydraulicLocationCalculationCollectionEntity2Id' INTEGER NOT NULL, -- Represents the design water level failure mechanism specific signaling norm + 'HydraulicLocationCalculationCollectionEntity3Id' INTEGER NOT NULL, -- Represents the design water level failure mechanism specific lower limit norm + 'HydraulicLocationCalculationCollectionEntity4Id' INTEGER NOT NULL, -- Represents the wave height failure mechanism specific factorized signaling norm + 'HydraulicLocationCalculationCollectionEntity5Id' INTEGER NOT NULL, -- Represents the wave height failure mechanism specific signaling norm + 'HydraulicLocationCalculationCollectionEntity6Id' INTEGER NOT NULL, -- Represents the wave height failure mechanism specific lower limit norm 'N' REAL NOT NULL, 'ForeshoreProfileCollectionSourcePath' TEXT NULL, - CONSTRAINT 'FK_GrassCoverErosionOutwardsFailureMechanismMetaEntity_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, + CONSTRAINT 'FK_GrassCoverErosionOutwardsFailureMechanismMetaEntity_HydraulicLocationCalculationCollectionEntity1' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntity1Id') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade, + CONSTRAINT 'FK_GrassCoverErosionOutwardsFailureMechanismMetaEntity_HydraulicLocationCalculationCollectionEntity2' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntity2Id') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade, + CONSTRAINT 'FK_GrassCoverErosionOutwardsFailureMechanismMetaEntity_HydraulicLocationCalculationCollectionEntity3' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntity3Id') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade, + CONSTRAINT 'FK_GrassCoverErosionOutwardsFailureMechanismMetaEntity_HydraulicLocationCalculationCollectionEntity4' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntity4Id') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade, + CONSTRAINT 'FK_GrassCoverErosionOutwardsFailureMechanismMetaEntity_HydraulicLocationCalculationCollectionEntity5' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntity5Id') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade, + CONSTRAINT 'FK_GrassCoverErosionOutwardsFailureMechanismMetaEntity_HydraulicLocationCalculationCollectionEntity6' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntity6Id') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade, + CONSTRAINT 'U_HydraulicLocationCalculationCollectionEntity1Id' UNIQUE ('HydraulicLocationCalculationCollectionEntity1Id'), + CONSTRAINT 'U_HydraulicLocationCalculationCollectionEntity2Id' UNIQUE ('HydraulicLocationCalculationCollectionEntity2Id'), + CONSTRAINT 'U_HydraulicLocationCalculationCollectionEntity3Id' UNIQUE ('HydraulicLocationCalculationCollectionEntity3Id'), + CONSTRAINT 'U_HydraulicLocationCalculationCollectionEntity4Id' UNIQUE ('HydraulicLocationCalculationCollectionEntity4Id'), + CONSTRAINT 'U_HydraulicLocationCalculationCollectionEntity5Id' UNIQUE ('HydraulicLocationCalculationCollectionEntity5Id'), + CONSTRAINT 'U_HydraulicLocationCalculationCollectionEntity6Id' UNIQUE ('HydraulicLocationCalculationCollectionEntity6Id') ) ; -CREATE TABLE 'PipingSoilProfileEntity' -( - 'PipingSoilProfileEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, - 'Bottom' REAL NULL, - 'Name' TEXT NOT NULL, - 'SourceType' TINYINT (1) NOT NULL -- Enum: 1 = SoilProfile1D, 2 = SoilProfile2D -) -; - CREATE TABLE 'PipingSoilLayerEntity' ( 'PipingSoilLayerEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -536,6 +544,15 @@ ) ; +CREATE TABLE 'PipingSoilProfileEntity' +( + 'PipingSoilProfileEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + 'Bottom' REAL NULL, + 'Name' TEXT NOT NULL, + 'SourceType' TINYINT (1) NOT NULL -- Enum: 1 = SoilProfile1D, 2 = SoilProfile2D +) +; + CREATE TABLE 'PipingStochasticSoilProfileEntity' ( 'PipingStochasticSoilProfileEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -764,7 +781,17 @@ ( 'DuneErosionFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, 'FailureMechanismEntityId' INTEGER NOT NULL, + 'DuneLocationCalculationCollectionEntity1Id' INTEGER NOT NULL, -- Represents the calculations for the failure mechanism specific factorized signaling norm + 'DuneLocationCalculationCollectionEntity2Id' INTEGER NOT NULL, -- Represents the calculations for the failure mechanism specific signaling norm + 'DuneLocationCalculationCollectionEntity3Id' INTEGER NOT NULL, -- Represents the calculations for the failure mechanism specific lower limit norm + 'DuneLocationCalculationCollectionEntity4Id' INTEGER NOT NULL, -- Represents the calculations for the lower limit norm + 'DuneLocationCalculationCollectionEntity5Id' INTEGER NOT NULL, -- Represents the calculations for the factorized lower limit norm 'N' REAL NOT NULL, + CONSTRAINT 'FK_DuneErosionFailureMechanismMetaEntity_DuneLocationCalculationCollectionEntity1' FOREIGN KEY ('DuneLocationCalculationCollectionEntity1Id') REFERENCES 'DuneLocationCalculationCollectionEntity' ('DuneLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade, + CONSTRAINT 'FK_DuneErosionFailureMechanismMetaEntity_DuneLocationCalculationCollectionEntity2' FOREIGN KEY ('DuneLocationCalculationCollectionEntity2Id') REFERENCES 'DuneLocationCalculationCollectionEntity' ('DuneLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade, + CONSTRAINT 'FK_DuneErosionFailureMechanismMetaEntity_DuneLocationCalculationCollectionEntity3' FOREIGN KEY ('DuneLocationCalculationCollectionEntity3Id') REFERENCES 'DuneLocationCalculationCollectionEntity' ('DuneLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade, + CONSTRAINT 'FK_DuneErosionFailureMechanismMetaEntity_DuneLocationCalculationCollectionEntity4' FOREIGN KEY ('DuneLocationCalculationCollectionEntity4Id') REFERENCES 'DuneLocationCalculationCollectionEntity' ('DuneLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade, + CONSTRAINT 'FK_DuneErosionFailureMechanismMetaEntity_DuneLocationCalculationCollectionEntity5' FOREIGN KEY ('DuneLocationCalculationCollectionEntity5Id') REFERENCES 'DuneLocationCalculationCollectionEntity' ('DuneLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade, CONSTRAINT 'FK_DuneErosionFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade ) ; @@ -786,23 +813,19 @@ ) ; -CREATE TABLE 'DuneLocationCalculationEntity' +CREATE TABLE 'DuneLocationCalculationCollectionEntity' ( - 'DuneLocationCalculationEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, - 'DuneLocationEntityId' INTEGER NOT NULL, - 'DuneLocationCalculationForTargetProbabilityCollectionEntityId' INTEGER NOT NULL, - CONSTRAINT 'FK_DuneLocationCalculationEntity_DuneLocationCalculationCollectionEntity' FOREIGN KEY ('DuneLocationCalculationForTargetProbabilityCollectionEntityId') REFERENCES 'DuneLocationCalculationForTargetProbabilityCollectionEntity' ('DuneLocationCalculationCollectionEntityId') ON DELETE Cascade ON UPDATE Cascade, - CONSTRAINT 'FK_DuneLocationCalculationEntity_DuneLocationEntity' FOREIGN KEY ('DuneLocationEntityId') REFERENCES 'DuneLocationEntity' ('DuneLocationEntityId') ON DELETE Cascade ON UPDATE Cascade + 'DuneLocationCalculationCollectionEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT ) ; -CREATE TABLE 'DuneLocationCalculationForTargetProbabilityCollectionEntity' +CREATE TABLE 'DuneLocationCalculationEntity' ( - 'DuneLocationCalculationCollectionEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, - 'DuneErosionFailureMechanismMetaEntityId' INTEGER NOT NULL, - 'Order' INT (4) NOT NULL, - 'TargetProbability' REAL NOT NULL, - CONSTRAINT 'FK_DuneLocationCalculationForTargetProbabilityCollectionEntity_DuneErosionFailureMechanismMetaEntity' FOREIGN KEY ('DuneErosionFailureMechanismMetaEntityId') REFERENCES 'DuneErosionFailureMechanismMetaEntity' ('DuneErosionFailureMechanismMetaEntityId') ON DELETE Cascade ON UPDATE Cascade + 'DuneLocationCalculationEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + 'DuneLocationEntityId' INTEGER NULL, + 'DuneLocationCalculationCollectionEntityId' INTEGER NULL, + CONSTRAINT 'FK_DuneLocationCalculationEntity_DuneLocationCalculationCollectionEntity' FOREIGN KEY ('DuneLocationCalculationCollectionEntityId') REFERENCES 'DuneLocationCalculationCollectionEntity' ('DuneLocationCalculationCollectionEntityId') ON DELETE Cascade ON UPDATE Cascade, + CONSTRAINT 'FK_DuneLocationCalculationEntity_DuneLocationEntity' FOREIGN KEY ('DuneLocationEntityId') REFERENCES 'DuneLocationEntity' ('DuneLocationEntityId') ON DELETE Cascade ON UPDATE Cascade ) ; @@ -839,16 +862,6 @@ ) ; -CREATE TABLE 'FailureMechanismFailureMechanismSectionEntity' -( - 'FailureMechanismEntityId' INTEGER NOT NULL, - 'FailureMechanismSectionEntityId' INTEGER NOT NULL, - CONSTRAINT 'PK_FailureMechanismFailureMechanismSectionEntity' PRIMARY KEY ('FailureMechanismSectionEntityId','FailureMechanismEntityId'), - CONSTRAINT 'FK_FailureMechanismFailureMechanismSectionEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade, - CONSTRAINT 'FK_FailureMechanismFailureMechanismSectionEntity_FailureMechanismSectionEntity' FOREIGN KEY ('FailureMechanismSectionEntityId') REFERENCES 'FailureMechanismSectionEntity' ('FailureMechanismSectionEntityId') ON DELETE Cascade ON UPDATE Cascade -) -; - CREATE TABLE 'FaultTreeIllustrationPointEntity' ( 'FaultTreeIllustrationPointEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -1022,7 +1035,6 @@ 'CalculationGroupEntityId' INTEGER NOT NULL, 'ForeshoreProfileEntityId' INTEGER NULL, 'HydraulicLocationEntityId' INTEGER NULL, - 'HydraulicLocationCalculationForTargetProbabilityCollectionEntityId' INTEGER NULL, 'Order' INT (4) NOT NULL, 'Name' VARCHAR (260) NULL, 'Comments' TEXT NULL, @@ -1036,11 +1048,10 @@ 'UpperBoundaryWaterLevels' REAL NULL, 'LowerBoundaryWaterLevels' REAL NULL, 'StepSize' TINYINT (1) NOT NULL, -- Enum: 1 = 0.5, 2 = 1.0, 3 = 2.0 + 'CategoryType' TINYINT (1) NOT NULL, -- Enum: 1 = MechanismSpecificFactorizedSignalingNorm, 2 = MechanismSpecificSignalingNorm, 3 = MechanismSpecificLowerLimitNorm, 4 = LowerLimitNorm, 5 = FactorizedLowerLimitNorm 'CalculationType' TINYINT (1) NOT NULL, -- Enum: 1 = WaveRunUp 2 = WaveImpact 3 = WaveRunUpAndWaveImpact 4 = TailorMadeWaveImpact 5 = WaveRunUpAndTailorMadeWaveImpact 6 = All - 'WaterLevelType' TINYINT (1) NOT NULL, -- Enum: 1 = None, 2 = LowerLimit, 3 = Signaling, 4 = UserDefinedTargetProbability CONSTRAINT 'FK_GrassCoverErosionOutwardsWaveConditionsCalculationEntity_CalculationGroupEntity' FOREIGN KEY ('CalculationGroupEntityId') REFERENCES 'CalculationGroupEntity' ('CalculationGroupEntityId') ON DELETE Cascade ON UPDATE Cascade, CONSTRAINT 'FK_GrassCoverErosionOutwardsWaveConditionsCalculationEntity_ForeshoreProfileEntity' FOREIGN KEY ('ForeshoreProfileEntityId') REFERENCES 'ForeshoreProfileEntity' ('ForeshoreProfileEntityId') ON DELETE Set Null ON UPDATE Cascade, - CONSTRAINT 'FK_GrassCoverErosionOutwardsWaveConditionsCalculationEntity_HydraulicLocationCalculationForTargetProbabilityCollectionEntity' FOREIGN KEY ('HydraulicLocationCalculationForTargetProbabilityCollectionEntityId') REFERENCES 'HydraulicLocationCalculationForTargetProbabilityCollectionEntity' ('HydraulicLocationCalculationForTargetProbabilityCollectionEntityId') ON DELETE Set Null ON UPDATE Cascade, CONSTRAINT 'FK_GrassCoverErosionOutwardsWaveConditionsCalculationEntity_HydraulicLocationEntity' FOREIGN KEY ('HydraulicLocationEntityId') REFERENCES 'HydraulicLocationEntity' ('HydraulicLocationEntityId') ON DELETE Set Null ON UPDATE Cascade ) ; @@ -1224,46 +1235,17 @@ ) ; -CREATE TABLE 'HydraulicLocationCalculationCollectionHydraulicLocationCalculationEntity' -( - 'HydraulicLocationCalculationCollectionEntityId' INTEGER NOT NULL, - 'HydraulicLocationCalculationEntityId' INTEGER NOT NULL, - CONSTRAINT 'PK_HydraulicLocationCalculationCollectionHydraulicLocationCalculationEntity' PRIMARY KEY ('HydraulicLocationCalculationCollectionEntityId','HydraulicLocationCalculationEntityId'), - CONSTRAINT 'HydraulicLocationCalculationCollectionHydraulicLocationCalculationEntity_HydraulicLocationCalculationCollectionEntityId' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntityId') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE Cascade ON UPDATE Cascade, - CONSTRAINT 'HydraulicLocationCalculationEntityId' FOREIGN KEY ('HydraulicLocationCalculationEntityId') REFERENCES 'HydraulicLocationCalculationEntity' ('HydraulicLocationCalculationEntityId') ON DELETE Cascade ON UPDATE Cascade -) -; - CREATE TABLE 'HydraulicLocationCalculationEntity' ( 'HydraulicLocationCalculationEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, 'HydraulicLocationEntityId' INTEGER NOT NULL, + 'HydraulicLocationCalculationCollectionEntityId' INTEGER NOT NULL, 'ShouldIllustrationPointsBeCalculated' TINYINT (1) NOT NULL, -- True or false + CONSTRAINT 'FK_HydraulicLocationCalculationEntity_HydraulicLocationCalculationCollectionEntity' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntityId') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE Cascade ON UPDATE Cascade, CONSTRAINT 'FK_HydraulicLocationCalculationEntity_HydraulicLocationEntity' FOREIGN KEY ('HydraulicLocationEntityId') REFERENCES 'HydraulicLocationEntity' ('HydraulicLocationEntityId') ON DELETE Cascade ON UPDATE Cascade ) ; -CREATE TABLE 'HydraulicLocationCalculationForTargetProbabilityCollectionEntity' -( - 'HydraulicLocationCalculationForTargetProbabilityCollectionEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, - 'AssessmentSectionEntityId' INTEGER NOT NULL, - 'Order' INT (4) NOT NULL, - 'HydraulicBoundaryLocationCalculationType' TINYINT (1) NOT NULL, -- Enum: 1 = Waterlevel 2 = Waveheight - 'TargetProbability' REAL NOT NULL, - CONSTRAINT 'FK_HydraulicBoundaryLocationCalculationsForTargetProbabilityEntity_AssessmentSectionEntity' FOREIGN KEY ('AssessmentSectionEntityId') REFERENCES 'AssessmentSectionEntity' ('AssessmentSectionEntityId') ON DELETE Cascade ON UPDATE Cascade -) -; - -CREATE TABLE 'HydraulicLocationCalculationForTargetProbabilityCollectionHydraulicLocationCalculationEntity' -( - 'HydraulicLocationCalculationForTargetProbabilityCollectionEntityId' INTEGER NOT NULL, - 'HydraulicLocationCalculationEntityId' INTEGER NOT NULL, - CONSTRAINT 'PK_HydraulicBoundaryLocationCalculationsForTargetProbabilityHydraulicLocationCalculationEntity' PRIMARY KEY ('HydraulicLocationCalculationForTargetProbabilityCollectionEntityId','HydraulicLocationCalculationEntityId'), - CONSTRAINT 'HydraulicBoundaryLocationCalculationsForTargetProbabilityHydraulicLocationCalculationEntity_HydraulicBoundaryLocationCalculationsForTargetProbabilityEntityId' FOREIGN KEY ('HydraulicLocationCalculationForTargetProbabilityCollectionEntityId') REFERENCES 'HydraulicLocationCalculationForTargetProbabilityCollectionEntity' ('HydraulicLocationCalculationForTargetProbabilityCollectionEntityId') ON DELETE No Action ON UPDATE No Action, - CONSTRAINT 'HydraulicBoundaryLocationCalculationsForTargetProbabilityHydraulicLocationCalculationEntity_HydraulicLocationCalculationEntityId' FOREIGN KEY ('HydraulicLocationCalculationEntityId') REFERENCES 'HydraulicLocationCalculationEntity' ('HydraulicLocationCalculationEntityId') ON DELETE No Action ON UPDATE No Action -) -; - CREATE TABLE 'HydraulicLocationOutputEntity' ( 'HydraulicLocationOutputEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -1709,32 +1691,6 @@ ) ; -CREATE TABLE 'SpecificFailurePathEntity' -( - 'SpecificFailurePathEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, - 'AssessmentSectionEntityId' INTEGER NOT NULL, - 'Name' VARCHAR (260) NULL, - 'Order' INT (4) NOT NULL, - 'InAssembly' TINYINT (1) NOT NULL, - 'FailureMechanismSectionCollectionSourcePath' TEXT NULL, - 'InAssemblyInputComments' TEXT NULL, - 'InAssemblyOutputComments' TEXT NULL, - 'NotInAssemblyComments' TEXT NULL, - 'N' REAL NOT NULL, - CONSTRAINT 'FK_SpecificFailurePathEntity_AssessmentSectionEntity' FOREIGN KEY ('AssessmentSectionEntityId') REFERENCES 'AssessmentSectionEntity' ('AssessmentSectionEntityId') ON DELETE Cascade ON UPDATE Cascade -) -; - -CREATE TABLE 'SpecificFailurePathFailureMechanismSectionEntity' -( - 'SpecificFailurePathEntityId' INTEGER NOT NULL, - 'FailureMechanismSectionEntityId' INTEGER NOT NULL, - CONSTRAINT 'PK_SpecificFailurePathFailureMechanismSectionEntity' PRIMARY KEY ('SpecificFailurePathEntityId','FailureMechanismSectionEntityId'), - CONSTRAINT 'FK_SpecificFailurePathFailureMechanismSectionEntity_FailureMechanismSectionEntity' FOREIGN KEY ('FailureMechanismSectionEntityId') REFERENCES 'FailureMechanismSectionEntity' ('FailureMechanismSectionEntityId') ON DELETE Cascade ON UPDATE Cascade, - CONSTRAINT 'FK_SpecificFailurePathFailureMechanismSectionEntity_SpecificFailurePathEntity' FOREIGN KEY ('SpecificFailurePathEntityId') REFERENCES 'SpecificFailurePathEntity' ('SpecificFailurePathEntityId') ON DELETE Cascade ON UPDATE Cascade -) -; - CREATE TABLE 'StabilityPointStructureEntity' ( 'StabilityPointStructureEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -1938,7 +1894,6 @@ 'CalculationGroupEntityId' INTEGER NOT NULL, 'ForeshoreProfileEntityId' INTEGER NULL, 'HydraulicLocationEntityId' INTEGER NULL, - 'HydraulicLocationCalculationForTargetProbabilityCollectionEntityId' INTEGER NULL, 'Order' INT (4) NOT NULL, 'Name' VARCHAR (260) NULL, 'Comments' TEXT NULL, @@ -1952,11 +1907,10 @@ 'UpperBoundaryWaterLevels' REAL NULL, 'LowerBoundaryWaterLevels' REAL NULL, 'StepSize' TINYINT (1) NOT NULL, -- Enum: 1 = 0.5, 2 = 1.0, 3 = 2.0 + 'CategoryType' TINYINT (1) NOT NULL, -- Enum: 1 = FactorizedSignalingNorm, 2 = SignalingNorm, 3 = LowerLimitNorm, 4 = FactorizedLowerLimitNorm 'CalculationType' TINYINT (1) NOT NULL, -- Enum: 1 = Blocks, 2 = Columns, 3 = Both - 'WaterLevelType' TINYINT (1) NOT NULL, -- Enum: 1 = None, 2 = LowerLimit, 3 = Signaling, 4 = UserDefinedTargetProbability CONSTRAINT 'FK_StabilityStoneCoverWaveConditionsCalculationEntity_CalculationGroupEntity' FOREIGN KEY ('CalculationGroupEntityId') REFERENCES 'CalculationGroupEntity' ('CalculationGroupEntityId') ON DELETE Cascade ON UPDATE Cascade, CONSTRAINT 'FK_StabilityStoneCoverWaveConditionsCalculationEntity_ForeshoreProfileEntity' FOREIGN KEY ('ForeshoreProfileEntityId') REFERENCES 'ForeshoreProfileEntity' ('ForeshoreProfileEntityId') ON DELETE Set Null ON UPDATE Cascade, - CONSTRAINT 'FK_StabilityStoneCoverWaveConditionsCalculationEntity_HydraulicLocationCalculationForTargetProbabilityCollectionEntity' FOREIGN KEY ('HydraulicLocationCalculationForTargetProbabilityCollectionEntityId') REFERENCES 'HydraulicLocationCalculationForTargetProbabilityCollectionEntity' ('HydraulicLocationCalculationForTargetProbabilityCollectionEntityId') ON DELETE Set Null ON UPDATE Cascade, CONSTRAINT 'FK_StabilityStoneCoverWaveConditionsCalculationEntity_HydraulicLocationEntity' FOREIGN KEY ('HydraulicLocationEntityId') REFERENCES 'HydraulicLocationEntity' ('HydraulicLocationEntityId') ON DELETE Set Null ON UPDATE Cascade ) ; @@ -2101,7 +2055,6 @@ 'CalculationGroupEntityId' INTEGER NOT NULL, 'ForeshoreProfileEntityId' INTEGER NULL, 'HydraulicLocationEntityId' INTEGER NULL, - 'HydraulicLocationCalculationForTargetProbabilityCollectionEntityId' INTEGER NULL, 'Order' INT (4) NOT NULL, 'Name' VARCHAR (260) NULL, 'Comments' TEXT NULL, @@ -2115,10 +2068,9 @@ 'UpperBoundaryWaterLevels' REAL NULL, 'LowerBoundaryWaterLevels' REAL NULL, 'StepSize' TINYINT (1) NOT NULL, -- Enum: 1 = 0.5, 2 = 1.0, 3 = 2.0 - 'WaterLevelType' TINYINT (1) NOT NULL, -- Enum: 1 = None, 2 = LowerLimit, 3 = Signaling, 4 = UserDefinedTargetProbability + 'CategoryType' TINYINT (1) NOT NULL, -- Enum: 1 = FactorizedSignalingNorm, 2 = SignalingNorm, 3 = LowerLimitNorm, 4 = FactorizedLowerLimitNorm CONSTRAINT 'FK_WaveImpactAsphaltCoverWaveConditionsCalculationEntity_CalculationGroupEntity' FOREIGN KEY ('CalculationGroupEntityId') REFERENCES 'CalculationGroupEntity' ('CalculationGroupEntityId') ON DELETE Cascade ON UPDATE Cascade, CONSTRAINT 'FK_WaveImpactAsphaltCoverWaveConditionsCalculationEntity_ForeshoreProfileEntity' FOREIGN KEY ('ForeshoreProfileEntityId') REFERENCES 'ForeshoreProfileEntity' ('ForeshoreProfileEntityId') ON DELETE Set Null ON UPDATE Cascade, - CONSTRAINT 'FK_WaveImpactAsphaltCoverWaveConditionsCalculationEntity_HydraulicLocationCalculationForTargetProbabilityCollectionEntity' FOREIGN KEY ('HydraulicLocationCalculationForTargetProbabilityCollectionEntityId') REFERENCES 'HydraulicLocationCalculationForTargetProbabilityCollectionEntity' ('HydraulicLocationCalculationForTargetProbabilityCollectionEntityId') ON DELETE Set Null ON UPDATE Cascade, CONSTRAINT 'FK_WaveImpactAsphaltCoverWaveConditionsCalculationEntity_HydraulicLocationEntity' FOREIGN KEY ('HydraulicLocationEntityId') REFERENCES 'HydraulicLocationEntity' ('HydraulicLocationEntityId') ON DELETE Set Null ON UPDATE Cascade ) ; @@ -2152,6 +2104,30 @@ ON 'AssessmentSectionEntity' ('HydraulicLocationCalculationCollectionEntity2Id' ASC) ; +CREATE INDEX 'IXFK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity3' + ON 'AssessmentSectionEntity' ('HydraulicLocationCalculationCollectionEntity3Id' ASC) +; + +CREATE INDEX 'IXFK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity4' + ON 'AssessmentSectionEntity' ('HydraulicLocationCalculationCollectionEntity4Id' ASC) +; + +CREATE INDEX 'IXFK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity5' + ON 'AssessmentSectionEntity' ('HydraulicLocationCalculationCollectionEntity5Id' ASC) +; + +CREATE INDEX 'IXFK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity6' + ON 'AssessmentSectionEntity' ('HydraulicLocationCalculationCollectionEntity6Id' ASC) +; + +CREATE INDEX 'IXFK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity7' + ON 'AssessmentSectionEntity' ('HydraulicLocationCalculationCollectionEntity7Id' ASC) +; + +CREATE INDEX 'IXFK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity8' + ON 'AssessmentSectionEntity' ('HydraulicLocationCalculationCollectionEntity8Id' ASC) +; + CREATE INDEX 'IXFK_AssessmentSectionEntity_ProjectEntity' ON 'AssessmentSectionEntity' ('ProjectEntityId' ASC) ; @@ -2163,7 +2139,13 @@ DELETE FROM HydraulicLocationCalculationCollectionEntity WHERE HydraulicLocationCalculationCollectionEntityId IS OLD.HydraulicLocationCalculationCollectionEntity1Id - OR HydraulicLocationCalculationCollectionEntityId IS OLD.HydraulicLocationCalculationCollectionEntity2Id; + OR HydraulicLocationCalculationCollectionEntityId IS OLD.HydraulicLocationCalculationCollectionEntity2Id + OR HydraulicLocationCalculationCollectionEntityId IS OLD.HydraulicLocationCalculationCollectionEntity3Id + OR HydraulicLocationCalculationCollectionEntityId IS OLD.HydraulicLocationCalculationCollectionEntity4Id + OR HydraulicLocationCalculationCollectionEntityId IS OLD.HydraulicLocationCalculationCollectionEntity5Id + OR HydraulicLocationCalculationCollectionEntityId IS OLD.HydraulicLocationCalculationCollectionEntity6Id + OR HydraulicLocationCalculationCollectionEntityId IS OLD.HydraulicLocationCalculationCollectionEntity7Id + OR HydraulicLocationCalculationCollectionEntityId IS OLD.HydraulicLocationCalculationCollectionEntity8Id; END; ; @@ -2175,6 +2157,10 @@ ON 'FailureMechanismEntity' ('CalculationGroupEntityId' ASC) ; +CREATE INDEX 'IXFK_FailureMechanismSectionEntity_FailureMechanismEntity' + ON 'FailureMechanismSectionEntity' ('FailureMechanismEntityId' ASC) +; + CREATE INDEX 'IXFK_ClosingStructuresFailureMechanismMetaEntity_FailureMechanismEntity' ON 'ClosingStructuresFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC) ; @@ -2187,6 +2173,10 @@ ON 'HydraulicLocationEntity' ('AssessmentSectionEntityId' ASC) ; +CREATE INDEX 'IXFK_GrassCoverErosionInwardsFailureMechanismMetaEntity_FailureMechanismEntity' + ON 'GrassCoverErosionInwardsFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC) +; + CREATE INDEX 'IXFK_SemiProbabilisticPipingCalculationEntity_PipingStochasticSoilProfileEntity' ON 'SemiProbabilisticPipingCalculationEntity' ('PipingStochasticSoilProfileEntityId' ASC) ; @@ -2203,10 +2193,6 @@ ON 'SemiProbabilisticPipingCalculationEntity' ('CalculationGroupEntityId' ASC) ; -CREATE INDEX 'IXFK_GrassCoverErosionInwardsFailureMechanismMetaEntity_FailureMechanismEntity' - ON 'GrassCoverErosionInwardsFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC) -; - CREATE INDEX 'IXFK_GrassCoverErosionInwardsCalculationEntity_CalculationGroupEntity' ON 'GrassCoverErosionInwardsCalculationEntity' ('CalculationGroupEntityId' ASC) ; @@ -2223,6 +2209,47 @@ ON 'GrassCoverErosionOutwardsFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC) ; +CREATE INDEX 'IXFK_GrassCoverErosionOutwardsFailureMechanismMetaEntity_HydraulicLocationCalculationCollectionEntity1' + ON 'GrassCoverErosionOutwardsFailureMechanismMetaEntity' ('HydraulicLocationCalculationCollectionEntity1Id' ASC) +; + +CREATE INDEX 'IXFK_GrassCoverErosionOutwardsFailureMechanismMetaEntity_HydraulicLocationCalculationCollectionEntity2' + ON 'GrassCoverErosionOutwardsFailureMechanismMetaEntity' ('HydraulicLocationCalculationCollectionEntity2Id' ASC) +; + +CREATE INDEX 'IXFK_GrassCoverErosionOutwardsFailureMechanismMetaEntity_HydraulicLocationCalculationCollectionEntity3' + ON 'GrassCoverErosionOutwardsFailureMechanismMetaEntity' ('HydraulicLocationCalculationCollectionEntity3Id' ASC) +; + +CREATE INDEX 'IXFK_GrassCoverErosionOutwardsFailureMechanismMetaEntity_HydraulicLocationCalculationCollectionEntity4' + ON 'GrassCoverErosionOutwardsFailureMechanismMetaEntity' ('HydraulicLocationCalculationCollectionEntity4Id' ASC) +; + +CREATE INDEX 'IXFK_GrassCoverErosionOutwardsFailureMechanismMetaEntity_HydraulicLocationCalculationCollectionEntity5' + ON 'GrassCoverErosionOutwardsFailureMechanismMetaEntity' ('HydraulicLocationCalculationCollectionEntity5Id' ASC) +; + +CREATE INDEX 'IXFK_GrassCoverErosionOutwardsFailureMechanismMetaEntity_HydraulicLocationCalculationCollectionEntity6' + ON 'GrassCoverErosionOutwardsFailureMechanismMetaEntity' ('HydraulicLocationCalculationCollectionEntity6Id' ASC) +; +CREATE TRIGGER [TR_AfterDeleteGrassCoverErosionOutwardsFailureMechanismMetaEntity_RemoveHydraulicLocationCalculationCollectionEntities] + AFTER DELETE + ON GrassCoverErosionOutwardsFailureMechanismMetaEntity + FOR EACH ROW +BEGIN + DELETE + FROM HydraulicLocationCalculationCollectionEntity + WHERE HydraulicLocationCalculationCollectionEntityId IS OLD.HydraulicLocationCalculationCollectionEntity1Id + OR HydraulicLocationCalculationCollectionEntityId IS OLD.HydraulicLocationCalculationCollectionEntity2Id + OR HydraulicLocationCalculationCollectionEntityId IS OLD.HydraulicLocationCalculationCollectionEntity3Id + OR HydraulicLocationCalculationCollectionEntityId IS OLD.HydraulicLocationCalculationCollectionEntity4Id + OR HydraulicLocationCalculationCollectionEntityId IS OLD.HydraulicLocationCalculationCollectionEntity5Id + OR HydraulicLocationCalculationCollectionEntityId IS OLD.HydraulicLocationCalculationCollectionEntity6Id + OR HydraulicLocationCalculationCollectionEntityId IS OLD.HydraulicLocationCalculationCollectionEntity7Id + OR HydraulicLocationCalculationCollectionEntityId IS OLD.HydraulicLocationCalculationCollectionEntity8Id; +END; +; + CREATE INDEX 'IXFK_PipingStochasticSoilProfileEntity_SoilProfileEntity' ON 'PipingStochasticSoilProfileEntity' ('PipingSoilProfileEntityId' ASC) ; @@ -2298,26 +2325,56 @@ ON 'DikeProfileEntity' ('FailureMechanismEntityId' ASC) ; +CREATE INDEX 'IXFK_DuneErosionFailureMechanismMetaEntity_DuneLocationCalculationCollectionEntity1' + ON 'DuneErosionFailureMechanismMetaEntity' ('DuneLocationCalculationCollectionEntity1Id' ASC) +; + +CREATE INDEX 'IXFK_DuneErosionFailureMechanismMetaEntity_DuneLocationCalculationCollectionEntity2' + ON 'DuneErosionFailureMechanismMetaEntity' ('DuneLocationCalculationCollectionEntity2Id' ASC) +; + +CREATE INDEX 'IXFK_DuneErosionFailureMechanismMetaEntity_DuneLocationCalculationCollectionEntity3' + ON 'DuneErosionFailureMechanismMetaEntity' ('DuneLocationCalculationCollectionEntity3Id' ASC) +; + +CREATE INDEX 'IXFK_DuneErosionFailureMechanismMetaEntity_DuneLocationCalculationCollectionEntity4' + ON 'DuneErosionFailureMechanismMetaEntity' ('DuneLocationCalculationCollectionEntity4Id' ASC) +; + +CREATE INDEX 'IXFK_DuneErosionFailureMechanismMetaEntity_DuneLocationCalculationCollectionEntity5' + ON 'DuneErosionFailureMechanismMetaEntity' ('DuneLocationCalculationCollectionEntity5Id' ASC) +; + CREATE INDEX 'IXFK_DuneErosionFailureMechanismMetaEntity_FailureMechanismEntity' ON 'DuneErosionFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC) ; +CREATE TRIGGER [TR_AfterDeleteDuneErosionFailureMechanismMetaEntity_RemoveDuneLocationCalculationCollectionEntities] + AFTER DELETE + ON DuneErosionFailureMechanismMetaEntity + FOR EACH ROW +BEGIN + DELETE + FROM DuneLocationCalculationCollectionEntity + WHERE DuneLocationCalculationCollectionEntityId IS OLD.DuneLocationCalculationCollectionEntity1Id + OR DuneLocationCalculationCollectionEntityId IS OLD.DuneLocationCalculationCollectionEntity2Id + OR DuneLocationCalculationCollectionEntityId IS OLD.DuneLocationCalculationCollectionEntity3Id + OR DuneLocationCalculationCollectionEntityId IS OLD.DuneLocationCalculationCollectionEntity4Id + OR DuneLocationCalculationCollectionEntityId IS OLD.DuneLocationCalculationCollectionEntity5Id; +END; +; CREATE INDEX 'IXFK_DuneErosionSectionResultEntity_FailureMechanismSectionEntity' ON 'DuneErosionSectionResultEntity' ('FailureMechanismSectionEntityId' ASC) ; CREATE INDEX 'IXFK_DuneLocationCalculationEntity_DuneLocationCalculationCollectionEntity' - ON 'DuneLocationCalculationEntity' ('DuneLocationCalculationForTargetProbabilityCollectionEntityId' ASC) + ON 'DuneLocationCalculationEntity' ('DuneLocationCalculationCollectionEntityId' ASC) ; CREATE INDEX 'IXFK_DuneLocationCalculationEntity_DuneLocationEntity' ON 'DuneLocationCalculationEntity' ('DuneLocationEntityId' ASC) ; -CREATE INDEX 'IXFK_DuneLocationCalculationForTargetProbabilityCollectionEntity_DuneErosionFailureMechanismMetaEntity' - ON 'DuneLocationCalculationForTargetProbabilityCollectionEntity' ('DuneErosionFailureMechanismMetaEntityId' ASC) -; - CREATE INDEX 'IXFK_DuneLocationCalculationOutputEntity_DuneLocationCalculationEntity' ON 'DuneLocationCalculationOutputEntity' ('DuneLocationCalculationEntityId' ASC) ; @@ -2326,25 +2383,6 @@ ON 'DuneLocationEntity' ('FailureMechanismEntityId' ASC) ; -CREATE INDEX 'IXFK_FailureMechanismFailureMechanismSectionEntity_FailureMechanismEntity' - ON 'FailureMechanismFailureMechanismSectionEntity' ('FailureMechanismEntityId' ASC) -; - -CREATE INDEX 'IXFK_FailureMechanismFailureMechanismSectionEntity_FailureMechanismSectionEntity' - ON 'FailureMechanismFailureMechanismSectionEntity' ('FailureMechanismSectionEntityId' ASC) -; -CREATE TRIGGER [TR_AfterDeleteFailureMechanismEntity_RemoveFailureMechanismSectionEntityId] - AFTER DELETE - ON FailureMechanismEntity - FOR EACH ROW -BEGIN - DELETE - FROM FailureMechanismSectionEntity - WHERE OLD.FailureMechanismSectionEntityId IS NOT NULL - AND FailureMechanismSectionEntityId IS OLD.FailureMechanismSectionEntityId; -END; -; - CREATE INDEX 'IXFK_FaultTreeIllustrationPoint_FaultTreeIllustrationPoint' ON 'FaultTreeIllustrationPointEntity' ('ParentFaultTreeIllustrationPointEntityId' ASC) ; @@ -2502,10 +2540,6 @@ ON 'GrassCoverErosionOutwardsWaveConditionsCalculationEntity' ('ForeshoreProfileEntityId' ASC) ; -CREATE INDEX 'IXFK_GrassCoverErosionOutwardsWaveConditionsCalculationEntity_HydraulicLocationCalculationForTargetProbabilityCollectionEntity' - ON 'GrassCoverErosionOutwardsWaveConditionsCalculationEntity' ('HydraulicLocationCalculationForTargetProbabilityCollectionEntityId' ASC) -; - CREATE INDEX 'IXFK_GrassCoverErosionOutwardsWaveConditionsCalculationEntity_HydraulicLocationEntity' ON 'GrassCoverErosionOutwardsWaveConditionsCalculationEntity' ('HydraulicLocationEntityId' ASC) ; @@ -2569,52 +2603,14 @@ ON 'HydraulicBoundaryDatabaseEntity' ('AssessmentSectionEntityId' ASC) ; -CREATE INDEX 'IXFK_HydraulicLocationCalculationCollectionHydraulicLocationCalculationEntity_HydraulicLocationCalculationCollectionEntity' - ON 'HydraulicLocationCalculationCollectionHydraulicLocationCalculationEntity' ('HydraulicLocationCalculationCollectionEntityId' ASC) +CREATE INDEX 'IXFK_HydraulicLocationCalculationEntity_HydraulicLocationCalculationCollectionEntity' + ON 'HydraulicLocationCalculationEntity' ('HydraulicLocationCalculationCollectionEntityId' ASC) ; -CREATE INDEX 'IXFK_HydraulicLocationCalculationCollectionHydraulicLocationCalculationEntity_HydraulicLocationCalculationEntity' - ON 'HydraulicLocationCalculationCollectionHydraulicLocationCalculationEntity' ('HydraulicLocationCalculationEntityId' ASC) -; -CREATE TRIGGER [TR_AfterDeleteHydraulicLocationCalculationCollectionEntity_RemoveHydraulicLocationCalculationEntity] - AFTER DELETE - ON HydraulicLocationCalculationCollectionEntity - FOR EACH ROW -BEGIN - DELETE - FROM HydraulicLocationCalculationEntity - WHERE OLD.HydraulicLocationCalculationEntityId IS NOT NULL - AND HydraulicLocationCalculationEntityId IS OLD.HydraulicLocationCalculationEntityId; -END; -; - CREATE INDEX 'IXFK_HydraulicLocationCalculationEntity_HydraulicLocationEntity' ON 'HydraulicLocationCalculationEntity' ('HydraulicLocationEntityId' ASC) ; -CREATE INDEX 'IXFK_HydraulicBoundaryLocationCalculationsForTargetProbabilityEntity_AssessmentSectionEntity' - ON 'HydraulicLocationCalculationForTargetProbabilityCollectionEntity' ('AssessmentSectionEntityId' ASC) -; - -CREATE INDEX 'IXFK_HydraulicBoundaryLocationCalculationsForTargetProbabilityHydraulicLocationCalculationEntity_HydraulicBoundaryLocationCalculationsForTargetProbabilityEntity' - ON 'HydraulicLocationCalculationForTargetProbabilityCollectionHydraulicLocationCalculationEntity' ('HydraulicLocationCalculationForTargetProbabilityCollectionEntityId' ASC) -; - -CREATE INDEX 'IXFK_HydraulicBoundaryLocationCalculationsForTargetProbabilityHydraulicLocationCalculationEntity_HydraulicLocationCalculationEntity' - ON 'HydraulicLocationCalculationForTargetProbabilityCollectionHydraulicLocationCalculationEntity' ('HydraulicLocationCalculationEntityId' ASC) -; -CREATE TRIGGER [TR_AfterDeleteHydraulicLocationCalculationForTargetProbabilityCollectionEntity_RemoveHydraulicLocationCalculationEntity] - AFTER DELETE - ON HydraulicLocationCalculationForTargetProbabilityCollectionEntity - FOR EACH ROW -BEGIN - DELETE - FROM HydraulicLocationCalculationEntity - WHERE OLD.HydraulicLocationCalculationEntityId IS NOT NULL - AND HydraulicLocationCalculationEntityId IS OLD.HydraulicLocationCalculationEntityId; -END; -; - CREATE INDEX 'IXFK_HydraulicLocationOutputEntity_GeneralResultSubMechanismIllustrationPointEntity' ON 'HydraulicLocationOutputEntity' ('GeneralResultSubMechanismIllustrationPointEntityId' ASC) ; @@ -2789,25 +2785,6 @@ ON 'SemiProbabilisticPipingCalculationOutputEntity' ('SemiProbabilisticPipingCalculationEntityId' ASC) ; -CREATE INDEX 'IXFK_SpecificFailurePathEntity_AssessmentSectionEntity' - ON 'SpecificFailurePathEntity' ('AssessmentSectionEntityId' ASC) -; - -CREATE INDEX 'IXFK_SpecificFailurePathFailureMechanismSectionEntity_FailureMechanismSectionEntity' - ON 'SpecificFailurePathFailureMechanismSectionEntity' ('FailureMechanismSectionEntityId' ASC) -; -CREATE TRIGGER [TR_AfterDeleteSpecificFailurePathEntity_RemoveFailureMechanismSectionEntityId] - AFTER DELETE - ON SpecificFailurePathEntity - FOR EACH ROW -BEGIN - DELETE - FROM FailureMechanismSectionEntity - WHERE OLD.FailureMechanismSectionEntityId IS NOT NULL - AND FailureMechanismSectionEntityId IS OLD.FailureMechanismSectionEntityId; -END; -; - CREATE INDEX 'IXFK_StabilityPointStructureEntity_FailureMechanismEntity' ON 'StabilityPointStructureEntity' ('FailureMechanismEntityId' ASC) ; @@ -2867,10 +2844,6 @@ ON 'StabilityStoneCoverWaveConditionsCalculationEntity' ('ForeshoreProfileEntityId' ASC) ; -CREATE INDEX 'IXFK_StabilityStoneCoverWaveConditionsCalculationEntity_HydraulicLocationCalculationForTargetProbabilityCollectionEntity' - ON 'StabilityStoneCoverWaveConditionsCalculationEntity' ('HydraulicLocationCalculationForTargetProbabilityCollectionEntityId' ASC) -; - CREATE INDEX 'IXFK_StabilityStoneCoverWaveConditionsCalculationEntity_HydraulicLocationEntity' ON 'StabilityStoneCoverWaveConditionsCalculationEntity' ('HydraulicLocationEntityId' ASC) ; @@ -2945,10 +2918,6 @@ ON 'WaveImpactAsphaltCoverWaveConditionsCalculationEntity' ('ForeshoreProfileEntityId' ASC) ; -CREATE INDEX 'IXFK_WaveImpactAsphaltCoverWaveConditionsCalculationEntity_HydraulicLocationCalculationForTargetProbabilityCollectionEntity' - ON 'WaveImpactAsphaltCoverWaveConditionsCalculationEntity' ('HydraulicLocationCalculationForTargetProbabilityCollectionEntityId' ASC) -; - CREATE INDEX 'IXFK_WaveImpactAsphaltCoverWaveConditionsCalculationEntity_HydraulicLocationEntity' ON 'WaveImpactAsphaltCoverWaveConditionsCalculationEntity' ('HydraulicLocationEntityId' ASC) ; Index: Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/DatabaseStructure21.2.sql =================================================================== diff -u -ra97779c712b36047a237c0026a271cb29722fff9 -rbfac6a6e9a2fd50b24af4aac9f7c21249aaedb81 --- Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/DatabaseStructure21.2.sql (.../DatabaseStructure21.2.sql) (revision a97779c712b36047a237c0026a271cb29722fff9) +++ Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/DatabaseStructure21.2.sql (.../DatabaseStructure21.2.sql) (revision bfac6a6e9a2fd50b24af4aac9f7c21249aaedb81) @@ -1,6 +1,6 @@ /* ---------------------------------------------------- */ /* Generated by Enterprise Architect Version 14.1 */ -/* Created On : 09-nov-2021 14:14:14 */ +/* Created On : 11-nov-2021 07:48:54 */ /* DBMS : SQLite */ /* ---------------------------------------------------- */ @@ -379,7 +379,7 @@ 'InAssemblyInputComments' TEXT NULL, 'InAssemblyOutputComments' TEXT NULL, 'NotInAssemblyComments' TEXT NULL, - 'CalculationsComments' TEXT NULL, + 'CalculationsInputComments' TEXT NULL, 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') Index: Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/Migration_21.1_21.2.sql =================================================================== diff -u -r2560c44f212b1c2c9297715166c374095fb3a06d -rbfac6a6e9a2fd50b24af4aac9f7c21249aaedb81 --- Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/Migration_21.1_21.2.sql (.../Migration_21.1_21.2.sql) (revision 2560c44f212b1c2c9297715166c374095fb3a06d) +++ Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/Migration_21.1_21.2.sql (.../Migration_21.1_21.2.sql) (revision bfac6a6e9a2fd50b24af4aac9f7c21249aaedb81) @@ -69,7 +69,7 @@ [InAssemblyInputComments], [InAssemblyOutputComments], [NotInAssemblyComments], - [CalculationsComments] + [CalculationsInputComments] ) SELECT [FailureMechanismEntityId], Index: Riskeer/Migration/test/Riskeer.Migration.Integration.Test/MigrationTo212IntegrationTest.cs =================================================================== diff -u -r2560c44f212b1c2c9297715166c374095fb3a06d -rbfac6a6e9a2fd50b24af4aac9f7c21249aaedb81 --- Riskeer/Migration/test/Riskeer.Migration.Integration.Test/MigrationTo212IntegrationTest.cs (.../MigrationTo212IntegrationTest.cs) (revision 2560c44f212b1c2c9297715166c374095fb3a06d) +++ Riskeer/Migration/test/Riskeer.Migration.Integration.Test/MigrationTo212IntegrationTest.cs (.../MigrationTo212IntegrationTest.cs) (revision bfac6a6e9a2fd50b24af4aac9f7c21249aaedb81) @@ -105,7 +105,7 @@ "AND NEW.[InAssemblyInputComments] IS OLD.[InputComments] " + "AND NEW.[InAssemblyOutputComments] IS OLD.[OutputComments] " + "AND NEW.[NotInAssemblyComments] IS OLD.[NotRelevantComments] " + - "AND NEW.[CalculationsComments] IS NULL; " + + "AND NEW.[CalculationsInputComments] IS NULL; " + "DETACH SOURCEPROJECT;"; reader.AssertReturnedDataIsValid(validateFailureMechanism);