Index: Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure17.2.sql =================================================================== diff -u -rc0467a5ee5f6d7163ce9d8ba61fc8b22828bb44e -r54242411470f330f6f4c75d1d05bfd0911706873 --- Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure17.2.sql (.../DatabaseStructure17.2.sql) (revision c0467a5ee5f6d7163ce9d8ba61fc8b22828bb44e) +++ Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure17.2.sql (.../DatabaseStructure17.2.sql) (revision 54242411470f330f6f4c75d1d05bfd0911706873) @@ -1,6 +1,6 @@ /* ---------------------------------------------------- */ /* Generated by Enterprise Architect Version 12.0 */ -/* Created On : 28-Jun-2017 11:35:44 AM */ +/* Created On : 30-Jun-2017 15:41:39 */ /* DBMS : SQLite */ /* ---------------------------------------------------- */ @@ -24,36 +24,36 @@ DROP TABLE IF EXISTS 'FailureMechanismSectionEntity' ; -DROP TABLE IF EXISTS 'FailureMechanismEntity' -; - DROP TABLE IF EXISTS 'PipingFailureMechanismMetaEntity' ; -DROP TABLE IF EXISTS 'ClosingStructuresFailureMechanismMetaEntity' +DROP TABLE IF EXISTS 'FailureMechanismEntity' ; DROP TABLE IF EXISTS 'StabilityStoneCoverFailureMechanismMetaEntity' ; +DROP TABLE IF EXISTS 'ClosingStructuresFailureMechanismMetaEntity' +; + DROP TABLE IF EXISTS 'CalculationGroupEntity' ; DROP TABLE IF EXISTS 'StabilityPointStructuresFailureMechanismMetaEntity' ; -DROP TABLE IF EXISTS 'HydraulicLocationEntity' -; - DROP TABLE IF EXISTS 'DuneErosionFailureMechanismMetaEntity' ; -DROP TABLE IF EXISTS 'GrassCoverErosionInwardsFailureMechanismMetaEntity' +DROP TABLE IF EXISTS 'HydraulicLocationEntity' ; DROP TABLE IF EXISTS 'PipingCalculationEntity' ; +DROP TABLE IF EXISTS 'GrassCoverErosionInwardsFailureMechanismMetaEntity' +; + DROP TABLE IF EXISTS 'HeightStructuresFailureMechanismMetaEntity' ; @@ -63,10 +63,10 @@ DROP TABLE IF EXISTS 'GrassCoverErosionOutwardsFailureMechanismMetaEntity' ; -DROP TABLE IF EXISTS 'SoilLayerEntity' +DROP TABLE IF EXISTS 'SoilProfileEntity' ; -DROP TABLE IF EXISTS 'SoilProfileEntity' +DROP TABLE IF EXISTS 'SoilLayerEntity' ; DROP TABLE IF EXISTS 'StochasticSoilProfileEntity' @@ -219,36 +219,27 @@ DROP TABLE IF EXISTS 'GrassCoverErosionInwardsOvertoppingRateOutputEntity' ; -DROP TABLE IF EXISTS 'GrassCoverErosionOutwardsHydraulicLocationGeneralResultEntity' +DROP TABLE IF EXISTS 'GeneralResultSubmechanismIllustrationPointEntity' ; -DROP TABLE IF EXISTS 'GrassCoverErosionOutwardsHydraulicLocationStochastEntity' +DROP TABLE IF EXISTS 'SubmechanismIllustrationPointEntity' ; -DROP TABLE IF EXISTS 'GrassCoverErosionOutwardsHydraulicLocationWindDirectionClosingSituationIllustrationPointEntity' +DROP TABLE IF EXISTS 'IllustrationPointResultEntity' ; -DROP TABLE IF EXISTS 'GrassCoverErosionOutwardsHydraulicLocationIllustrationPointResultEntity' +DROP TABLE IF EXISTS 'StochastEntity' ; -DROP TABLE IF EXISTS 'GrassCoverErosionOutwardsHydraulicLocationRealizedStochastEntity' +DROP TABLE IF EXISTS 'GeneralResultSubmechanismIllustrationPointStochastEntity' ; -DROP TABLE IF EXISTS 'HydraulicLocationGeneralResultEntity' +DROP TABLE IF EXISTS 'TopLevelSubmechanismIllustrationPointEntity' ; -DROP TABLE IF EXISTS 'HydraulicLocationWindDirectionClosingSituationIllustrationPointEntity' +DROP TABLE IF EXISTS 'SubmechanismIllustrationPointStochastEntity' ; -DROP TABLE IF EXISTS 'HydraulicLocationStochastEntity' -; - -DROP TABLE IF EXISTS 'HydraulicLocationIllustrationPointResultEntity' -; - -DROP TABLE IF EXISTS 'HydraulicLocationRealizedStochastEntity' -; - /* Create Tables with Primary and Foreign Keys, Check and Unique Constraints */ CREATE TABLE 'VersionEntity' @@ -381,6 +372,18 @@ ) ; +CREATE TABLE 'PipingFailureMechanismMetaEntity' +( + 'PipingFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + 'FailureMechanismEntityId' INTEGER NOT NULL, + 'A' REAL NOT NULL, + 'WaterVolumetricWeight' REAL NOT NULL, + 'StochasticSoilModelCollectionSourcePath' TEXT, + 'SurfaceLineCollectionSourcePath' TEXT, + CONSTRAINT 'FK_PipingFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade +) +; + CREATE TABLE 'FailureMechanismEntity' ( 'FailureMechanismEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -397,15 +400,12 @@ ) ; -CREATE TABLE 'PipingFailureMechanismMetaEntity' +CREATE TABLE 'StabilityStoneCoverFailureMechanismMetaEntity' ( - 'PipingFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + 'StabilityStoneCoverFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, 'FailureMechanismEntityId' INTEGER NOT NULL, - 'A' REAL NOT NULL, - 'WaterVolumetricWeight' REAL NOT NULL, - 'StochasticSoilModelCollectionSourcePath' TEXT, - 'SurfaceLineCollectionSourcePath' TEXT, - CONSTRAINT 'FK_PipingFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade + 'ForeshoreProfileCollectionSourcePath' TEXT, + CONSTRAINT 'FK_StabilityStoneCoverFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade ) ; @@ -420,15 +420,6 @@ ) ; -CREATE TABLE 'StabilityStoneCoverFailureMechanismMetaEntity' -( - 'StabilityStoneCoverFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, - 'FailureMechanismEntityId' INTEGER NOT NULL, - 'ForeshoreProfileCollectionSourcePath' TEXT, - CONSTRAINT 'FK_StabilityStoneCoverFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade -) -; - CREATE TABLE 'CalculationGroupEntity' ( 'CalculationGroupEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -450,6 +441,15 @@ ) ; +CREATE TABLE 'DuneErosionFailureMechanismMetaEntity' +( + 'DuneErosionFailureMechanismMetaEntityId' 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 +) +; + CREATE TABLE 'HydraulicLocationEntity' ( 'HydraulicLocationEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -465,25 +465,6 @@ ) ; -CREATE TABLE 'DuneErosionFailureMechanismMetaEntity' -( - 'DuneErosionFailureMechanismMetaEntityId' 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 -) -; - -CREATE TABLE 'GrassCoverErosionInwardsFailureMechanismMetaEntity' -( - 'GrassCoverErosionInwardsFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, - 'FailureMechanismEntityId' INTEGER NOT NULL, - 'N' INT (4) NOT NULL, - 'DikeProfileCollectionSourcePath' TEXT, - CONSTRAINT 'FK_GrassCoverErosionInwardsFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade -) -; - CREATE TABLE 'PipingCalculationEntity' ( 'PipingCalculationEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -511,6 +492,16 @@ ) ; +CREATE TABLE 'GrassCoverErosionInwardsFailureMechanismMetaEntity' +( + 'GrassCoverErosionInwardsFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + 'FailureMechanismEntityId' INTEGER NOT NULL, + 'N' INT (4) NOT NULL, + 'DikeProfileCollectionSourcePath' TEXT, + CONSTRAINT 'FK_GrassCoverErosionInwardsFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade +) +; + CREATE TABLE 'HeightStructuresFailureMechanismMetaEntity' ( 'HeightStructuresFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -557,6 +548,14 @@ ) ; +CREATE TABLE 'SoilProfileEntity' +( + 'SoilProfileEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + 'Bottom' REAL, + 'Name' TEXT +) +; + CREATE TABLE 'SoilLayerEntity' ( 'SoilLayerEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -577,14 +576,6 @@ ) ; -CREATE TABLE 'SoilProfileEntity' -( - 'SoilProfileEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, - 'Bottom' REAL, - 'Name' TEXT -) -; - CREATE TABLE 'StochasticSoilProfileEntity' ( 'StochasticSoilProfileEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -1353,13 +1344,15 @@ ( 'HydraulicLocationEntityOutputId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, 'HydraulicLocationEntityId' INTEGER NOT NULL, + 'GeneralResultSubmechanismIllustrationPointEntityId' INTEGER, 'HydraulicLocationOutputType' TINYINT (1) NOT NULL, -- Enum: 1 = DesignWaterLevel, 2 = WaveHeight 'Result' REAL, 'TargetProbability' REAL, 'TargetReliability' REAL, 'CalculatedProbability' REAL, 'CalculatedReliability' REAL, 'CalculationConvergence' TINYINT (1) NOT NULL, -- Enum: 1 = NotCalculated, 2 = CalculatedNotConverged, 3 = CalculatedConverged + CONSTRAINT 'FK_HydraulicLocationOutputEntity_GeneralResultSubMechanismIllustrationPointEntity' FOREIGN KEY ('GeneralResultSubmechanismIllustrationPointEntityId') REFERENCES 'GeneralResultSubmechanismIllustrationPointEntity' ('GeneralResultSubmechanismIllustrationPointEntityId') ON DELETE No Action ON UPDATE No Action, CONSTRAINT 'FK_HydraulicLocationOutputEntity_HydraulicLocationEntity' FOREIGN KEY ('HydraulicLocationEntityId') REFERENCES 'HydraulicLocationEntity' ('HydraulicLocationEntityId') ON DELETE Cascade ON UPDATE Cascade, CONSTRAINT 'U_HydraulicLocationEntityOutputType' UNIQUE ('HydraulicLocationEntityId','HydraulicLocationOutputType') ) @@ -1369,13 +1362,15 @@ ( 'GrassCoverErosionOutwardsHydraulicLocationOutputEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, 'GrassCoverErosionOutwardsHydraulicLocationEntityId' INTEGER NOT NULL, + 'GeneralResultSubmechanismIllustrationPointEntityId' INTEGER, 'HydraulicLocationOutputType' TINYINT (1) NOT NULL, -- Enum: 1 = DesignWaterLevel, 2 = WaveHeight 'Result' REAL, 'TargetProbability' REAL, 'TargetReliability' REAL, 'CalculatedProbability' REAL, 'CalculatedReliability' REAL, 'CalculationConvergence' TINYINT (1) NOT NULL, -- Enum: 1 = NotCalculated, 2 = CalculatedNotConverged, 3 = CalculatedConverged + CONSTRAINT 'FK_GrassCoverErosionOutwardsHydraulicLocationOutputEntity_GeneralResultSubMechanismIllustrationPointEntity' FOREIGN KEY ('GeneralResultSubmechanismIllustrationPointEntityId') REFERENCES 'GeneralResultSubmechanismIllustrationPointEntity' ('GeneralResultSubmechanismIllustrationPointEntityId') ON DELETE No Action ON UPDATE No Action, CONSTRAINT 'FK_GrassCoverErosionOutwardsHydraulicLocationOutputEntity_GrassCoverErosionOutwardsHydraulicLocationEntity' FOREIGN KEY ('GrassCoverErosionOutwardsHydraulicLocationEntityId') REFERENCES 'GrassCoverErosionOutwardsHydraulicLocationEntity' ('GrassCoverErosionOutwardsHydraulicLocationEntityId') ON DELETE Cascade ON UPDATE Cascade, CONSTRAINT 'U_HydraulicLocationOutputType' UNIQUE ('GrassCoverErosionOutwardsHydraulicLocationEntityId','HydraulicLocationOutputType') ) @@ -1452,123 +1447,79 @@ ) ; -CREATE TABLE 'GrassCoverErosionOutwardsHydraulicLocationGeneralResultEntity' +CREATE TABLE 'GeneralResultSubmechanismIllustrationPointEntity' ( - 'GrassCoverErosionOutwardsHydraulicLocationGeneralResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, - 'GrassCoverErosionOutwardsHydraulicLocationOutputEntityId' INTEGER NOT NULL, + 'GeneralResultSubmechanismIllustrationPointEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, 'GoverningWindDirectionName' TEXT NOT NULL, - 'GoverningWindDirectionAngle' REAL NOT NULL, - CONSTRAINT 'FK_GrassCoverErosionOutwardsHydraulicLocationGeneralResultEntity_GrassCoverErosionOutwardsHydraulicLocationOutputEntity' FOREIGN KEY ('GrassCoverErosionOutwardsHydraulicLocationOutputEntityId') REFERENCES 'GrassCoverErosionOutwardsHydraulicLocationOutputEntity' ('GrassCoverErosionOutwardsHydraulicLocationOutputEntityId') ON DELETE Cascade ON UPDATE Cascade + 'GoverningWindDirectionAngle' REAL NOT NULL ) ; -CREATE TABLE 'GrassCoverErosionOutwardsHydraulicLocationStochastEntity' +CREATE TABLE 'SubmechanismIllustrationPointEntity' ( - 'GrassCoverErosionOutwardsHydraulicLocationStochastEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, - 'GrassCoverErosionOutwardsHydraulicLocationGeneralResultEntityId' INTEGER NOT NULL, + 'SubmechanismIllustrationPointEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, 'Name' TEXT NOT NULL, - 'Duration' REAL NOT NULL, - 'Alpha' REAL NOT NULL, - 'Order' INT (4) NOT NULL, - CONSTRAINT 'FK_GrassCoverErosionOutwardsHydraulicLocationStochastEntity_GrassCoverErosionOutwardsHydraulicLocationGeneralResultEntity' FOREIGN KEY ('GrassCoverErosionOutwardsHydraulicLocationGeneralResultEntityId') REFERENCES 'GrassCoverErosionOutwardsHydraulicLocationGeneralResultEntity' ('GrassCoverErosionOutwardsHydraulicLocationGeneralResultEntityId') ON DELETE Cascade ON UPDATE Cascade -) -; - -CREATE TABLE 'GrassCoverErosionOutwardsHydraulicLocationWindDirectionClosingSituationIllustrationPointEntity' -( - 'GrassCoverErosionOutwardsHydraulicLocationWindDirectionClosingSituationIllustrationPointEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, - 'GrassCoverErosionOutwardsHydraulicLocationGeneralResultEntityId' INTEGER NOT NULL, - 'IllustrationPointName' TEXT NOT NULL, - 'ClosingSituation' TEXT NOT NULL, - 'WindDirectionName' TEXT NOT NULL, - 'WindDirectionAngle' REAL NOT NULL, 'Beta' REAL NOT NULL, - 'Order' INT (4) NOT NULL, - CONSTRAINT 'FK_GrassCoverErosionOutwardsHydraulicLocationWindDirectionClosingSituationIllustrationPointEntity_GrassCoverErosionOutwardsHydraulicLocationGeneralResultEntity' FOREIGN KEY ('GrassCoverErosionOutwardsHydraulicLocationGeneralResultEntityId') REFERENCES 'GrassCoverErosionOutwardsHydraulicLocationGeneralResultEntity' ('GrassCoverErosionOutwardsHydraulicLocationGeneralResultEntityId') ON DELETE Cascade ON UPDATE Cascade + 'Order' INT (4) NOT NULL ) ; -CREATE TABLE 'GrassCoverErosionOutwardsHydraulicLocationIllustrationPointResultEntity' +CREATE TABLE 'IllustrationPointResultEntity' ( - 'GrassCoverErosionOutwardsHydraulicLocationIllustrationPointResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, - 'GrassCoverErosionOutwardsHydraulicLocationWindDirectionClosingSituationIllustrationPointEntityId' INTEGER NOT NULL, + 'IllustrationPointResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + 'SubmechanismIllustrationPointEntityId' INTEGER NOT NULL, 'Description' TEXT NOT NULL, 'Value' REAL NOT NULL, 'Order' INT (4) NOT NULL, - CONSTRAINT 'FK_GrassCoverErosionOutwardsHydraulicLocationIllustrationPointResultEntity_GrassCoverErosionOutwardsHydraulicLocationWindDirectionClosingSituationIllustrationPointEntity' FOREIGN KEY ('GrassCoverErosionOutwardsHydraulicLocationWindDirectionClosingSituationIllustrationPointEntityId') REFERENCES 'GrassCoverErosionOutwardsHydraulicLocationWindDirectionClosingSituationIllustrationPointEntity' ('GrassCoverErosionOutwardsHydraulicLocationWindDirectionClosingSituationIllustrationPointEntityId') ON DELETE Cascade ON UPDATE Cascade + CONSTRAINT 'FK_IllustrationPointResultEntity_SubmechanismIllustrationPointEntity' FOREIGN KEY ('SubmechanismIllustrationPointEntityId') REFERENCES 'SubmechanismIllustrationPointEntity' ('SubmechanismIllustrationPointEntityId') ON DELETE Cascade ON UPDATE Cascade ) ; -CREATE TABLE 'GrassCoverErosionOutwardsHydraulicLocationRealizedStochastEntity' +CREATE TABLE 'StochastEntity' ( - 'GrassCoverErosionOutwardsHydraulicLocationRealizedStochastEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, - 'GrassCoverErosionOutwardsHydraulicLocationWindDirectionClosingSituationIllustrationPointEntityId' INTEGER NOT NULL, + 'StochastEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, 'Name' TEXT NOT NULL, 'Duration' REAL NOT NULL, 'Alpha' REAL NOT NULL, - 'Realization' REAL NOT NULL, - 'Order' INT (4) NOT NULL, - CONSTRAINT 'FK_GrassCoverErosionOutwardsHydraulicLocationRealizedStochastEntity_GrassCoverErosionOutwardsHydraulicLocationWindDirectionClosingSituationIllustrationPointEntity' FOREIGN KEY ('GrassCoverErosionOutwardsHydraulicLocationWindDirectionClosingSituationIllustrationPointEntityId') REFERENCES 'GrassCoverErosionOutwardsHydraulicLocationWindDirectionClosingSituationIllustrationPointEntity' ('GrassCoverErosionOutwardsHydraulicLocationWindDirectionClosingSituationIllustrationPointEntityId') ON DELETE Cascade ON UPDATE Cascade + 'Order' INT (4) NOT NULL ) ; -CREATE TABLE 'HydraulicLocationGeneralResultEntity' +CREATE TABLE 'GeneralResultSubmechanismIllustrationPointStochastEntity' ( - 'HydraulicLocationGeneralResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, - 'HydraulicLocationEntityOutputId' INTEGER NOT NULL, - 'GoverningWindDirectionName' TEXT NOT NULL, - 'GoverningWindDirectionAngle' REAL NOT NULL, - CONSTRAINT 'FK_HydraulicLocationGeneralResultEntity_HydraulicLocationOutputEntity' FOREIGN KEY ('HydraulicLocationEntityOutputId') REFERENCES 'HydraulicLocationOutputEntity' ('HydraulicLocationEntityOutputId') ON DELETE Cascade ON UPDATE Cascade + 'GeneralResultSubmechanismIllustrationPointEntityId' INTEGER NOT NULL, + 'StochastEntityId' INTEGER NOT NULL, + CONSTRAINT 'PK_GeneralResultSubmechanismIllustrationPointStochastEntity' PRIMARY KEY ('GeneralResultSubmechanismIllustrationPointEntityId','StochastEntityId'), + CONSTRAINT 'FK_GeneralResultSubmechanisIllustrationPointStochastEntity_GeneralResultSubmechanismIllustrationPointEntity' FOREIGN KEY ('GeneralResultSubmechanismIllustrationPointEntityId') REFERENCES 'GeneralResultSubmechanismIllustrationPointEntity' ('GeneralResultSubmechanismIllustrationPointEntityId') ON DELETE Cascade ON UPDATE Cascade, + CONSTRAINT 'FK_GeneralResultSubmechanismIllustrationPointStochastEntity_StochastEntity' FOREIGN KEY ('StochastEntityId') REFERENCES 'StochastEntity' ('StochastEntityId') ON DELETE No Action ON UPDATE No Action ) ; -CREATE TABLE 'HydraulicLocationWindDirectionClosingSituationIllustrationPointEntity' +CREATE TABLE 'TopLevelSubmechanismIllustrationPointEntity' ( - 'HydraulicLocationWindDirectionClosingSituationIllustrationPointEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, - 'HydraulicLocationGeneralResultEntityId' INTEGER NOT NULL, - 'IllustrationPointName' TEXT NOT NULL, + 'TopLevelSubmechanismIllustrationPointEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + 'GeneralResultSubmechanismIllustrationPointEntityId' INTEGER NOT NULL, + 'SubmechanismIllustrationPointEntityId' INTEGER NOT NULL, 'ClosingSituation' TEXT NOT NULL, 'WindDirectionName' TEXT NOT NULL, 'WindDirectionAngle' REAL NOT NULL, 'Beta' REAL NOT NULL, 'Order' INT (4) NOT NULL, - CONSTRAINT 'FK_HydraulicLocationWindDirectionClosingSituationIllustrationPointEntity_HydraulicLocationGeneralResultEntity' FOREIGN KEY ('HydraulicLocationGeneralResultEntityId') REFERENCES 'HydraulicLocationGeneralResultEntity' ('HydraulicLocationGeneralResultEntityId') ON DELETE Cascade ON UPDATE Cascade + CONSTRAINT 'FK_TopLevelSubmechanismIllustrationPointEntity_GeneralResultSubmechanismIllustrationPointEntity' FOREIGN KEY ('GeneralResultSubmechanismIllustrationPointEntityId') REFERENCES 'GeneralResultSubmechanismIllustrationPointEntity' ('GeneralResultSubmechanismIllustrationPointEntityId') ON DELETE Cascade ON UPDATE Cascade, + CONSTRAINT 'FK_TopLevelSubmechanismIllustrationPointEntity_SubmechanismIllustrationPointEntity' FOREIGN KEY ('SubmechanismIllustrationPointEntityId') REFERENCES 'SubmechanismIllustrationPointEntity' ('SubmechanismIllustrationPointEntityId') ON DELETE Cascade ON UPDATE Cascade ) ; -CREATE TABLE 'HydraulicLocationStochastEntity' +CREATE TABLE 'SubmechanismIllustrationPointStochastEntity' ( - 'HydraulicLocationStochastEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, - 'HydraulicLocationGeneralResultEntityId' INTEGER NOT NULL, + 'SubmechanismIllustrationPointStochastEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + 'SubmechanismIllustrationPointEntityId' INTEGER NOT NULL, 'Name' TEXT NOT NULL, 'Duration' REAL NOT NULL, 'Alpha' REAL NOT NULL, - 'Order' INT (4) NOT NULL, - CONSTRAINT 'FK_HydraulicLocationStochastEntity_HydraulicLocationGeneralResultEntity' FOREIGN KEY ('HydraulicLocationGeneralResultEntityId') REFERENCES 'HydraulicLocationGeneralResultEntity' ('HydraulicLocationGeneralResultEntityId') ON DELETE Cascade ON UPDATE Cascade -) -; - -CREATE TABLE 'HydraulicLocationIllustrationPointResultEntity' -( - 'HydraulicLocationIllustrationPointResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, - 'HydraulicLocationWindDirectionClosingSituationIllustrationPointEntityId' INTEGER NOT NULL, - 'Description' TEXT NOT NULL, - 'Value' REAL NOT NULL, - 'Order' INT (4) NOT NULL, - CONSTRAINT 'FK_HydraulicLocationIllustrationPointResultEntity_HydraulicLocationWindDirectionClosingSituationIllustrationPointEntity' FOREIGN KEY ('HydraulicLocationWindDirectionClosingSituationIllustrationPointEntityId') REFERENCES 'HydraulicLocationWindDirectionClosingSituationIllustrationPointEntity' ('HydraulicLocationWindDirectionClosingSituationIllustrationPointEntityId') ON DELETE Cascade ON UPDATE Cascade -) -; - -CREATE TABLE 'HydraulicLocationRealizedStochastEntity' -( - 'HydraulicLocationRealizedStochastEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, - 'HydraulicLocationWindDirectionClosingSituationIllustrationPointEntityId' INTEGER NOT NULL, - 'Name' TEXT NOT NULL, - 'Duration' REAL NOT NULL, - 'Alpha' REAL NOT NULL, 'Realization' REAL NOT NULL, 'Order' INT (4) NOT NULL, - CONSTRAINT 'FK_HydraulicLocationRealizedStochastEntity_HydraulicLocationWindDirectionClosingSituationIllustrationPointEntity' FOREIGN KEY ('HydraulicLocationWindDirectionClosingSituationIllustrationPointEntityId') REFERENCES 'HydraulicLocationWindDirectionClosingSituationIllustrationPointEntity' ('HydraulicLocationWindDirectionClosingSituationIllustrationPointEntityId') ON DELETE Cascade ON UPDATE Cascade + CONSTRAINT 'FK_SubmechanismIllustrationPointStochast_SubmechanismIllustrationPointEntity' FOREIGN KEY ('SubmechanismIllustrationPointEntityId') REFERENCES 'SubmechanismIllustrationPointEntity' ('SubmechanismIllustrationPointEntityId') ON DELETE No Action ON UPDATE No Action ) ; @@ -1602,6 +1553,10 @@ ON 'FailureMechanismSectionEntity' ('FailureMechanismEntityId' ASC) ; +CREATE INDEX 'IXFK_PipingFailureMechanismMetaEntity_FailureMechanismEntity' + ON 'PipingFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC) +; + CREATE INDEX 'IXFK_FailureMechanismEntity_AssessmentSectionEntity' ON 'FailureMechanismEntity' ('AssessmentSectionEntityId' ASC) ; @@ -1610,18 +1565,14 @@ ON 'FailureMechanismEntity' ('CalculationGroupEntityId' ASC) ; -CREATE INDEX 'IXFK_PipingFailureMechanismMetaEntity_FailureMechanismEntity' - ON 'PipingFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC) +CREATE INDEX 'IXFK_StabilityStoneCoverFailureMechanismMetaEntity_FailureMechanismEntity' + ON 'StabilityStoneCoverFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC) ; CREATE INDEX 'IXFK_ClosingStructuresFailureMechanismMetaEntity_FailureMechanismEntity' ON 'ClosingStructuresFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC) ; -CREATE INDEX 'IXFK_StabilityStoneCoverFailureMechanismMetaEntity_FailureMechanismEntity' - ON 'StabilityStoneCoverFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC) -; - CREATE INDEX 'IXFK_CalculationGroupEntity_CalculationGroupEntity' ON 'CalculationGroupEntity' ('ParentCalculationGroupEntityId' ASC) ; @@ -1630,16 +1581,12 @@ ON 'StabilityPointStructuresFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC) ; -CREATE INDEX 'IXFK_HydraulicLocationEntity_AssessmentSectionEntity' - ON 'HydraulicLocationEntity' ('AssessmentSectionEntityId' ASC) -; - CREATE INDEX 'IXFK_DuneErosionFailureMechanismMetaEntity_FailureMechanismEntity' ON 'DuneErosionFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC) ; -CREATE INDEX 'IXFK_GrassCoverErosionInwardsFailureMechanismMetaEntity_FailureMechanismEntity' - ON 'GrassCoverErosionInwardsFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC) +CREATE INDEX 'IXFK_HydraulicLocationEntity_AssessmentSectionEntity' + ON 'HydraulicLocationEntity' ('AssessmentSectionEntityId' ASC) ; CREATE INDEX 'IXFK_PipingCalculationEntity_StochasticSoilProfileEntity' @@ -1658,6 +1605,10 @@ ON 'PipingCalculationEntity' ('CalculationGroupEntityId' ASC) ; +CREATE INDEX 'IXFK_GrassCoverErosionInwardsFailureMechanismMetaEntity_FailureMechanismEntity' + ON 'GrassCoverErosionInwardsFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC) +; + CREATE INDEX 'IXFK_HeightStructuresFailureMechanismMetaEntity_FailureMechanismEntity' ON 'HeightStructuresFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC) ; @@ -1918,13 +1869,41 @@ ON 'StabilityPointStructuresOutputEntity' ('StabilityPointStructuresCalculationEntityId' ASC) ; +CREATE INDEX 'IXFK_HydraulicLocationOutputEntity_GeneralResultSubMechanismIllustrationPointEntity' + ON 'HydraulicLocationOutputEntity' ('GeneralResultSubmechanismIllustrationPointEntityId' ASC) +; + CREATE INDEX 'IXFK_HydraulicLocationOutputEntity_HydraulicLocationEntity' ON 'HydraulicLocationOutputEntity' ('HydraulicLocationEntityId' ASC) ; +CREATE TRIGGER [TR_AfterDeleteHydraulicLocationOutputEntity_RemoveGeneralResultSubmechanismIllustrationPointEntity] + AFTER DELETE + ON HydraulicLocationOutputEntity + FOR EACH ROW + BEGIN + DELETE FROM GeneralResultSubmechanismIllustrationPointEntity + WHERE OLD.GeneralResultSubmechanismIllustrationPointEntityId IS NOT NULL AND + GeneralResultSubmechanismIllustrationPointEntityId IS OLD.GeneralResultSubmechanismIllustrationPointEntityId; +END; +; +CREATE INDEX 'IXFK_GrassCoverErosionOutwardsHydraulicLocationOutputEntity_GeneralResultSubMechanismIllustrationPointEntity' + ON 'GrassCoverErosionOutwardsHydraulicLocationOutputEntity' ('GeneralResultSubmechanismIllustrationPointEntityId' ASC) +; + CREATE INDEX 'IXFK_GrassCoverErosionOutwardsHydraulicLocationOutputEntity_GrassCoverErosionOutwardsHydraulicLocationEntity' ON 'GrassCoverErosionOutwardsHydraulicLocationOutputEntity' ('GrassCoverErosionOutwardsHydraulicLocationEntityId' ASC) ; +CREATE TRIGGER [TR_AfterDeleteGrassCoverErosionOuwardsHydraulicLocationOutputEntity_RemoveGeneralResultSubmechanismIllustrationPointEntity] + AFTER DELETE + ON GrassCoverErosionOutwardsHydraulicLocationOutputEntity + FOR EACH ROW + BEGIN + DELETE FROM GrassCoverErosionOutwardsHydraulicLocationOutputEntity + WHERE OLD.GrassCoverErosionOutwardsHydraulicLocationOutputEntityId IS NOT NULL AND + GrassCoverErosionOutwardsHydraulicLocationOutputEntityId IS OLD.GrassCoverErosionOutwardsHydraulicLocationOutputEntityId; +END; +; CREATE INDEX 'IXFK_DuneLocationEntity_FailureMechanismEntity' ON 'DuneLocationEntity' ('FailureMechanismEntityId' ASC) @@ -1946,42 +1925,46 @@ ON 'GrassCoverErosionInwardsOvertoppingRateOutputEntity' ('GrassCoverErosionInwardsOutputEntityId' ASC) ; -CREATE INDEX 'IXFK_GrassCoverErosionOutwardsHydraulicLocationGeneralResultEntity_GrassCoverErosionOutwardsHydraulicLocationOutputEntity' - ON 'GrassCoverErosionOutwardsHydraulicLocationGeneralResultEntity' ('GrassCoverErosionOutwardsHydraulicLocationOutputEntityId' ASC) +CREATE INDEX 'IXFK_IllustrationPointResultEntity_SubmechanismIllustrationPointEntity' + ON 'IllustrationPointResultEntity' ('SubmechanismIllustrationPointEntityId' ASC) ; -CREATE INDEX 'IXFK_GrassCoverErosionOutwardsHydraulicLocationStochastEntity_GrassCoverErosionOutwardsHydraulicLocationGeneralResultEntity' - ON 'GrassCoverErosionOutwardsHydraulicLocationStochastEntity' ('GrassCoverErosionOutwardsHydraulicLocationGeneralResultEntityId' ASC) +CREATE INDEX 'IXFK_GeneralResultSubmechanismIllustrationPointStochastEntity_GeneralResultSubmechanismIllustrationPointEntity' + ON 'GeneralResultSubmechanismIllustrationPointStochastEntity' ('GeneralResultSubmechanismIllustrationPointEntityId' ASC) ; -CREATE INDEX 'IXFK_GrassCoverErosionOutwardsHydraulicLocationWindDirectionClosingSituationIllustrationPointEntity_GrassCoverErosionOutwardsHydraulicLocationGeneralResultEntity' - ON 'GrassCoverErosionOutwardsHydraulicLocationWindDirectionClosingSituationIllustrationPointEntity' ('GrassCoverErosionOutwardsHydraulicLocationGeneralResultEntityId' ASC) +CREATE INDEX 'IXFK_GeneralResultSubmechanismIllustrationPointStochastEntity_StochastEntity' + ON 'GeneralResultSubmechanismIllustrationPointStochastEntity' ('StochastEntityId' ASC) ; - -CREATE INDEX 'IXFK_GrassCoverErosionOutwardsHydraulicLocationIllustrationPointResultEntity_GrassCoverErosionOutwardsHydraulicLocationWindDirectionClosingSituationIllustrationPointEntity' - ON 'GrassCoverErosionOutwardsHydraulicLocationIllustrationPointResultEntity' ('GrassCoverErosionOutwardsHydraulicLocationWindDirectionClosingSituationIllustrationPointEntityId' ASC) +CREATE TRIGGER [TR_AfterDeleteGeneralResultSubmechanismIllustrationPointStochastEntity_RemoveStochastEntity] + AFTER DELETE + ON GeneralResultSubmechanismIllustrationPointStochastEntity + FOR EACH ROW +BEGIN + DELETE FROM StochastEntity + WHERE OLD.StochastEntityId IS NOT NULL AND + StochastEntityId IS OLD.StochastEntityId; +END; ; -CREATE INDEX 'IXFK_GrassCoverErosionOutwardsHydraulicLocationRealizedStochastEntity_GrassCoverErosionOutwardsHydraulicLocationWindDirectionClosingSituationIllustrationPointEntity' - ON 'GrassCoverErosionOutwardsHydraulicLocationRealizedStochastEntity' ('GrassCoverErosionOutwardsHydraulicLocationWindDirectionClosingSituationIllustrationPointEntityId' ASC) +CREATE INDEX 'IXFK_TopLevelSubmechanismIllustrationPointEntity_GeneralResultSubmechanismIllustrationPointEntity' + ON 'TopLevelSubmechanismIllustrationPointEntity' ('GeneralResultSubmechanismIllustrationPointEntityId' ASC) ; -CREATE INDEX 'IXFK_HydraulicLocationGeneralResultEntity_HydraulicLocationOutputEntity' - ON 'HydraulicLocationGeneralResultEntity' ('HydraulicLocationEntityOutputId' ASC) +CREATE INDEX 'IXFK_TopLevelSubmechanismIllustrationPointEntity_SubmechanismIllustrationPointEntity' + ON 'TopLevelSubmechanismIllustrationPointEntity' ('SubmechanismIllustrationPointEntityId' ASC) ; - -CREATE INDEX 'IXFK_HydraulicLocationWindDirectionClosingSituationIllustrationPointEntity_HydraulicLocationGeneralResultEntity' - ON 'HydraulicLocationWindDirectionClosingSituationIllustrationPointEntity' ('HydraulicLocationGeneralResultEntityId' ASC) +CREATE TRIGGER [TR_AfterDeleteTopLevelSubmechanismIllustrationPointEntity_RemoveSubmechanismIllustrationPointEntity] + AFTER DELETE + ON TopLevelSubmechanismIllustrationPointEntity + FOR EACH ROW +BEGIN + DELETE FROM SubmechanismIllustrationPointEntity + WHERE OLD.SubmechanismIllustrationPointEntityId IS NOT NULL AND + SubmechanismIllustrationPointEntityId IS OLD.SubmechanismIllustrationPointEntityId; +END; ; -CREATE INDEX 'IXFK_HydraulicLocationStochastEntity_HydraulicLocationGeneralResultEntity' - ON 'HydraulicLocationStochastEntity' ('HydraulicLocationGeneralResultEntityId' ASC) +CREATE INDEX 'IXFK_SubmechanismIllustrationPointStochast_SubmechanismIllustrationPointEntity' + ON 'SubmechanismIllustrationPointStochastEntity' ('SubmechanismIllustrationPointEntityId' ASC) ; - -CREATE INDEX 'IXFK_HydraulicLocationIllustrationPointResultEntity_HydraulicLocationWindDirectionClosingSituationIllustrationPointEntity' - ON 'HydraulicLocationIllustrationPointResultEntity' ('HydraulicLocationWindDirectionClosingSituationIllustrationPointEntityId' ASC) -; - -CREATE INDEX 'IXFK_HydraulicLocationRealizedStochastEntity_HydraulicLocationWindDirectionClosingSituationIllustrationPointEntity' - ON 'HydraulicLocationRealizedStochastEntity' ('HydraulicLocationWindDirectionClosingSituationIllustrationPointEntityId' ASC) -; Index: Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_17.1_17.2.sql =================================================================== diff -u -rcd8dafe17aacbb6c89d0ed361da5134d9b04517b -r54242411470f330f6f4c75d1d05bfd0911706873 --- Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_17.1_17.2.sql (.../Migration_17.1_17.2.sql) (revision cd8dafe17aacbb6c89d0ed361da5134d9b04517b) +++ Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_17.1_17.2.sql (.../Migration_17.1_17.2.sql) (revision 54242411470f330f6f4c75d1d05bfd0911706873) @@ -186,7 +186,29 @@ 0, [Order] FROM [SOURCEPROJECT].GrassCoverErosionOutwardsHydraulicLocationEntity; -INSERT INTO GrassCoverErosionOutwardsHydraulicLocationOutputEntity SELECT * FROM [SOURCEPROJECT].GrassCoverErosionOutwardsHydraulicLocationOutputEntity; +INSERT INTO GrassCoverErosionOutwardsHydraulicLocationOutputEntity( + [GrassCoverErosionOutwardsHydraulicLocationOutputEntityId], + [GrassCoverErosionOutwardsHydraulicLocationEntityId], + [GeneralResultSubmechanismIllustrationPointEntityId], + [HydraulicLocationOutputType], + [Result], + [TargetProbability], + [TargetReliability], + [CalculatedProbability], + [CalculatedReliability], + [CalculationConvergence]) +SELECT + [GrassCoverErosionOutwardsHydraulicLocationOutputEntityId], + [GrassCoverErosionOutwardsHydraulicLocationEntityId], + NULL, + [HydraulicLocationOutputType], + [Result], + [TargetProbability], + [TargetReliability], + [CalculatedProbability], + [CalculatedReliability], + [CalculationConvergence] + FROM [SOURCEPROJECT].GrassCoverErosionOutwardsHydraulicLocationOutputEntity; INSERT INTO GrassCoverErosionOutwardsSectionResultEntity SELECT * FROM [SOURCEPROJECT].GrassCoverErosionOutwardsSectionResultEntity; INSERT INTO GrassCoverErosionOutwardsWaveConditionsCalculationEntity SELECT * FROM [SOURCEPROJECT].GrassCoverErosionOutwardsWaveConditionsCalculationEntity; INSERT INTO GrassCoverErosionOutwardsWaveConditionsOutputEntity SELECT * FROM [SOURCEPROJECT].GrassCoverErosionOutwardsWaveConditionsOutputEntity; @@ -285,7 +307,29 @@ 0, [Order] FROM [SOURCEPROJECT].HydraulicLocationEntity; -INSERT INTO HydraulicLocationOutputEntity SELECT * FROM [SOURCEPROJECT].HydraulicLocationOutputEntity; +INSERT INTO HydraulicLocationOutputEntity( + [HydraulicLocationEntityOutputId], + [HydraulicLocationEntityId], + [GeneralResultSubmechanismIllustrationPointEntityId], + [HydraulicLocationOutputType], + [Result], + [TargetProbability], + [TargetReliability], + [CalculatedProbability], + [CalculatedReliability], + [CalculationConvergence]) +SELECT + [HydraulicLocationEntityOutputId], + [HydraulicLocationEntityId], + NULL, + [HydraulicLocationOutputType], + [Result], + [TargetProbability], + [TargetReliability], + [CalculatedProbability], + [CalculatedReliability], + [CalculationConvergence] + FROM [SOURCEPROJECT].HydraulicLocationOutputEntity; INSERT INTO MacroStabilityInwardsSectionResultEntity ( [MacroStabilityInwardsSectionResultEntityId], [FailureMechanismSectionEntityId], Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj =================================================================== diff -u -ra06740b53b2afe4f6db49a0f54ba9f743da131b1 -r54242411470f330f6f4c75d1d05bfd0911706873 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision a06740b53b2afe4f6db49a0f54ba9f743da131b1) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision 54242411470f330f6f4c75d1d05bfd0911706873) @@ -138,6 +138,9 @@ RingtoetsEntities.tt + + RingtoetsEntities.tt + RingtoetsEntities.tt @@ -162,24 +165,9 @@ RingtoetsEntities.tt - - RingtoetsEntities.tt - - - RingtoetsEntities.tt - RingtoetsEntities.tt - - RingtoetsEntities.tt - - - RingtoetsEntities.tt - - - RingtoetsEntities.tt - RingtoetsEntities.tt @@ -213,29 +201,14 @@ RingtoetsEntities.tt - - RingtoetsEntities.tt - - - RingtoetsEntities.tt - RingtoetsEntities.tt - + + RingtoetsEntities.tt - - RingtoetsEntities.tt - - - RingtoetsEntities.tt - - - - - RingtoetsEntities.tt @@ -245,12 +218,6 @@ RingtoetsEntities.tt - - - - - - @@ -315,6 +282,9 @@ RingtoetsEntities.tt + + RingtoetsEntities.tt + RingtoetsEntities.tt @@ -324,12 +294,21 @@ RingtoetsEntities.tt + + RingtoetsEntities.tt + + + RingtoetsEntities.tt + RingtoetsEntities.tt RingtoetsEntities.tt + + RingtoetsEntities.tt + RingtoetsEntities.tt @@ -370,8 +349,8 @@ - - + + Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/IllustrationPoints/IllustrationPointResultCreateExtensions.cs =================================================================== diff -u -r4938d7e24964edb84ebeb51f96d021bd03501d1f -r54242411470f330f6f4c75d1d05bfd0911706873 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/IllustrationPoints/IllustrationPointResultCreateExtensions.cs (.../IllustrationPointResultCreateExtensions.cs) (revision 4938d7e24964edb84ebeb51f96d021bd03501d1f) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/IllustrationPoints/IllustrationPointResultCreateExtensions.cs (.../IllustrationPointResultCreateExtensions.cs) (revision 54242411470f330f6f4c75d1d05bfd0911706873) @@ -28,30 +28,30 @@ { /// /// Extension methods for related to creating an instance - /// of . + /// of . /// internal static class IllustrationPointResultCreateExtensions { /// - /// Creates a based on the + /// Creates a based on the /// information of the . /// /// The illustration point result to create a database /// entity for. /// The index at which /// resides within its parent. - /// A new . + /// A new . /// Thrown when /// is null. - public static HydraulicLocationIllustrationPointResultEntity CreateHydraulicLocationIllustrationPointResultEntity( + public static IllustrationPointResultEntity CreateIllustrationPointResultEntity( this IllustrationPointResult illustrationPointResult, int order) { if (illustrationPointResult == null) { throw new ArgumentNullException(nameof(illustrationPointResult)); } - var entity = new HydraulicLocationIllustrationPointResultEntity + var entity = new IllustrationPointResultEntity() { Description = illustrationPointResult.Description.DeepClone(), Value = illustrationPointResult.Value, @@ -60,34 +60,5 @@ return entity; } - - /// - /// Creates a based on the - /// information of the . - /// - /// The illustration point result to create a database - /// entity for. - /// The index at which - /// resides within its parent. - /// A new . - /// Thrown when - /// is null. - public static GrassCoverErosionOutwardsHydraulicLocationIllustrationPointResultEntity CreateGrassCoverErosionOutwardsHydraulicLocationIllustrationPointResultEntity( - this IllustrationPointResult illustrationPointResult, int order) - { - if (illustrationPointResult == null) - { - throw new ArgumentNullException(nameof(illustrationPointResult)); - } - - var entity = new GrassCoverErosionOutwardsHydraulicLocationIllustrationPointResultEntity - { - Description = illustrationPointResult.Description.DeepClone(), - Value = illustrationPointResult.Value, - Order = order - }; - - return entity; - } } } \ No newline at end of file Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/IllustrationPoints/StochastCreateExtensions.cs =================================================================== diff -u -r30df7a3cabc5c48307afa542944fc17fd7a355e3 -r54242411470f330f6f4c75d1d05bfd0911706873 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/IllustrationPoints/StochastCreateExtensions.cs (.../StochastCreateExtensions.cs) (revision 30df7a3cabc5c48307afa542944fc17fd7a355e3) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/IllustrationPoints/StochastCreateExtensions.cs (.../StochastCreateExtensions.cs) (revision 54242411470f330f6f4c75d1d05bfd0911706873) @@ -27,28 +27,28 @@ namespace Application.Ringtoets.Storage.Create.IllustrationPoints { /// - /// Extension methods for related to creating an instance of . + /// Extension methods for related to creating an instance of . /// internal static class StochastCreateExtensions { /// - /// Creates a based on the information + /// Creates a based on the information /// of the . /// /// The stochast to create a database entity for. /// The index at which resides within its parent. - /// A new . + /// A new . /// Thrown when /// is null. - public static HydraulicLocationStochastEntity CreateHydraulicLocationStochastEntity( + public static StochastEntity CreateStochastEntity( this Stochast stochast, int order) { if (stochast == null) { throw new ArgumentNullException(nameof(stochast)); } - var entity = new HydraulicLocationStochastEntity + var entity = new StochastEntity() { Name = stochast.Name.DeepClone(), Alpha = stochast.Alpha, @@ -58,33 +58,5 @@ return entity; } - - /// - /// Creates a based - /// on the information of the . - /// - /// The stochast to create a database entity for. - /// The index at which resides within its parent. - /// A new . - /// Thrown when - /// is null. - public static GrassCoverErosionOutwardsHydraulicLocationStochastEntity CreateGrassCoverErosionOutwardsHydraulicLocationStochastEntity( - this Stochast stochast, int order) - { - if (stochast == null) - { - throw new ArgumentNullException(nameof(stochast)); - } - - var entity = new GrassCoverErosionOutwardsHydraulicLocationStochastEntity - { - Name = stochast.Name.DeepClone(), - Alpha = stochast.Alpha, - Duration = stochast.Duration, - Order = order - }; - - return entity; - } } } \ No newline at end of file Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/IllustrationPoints/SubmechanismIllustrationPointStochastCreateExtensions.cs =================================================================== diff -u -ra06740b53b2afe4f6db49a0f54ba9f743da131b1 -r54242411470f330f6f4c75d1d05bfd0911706873 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/IllustrationPoints/SubmechanismIllustrationPointStochastCreateExtensions.cs (.../SubmechanismIllustrationPointStochastCreateExtensions.cs) (revision a06740b53b2afe4f6db49a0f54ba9f743da131b1) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/IllustrationPoints/SubmechanismIllustrationPointStochastCreateExtensions.cs (.../SubmechanismIllustrationPointStochastCreateExtensions.cs) (revision 54242411470f330f6f4c75d1d05bfd0911706873) @@ -28,28 +28,28 @@ { /// /// Extension methods for related to creating an instance of - /// . + /// . /// internal static class SubmechanismIllustrationPointStochastCreateExtensions { /// - /// Creates a based on the information + /// Creates a based on the information /// of the . /// /// The stochast to create a database entity for. /// The index at which resides within its parent. - /// A new . + /// A new . /// Thrown when /// is null. - public static HydraulicLocationRealizedStochastEntity CreateHydraulicLocationRealizedStochastEntity( + public static SubmechanismIllustrationPointStochastEntity CreateHydraulicLocationRealizedStochastEntity( this SubmechanismIllustrationPointStochast submechanismIllustrationPointStochast, int order) { if (submechanismIllustrationPointStochast == null) { throw new ArgumentNullException(nameof(submechanismIllustrationPointStochast)); } - var entity = new HydraulicLocationRealizedStochastEntity + var entity = new SubmechanismIllustrationPointStochastEntity { Name = submechanismIllustrationPointStochast.Name.DeepClone(), Alpha = submechanismIllustrationPointStochast.Alpha, @@ -60,34 +60,5 @@ return entity; } - - /// - /// Creates a based - /// on the information of the . - /// - /// The stochast to create a database entity for. - /// The index at which resides within its parent. - /// A new . - /// Thrown when - /// is null. - public static GrassCoverErosionOutwardsHydraulicLocationRealizedStochastEntity CreateGrassCoverErosionOutwardsHydraulicLocationRealizedStochastEntity( - this SubmechanismIllustrationPointStochast submechanismIllustrationPointStochast, int order) - { - if (submechanismIllustrationPointStochast == null) - { - throw new ArgumentNullException(nameof(submechanismIllustrationPointStochast)); - } - - var entity = new GrassCoverErosionOutwardsHydraulicLocationRealizedStochastEntity - { - Name = submechanismIllustrationPointStochast.Name.DeepClone(), - Alpha = submechanismIllustrationPointStochast.Alpha, - Duration = submechanismIllustrationPointStochast.Duration, - Realization = submechanismIllustrationPointStochast.Realization, - Order = order - }; - - return entity; - } } } \ No newline at end of file Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GeneralResultSubmechanismIllustrationPointEntity.cs =================================================================== diff -u --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GeneralResultSubmechanismIllustrationPointEntity.cs (revision 0) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GeneralResultSubmechanismIllustrationPointEntity.cs (revision 54242411470f330f6f4c75d1d05bfd0911706873) @@ -0,0 +1,63 @@ +// Copyright (C) Stichting Deltares 2017. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +//------------------------------------------------------------------------------ +// +// This code was generated from a template. +// +// Manual changes to this file may cause unexpected behavior in your application. +// Manual changes to this file will be overwritten if the code is regenerated. +// +//------------------------------------------------------------------------------ + +using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; + +namespace Application.Ringtoets.Storage.DbContext +{ + public class GeneralResultSubmechanismIllustrationPointEntity + { + [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + public GeneralResultSubmechanismIllustrationPointEntity() + { + GrassCoverErosionOutwardsHydraulicLocationOutputEntities = new HashSet(); + HydraulicLocationOutputEntities = new HashSet(); + TopLevelSubmechanismIllustrationPointEntities = new HashSet(); + StochastEntities = new HashSet(); + } + + public long GeneralResultSubmechanismIllustrationPointEntityId { get; set; } + public string GoverningWindDirectionName { get; set; } + public double GoverningWindDirectionAngle { get; set; } + + [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection GrassCoverErosionOutwardsHydraulicLocationOutputEntities { get; set; } + + [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection HydraulicLocationOutputEntities { get; set; } + + [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection TopLevelSubmechanismIllustrationPointEntities { get; set; } + + [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection StochastEntities { get; set; } + } +} \ No newline at end of file Fisheye: Tag 54242411470f330f6f4c75d1d05bfd0911706873 refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsHydraulicLocationGeneralResultEntity.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 54242411470f330f6f4c75d1d05bfd0911706873 refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsHydraulicLocationIllustrationPointResultEntity.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsHydraulicLocationOutputEntity.cs =================================================================== diff -u -rcd8dafe17aacbb6c89d0ed361da5134d9b04517b -r54242411470f330f6f4c75d1d05bfd0911706873 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsHydraulicLocationOutputEntity.cs (.../GrassCoverErosionOutwardsHydraulicLocationOutputEntity.cs) (revision cd8dafe17aacbb6c89d0ed361da5134d9b04517b) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsHydraulicLocationOutputEntity.cs (.../GrassCoverErosionOutwardsHydraulicLocationOutputEntity.cs) (revision 54242411470f330f6f4c75d1d05bfd0911706873) @@ -28,27 +28,16 @@ // //------------------------------------------------------------------------------ -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; - namespace Application.Ringtoets.Storage.DbContext { public partial class GrassCoverErosionOutwardsHydraulicLocationOutputEntity { - [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] - public GrassCoverErosionOutwardsHydraulicLocationOutputEntity() - { - GrassCoverErosionOutwardsHydraulicLocationGeneralResultEntities = new HashSet(); - } - public long GrassCoverErosionOutwardsHydraulicLocationOutputEntityId { get; set; } public long GrassCoverErosionOutwardsHydraulicLocationEntityId { get; set; } + public long? GeneralResultSubmechanismIllustrationPointEntityId { get; set; } + public virtual GeneralResultSubmechanismIllustrationPointEntity GeneralResultSubmechanismIllustrationPointEntity { get; set; } public virtual GrassCoverErosionOutwardsHydraulicLocationEntity GrassCoverErosionOutwardsHydraulicLocationEntity { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection GrassCoverErosionOutwardsHydraulicLocationGeneralResultEntities { get; set; } - public byte HydraulicLocationOutputType { get; set; } public double? Result { get; set; } public double? TargetProbability { get; set; } Fisheye: Tag 54242411470f330f6f4c75d1d05bfd0911706873 refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsHydraulicLocationRealizedStochastEntity.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 54242411470f330f6f4c75d1d05bfd0911706873 refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsHydraulicLocationStochastEntity.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 54242411470f330f6f4c75d1d05bfd0911706873 refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsHydraulicLocationWindDirectionClosingSituationIllustrationPointEntity.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 54242411470f330f6f4c75d1d05bfd0911706873 refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HydraulicLocationGeneralResultEntity.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 54242411470f330f6f4c75d1d05bfd0911706873 refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HydraulicLocationIllustrationPointResultEntity.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HydraulicLocationOutputEntity.cs =================================================================== diff -u -rcd8dafe17aacbb6c89d0ed361da5134d9b04517b -r54242411470f330f6f4c75d1d05bfd0911706873 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HydraulicLocationOutputEntity.cs (.../HydraulicLocationOutputEntity.cs) (revision cd8dafe17aacbb6c89d0ed361da5134d9b04517b) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HydraulicLocationOutputEntity.cs (.../HydraulicLocationOutputEntity.cs) (revision 54242411470f330f6f4c75d1d05bfd0911706873) @@ -28,27 +28,16 @@ // //------------------------------------------------------------------------------ -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; - namespace Application.Ringtoets.Storage.DbContext { public partial class HydraulicLocationOutputEntity { - [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] - public HydraulicLocationOutputEntity() - { - HydraulicLocationGeneralResultEntities = new HashSet(); - } - public long HydraulicLocationEntityOutputId { get; set; } public long HydraulicLocationEntityId { get; set; } + public long? GeneralResultSubmechanismIllustrationPointEntityId { get; set; } + public virtual GeneralResultSubmechanismIllustrationPointEntity GeneralResultSubmechanismIllustrationPointEntity { get; set; } public virtual HydraulicLocationEntity HydraulicLocationEntity { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection HydraulicLocationGeneralResultEntities { get; set; } - public byte HydraulicLocationOutputType { get; set; } public double? Result { get; set; } public double? TargetProbability { get; set; } Fisheye: Tag 54242411470f330f6f4c75d1d05bfd0911706873 refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HydraulicLocationRealizedStochastEntity.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 54242411470f330f6f4c75d1d05bfd0911706873 refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HydraulicLocationStochastEntity.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 54242411470f330f6f4c75d1d05bfd0911706873 refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HydraulicLocationWindDirectionClosingSituationIllustrationPointEntity.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 54242411470f330f6f4c75d1d05bfd0911706873 refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/IIllustrationPointResultEntity.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 54242411470f330f6f4c75d1d05bfd0911706873 refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/IRealizedStochastEntity.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 54242411470f330f6f4c75d1d05bfd0911706873 refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/IStochastEntity.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/IllustrationPointResultEntity.cs =================================================================== diff -u --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/IllustrationPointResultEntity.cs (revision 0) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/IllustrationPointResultEntity.cs (revision 54242411470f330f6f4c75d1d05bfd0911706873) @@ -0,0 +1,43 @@ +// Copyright (C) Stichting Deltares 2017. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +//------------------------------------------------------------------------------ +// +// This code was generated from a template. +// +// Manual changes to this file may cause unexpected behavior in your application. +// Manual changes to this file will be overwritten if the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Application.Ringtoets.Storage.DbContext +{ + public class IllustrationPointResultEntity + { + public long IllustrationPointResultEntityId { get; set; } + public long SubmechanismIllustrationPointEntityId { get; set; } + public string Description { get; set; } + public double Value { get; set; } + public int Order { get; set; } + + public virtual SubmechanismIllustrationPointEntity SubmechanismIllustrationPointEntity { get; set; } + } +} \ No newline at end of file Fisheye: Tag 54242411470f330f6f4c75d1d05bfd0911706873 refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PartialGrassCoverErosionOutwardsHydraulicLocationIllustrationPointResultEntity.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 54242411470f330f6f4c75d1d05bfd0911706873 refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PartialGrassCoverErosionOutwardsHydraulicLocationRealizedStochastEntity.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 54242411470f330f6f4c75d1d05bfd0911706873 refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PartialGrassCoverErosionOutwardsHydraulicLocationStochastEntity.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 54242411470f330f6f4c75d1d05bfd0911706873 refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PartialHydraulicLocationRealizedStochastEntity.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 54242411470f330f6f4c75d1d05bfd0911706873 refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PartialHydraulicLocationStochastEntity.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 54242411470f330f6f4c75d1d05bfd0911706873 refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PartialIllustrationPointResultEntity.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs =================================================================== diff -u -rcd8dafe17aacbb6c89d0ed361da5134d9b04517b -r54242411470f330f6f4c75d1d05bfd0911706873 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs (.../RingtoetsEntities.Context.cs) (revision cd8dafe17aacbb6c89d0ed361da5134d9b04517b) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs (.../RingtoetsEntities.Context.cs) (revision 54242411470f330f6f4c75d1d05bfd0911706873) @@ -53,6 +53,7 @@ public virtual DbSet FailureMechanismEntities { get; set; } public virtual DbSet FailureMechanismSectionEntities { get; set; } public virtual DbSet ForeshoreProfileEntities { get; set; } + public virtual DbSet GeneralResultSubmechanismIllustrationPointEntities { get; set; } public virtual DbSet GrassCoverErosionInwardsCalculationEntities { get; set; } public virtual DbSet GrassCoverErosionInwardsDikeHeightOutputEntities { get; set; } public virtual DbSet GrassCoverErosionInwardsFailureMechanismMetaEntities { get; set; } @@ -61,12 +62,7 @@ public virtual DbSet GrassCoverErosionInwardsSectionResultEntities { get; set; } public virtual DbSet GrassCoverErosionOutwardsFailureMechanismMetaEntities { get; set; } public virtual DbSet GrassCoverErosionOutwardsHydraulicLocationEntities { get; set; } - public virtual DbSet GrassCoverErosionOutwardsHydraulicLocationGeneralResultEntities { get; set; } - public virtual DbSet GrassCoverErosionOutwardsHydraulicLocationIllustrationPointResultEntities { get; set; } public virtual DbSet GrassCoverErosionOutwardsHydraulicLocationOutputEntities { get; set; } - public virtual DbSet GrassCoverErosionOutwardsHydraulicLocationRealizedStochastEntities { get; set; } - public virtual DbSet GrassCoverErosionOutwardsHydraulicLocationStochastEntities { get; set; } - public virtual DbSet GrassCoverErosionOutwardsHydraulicLocationWindDirectionClosingSituationIllustrationPointEntities { get; set; } public virtual DbSet GrassCoverErosionOutwardsSectionResultEntities { get; set; } public virtual DbSet GrassCoverErosionOutwardsWaveConditionsCalculationEntities { get; set; } public virtual DbSet GrassCoverErosionOutwardsWaveConditionsOutputEntities { get; set; } @@ -78,12 +74,8 @@ public virtual DbSet HeightStructuresOutputEntities { get; set; } public virtual DbSet HeightStructuresSectionResultEntities { get; set; } public virtual DbSet HydraulicLocationEntities { get; set; } - public virtual DbSet HydraulicLocationGeneralResultEntities { get; set; } - public virtual DbSet HydraulicLocationIllustrationPointResultEntities { get; set; } public virtual DbSet HydraulicLocationOutputEntities { get; set; } - public virtual DbSet HydraulicLocationRealizedStochastEntities { get; set; } - public virtual DbSet HydraulicLocationStochastEntities { get; set; } - public virtual DbSet HydraulicLocationWindDirectionClosingSituationIllustrationPointEntities { get; set; } + public virtual DbSet IllustrationPointResultEntities { get; set; } public virtual DbSet MacroStabilityInwardsSectionResultEntities { get; set; } public virtual DbSet MacrostabilityOutwardsSectionResultEntities { get; set; } public virtual DbSet MicrostabilitySectionResultEntities { get; set; } @@ -105,11 +97,15 @@ public virtual DbSet StabilityStoneCoverSectionResultEntities { get; set; } public virtual DbSet StabilityStoneCoverWaveConditionsCalculationEntities { get; set; } public virtual DbSet StabilityStoneCoverWaveConditionsOutputEntities { get; set; } + public virtual DbSet StochastEntities { get; set; } public virtual DbSet StochasticSoilModelEntities { get; set; } public virtual DbSet StochasticSoilProfileEntities { get; set; } public virtual DbSet StrengthStabilityLengthwiseConstructionSectionResultEntities { get; set; } + public virtual DbSet SubmechanismIllustrationPointEntities { get; set; } + public virtual DbSet SubmechanismIllustrationPointStochastEntities { get; set; } public virtual DbSet SurfaceLineEntities { get; set; } public virtual DbSet TechnicalInnovationSectionResultEntities { get; set; } + public virtual DbSet TopLevelSubmechanismIllustrationPointEntities { get; set; } public virtual DbSet VersionEntities { get; set; } public virtual DbSet WaterPressureAsphaltCoverSectionResultEntities { get; set; } public virtual DbSet WaveImpactAsphaltCoverFailureMechanismMetaEntities { get; set; } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx =================================================================== diff -u -rd243615e7ed29cb5d82b10ce5bbb74eed0402183 -r54242411470f330f6f4c75d1d05bfd0911706873 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision d243615e7ed29cb5d82b10ce5bbb74eed0402183) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 54242411470f330f6f4c75d1d05bfd0911706873) @@ -4,7 +4,7 @@ - + @@ -284,6 +284,22 @@ + + + + + + + + + + + + + + + + @@ -389,31 +405,13 @@ - - - - - - - - - - - - - - - - - - - + @@ -422,42 +420,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -634,31 +596,13 @@ - - - - - - - - - - - - - - - - - - - + @@ -667,42 +611,16 @@ - + - + - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - @@ -1076,6 +994,16 @@ + + + + + + + + + + @@ -1106,6 +1034,27 @@ + + + + + + + + + + + + + + + + + + + + + @@ -1127,6 +1076,19 @@ + + + + + + + + + + + + + @@ -1479,6 +1441,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -1611,30 +1597,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1647,42 +1609,18 @@ - - - + + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - @@ -1887,30 +1825,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1923,42 +1837,30 @@ - - - + + + - - + + - - + + - - - + + + - - + + - - + + - - - - - - - - - - - - @@ -2343,6 +2245,18 @@ + + + + + + + + + + + + @@ -2367,6 +2281,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -2470,6 +2408,8 @@ + + @@ -2478,12 +2418,7 @@ - - - - - @@ -2495,12 +2430,8 @@ - - - - - + @@ -2522,11 +2453,15 @@ + + + + @@ -2625,6 +2560,14 @@ + + + + + + + + @@ -2669,30 +2612,14 @@ - - - - - - - - - - - + + + - - - - - - - - @@ -2761,30 +2688,18 @@ - - - - - - - - - - - + + + - - - + + + - - - - @@ -2913,6 +2828,10 @@ + + + + @@ -2921,6 +2840,14 @@ + + + + + + + + @@ -2973,6 +2900,7 @@ + @@ -2981,12 +2909,7 @@ - - - - - @@ -2998,12 +2921,8 @@ - - - - - + @@ -3025,11 +2944,15 @@ + + + + @@ -3296,6 +3219,18 @@ + + + + + + + + + + + + @@ -3324,26 +3259,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -3384,26 +3299,10 @@ - - - + + + - - - - - - - - - - - - - - - - @@ -3448,10 +3347,22 @@ + + + + + + + + + + + + @@ -3817,6 +3728,18 @@ + + + + + + + + + + + + @@ -3939,86 +3862,23 @@ - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4224,86 +4084,34 @@ - - - - - - - - - - - - - - - - - - - - - - - + + - - + - + - - - - - - + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -4714,6 +4522,17 @@ + + + + + + + + + + + @@ -4750,6 +4569,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4775,6 +4619,21 @@ + + + + + + + + + + + + + + + @@ -5639,6 +5498,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -5723,66 +5618,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -5903,66 +5738,18 @@ - - - + + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6095,6 +5882,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -6107,6 +5918,10 @@ + + + + @@ -6410,6 +6225,15 @@ + + + + + + + + + @@ -6523,27 +6347,6 @@ - - - - - - - - - - - - - - - - - - - - - @@ -6554,50 +6357,12 @@ + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -6785,27 +6550,6 @@ - - - - - - - - - - - - - - - - - - - - - @@ -6816,50 +6560,23 @@ + - - - + + + - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -7254,6 +6971,17 @@ + + + + + + + + + + + @@ -7287,6 +7015,29 @@ + + + + + + + + + + + + + + + + + + + + + + + @@ -7310,6 +7061,20 @@ + + + + + + + + + + + + + + @@ -7392,6 +7157,14 @@ + + + + + + + + Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram =================================================================== diff -u -rd243615e7ed29cb5d82b10ce5bbb74eed0402183 -r54242411470f330f6f4c75d1d05bfd0911706873 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision d243615e7ed29cb5d82b10ce5bbb74eed0402183) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision 54242411470f330f6f4c75d1d05bfd0911706873) @@ -5,87 +5,83 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -151,18 +147,16 @@ + + + - - - - - @@ -173,11 +167,7 @@ - - - - - + @@ -189,7 +179,10 @@ + + + Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StochastEntity.cs =================================================================== diff -u --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StochastEntity.cs (revision 0) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StochastEntity.cs (revision 54242411470f330f6f4c75d1d05bfd0911706873) @@ -0,0 +1,53 @@ +// Copyright (C) Stichting Deltares 2017. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +//------------------------------------------------------------------------------ +// +// This code was generated from a template. +// +// Manual changes to this file may cause unexpected behavior in your application. +// Manual changes to this file will be overwritten if the code is regenerated. +// +//------------------------------------------------------------------------------ + +using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; + +namespace Application.Ringtoets.Storage.DbContext +{ + public class StochastEntity + { + [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + public StochastEntity() + { + GeneralResultSubmechanismIllustrationPointEntities = new HashSet(); + } + + public long StochastEntityId { get; set; } + public string Name { get; set; } + public double Duration { get; set; } + public double Alpha { get; set; } + public int Order { get; set; } + + [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection GeneralResultSubmechanismIllustrationPointEntities { get; set; } + } +} \ No newline at end of file Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/SubmechanismIllustrationPointEntity.cs =================================================================== diff -u --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/SubmechanismIllustrationPointEntity.cs (revision 0) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/SubmechanismIllustrationPointEntity.cs (revision 54242411470f330f6f4c75d1d05bfd0911706873) @@ -0,0 +1,60 @@ +// Copyright (C) Stichting Deltares 2017. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +//------------------------------------------------------------------------------ +// +// This code was generated from a template. +// +// Manual changes to this file may cause unexpected behavior in your application. +// Manual changes to this file will be overwritten if the code is regenerated. +// +//------------------------------------------------------------------------------ + +using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; + +namespace Application.Ringtoets.Storage.DbContext +{ + public class SubmechanismIllustrationPointEntity + { + [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + public SubmechanismIllustrationPointEntity() + { + IllustrationPointResultEntities = new HashSet(); + SubmechanismIllustrationPointStochastEntities = new HashSet(); + TopLevelSubmechanismIllustrationPointEntities = new HashSet(); + } + + public long SubmechanismIllustrationPointEntityId { get; set; } + public string Name { get; set; } + public double Beta { get; set; } + public int Order { get; set; } + + [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection IllustrationPointResultEntities { get; set; } + + [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection SubmechanismIllustrationPointStochastEntities { get; set; } + + [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection TopLevelSubmechanismIllustrationPointEntities { get; set; } + } +} \ No newline at end of file Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/SubmechanismIllustrationPointStochastEntity.cs =================================================================== diff -u --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/SubmechanismIllustrationPointStochastEntity.cs (revision 0) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/SubmechanismIllustrationPointStochastEntity.cs (revision 54242411470f330f6f4c75d1d05bfd0911706873) @@ -0,0 +1,45 @@ +// Copyright (C) Stichting Deltares 2017. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +//------------------------------------------------------------------------------ +// +// This code was generated from a template. +// +// Manual changes to this file may cause unexpected behavior in your application. +// Manual changes to this file will be overwritten if the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Application.Ringtoets.Storage.DbContext +{ + public class SubmechanismIllustrationPointStochastEntity + { + public long SubmechanismIllustrationPointStochastEntityId { get; set; } + public long SubmechanismIllustrationPointEntityId { get; set; } + public string Name { get; set; } + public double Duration { get; set; } + public double Alpha { get; set; } + public double Realization { get; set; } + public int Order { get; set; } + + public virtual SubmechanismIllustrationPointEntity SubmechanismIllustrationPointEntity { get; set; } + } +} \ No newline at end of file Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/TopLevelSubmechanismIllustrationPointEntity.cs =================================================================== diff -u --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/TopLevelSubmechanismIllustrationPointEntity.cs (revision 0) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/TopLevelSubmechanismIllustrationPointEntity.cs (revision 54242411470f330f6f4c75d1d05bfd0911706873) @@ -0,0 +1,47 @@ +// Copyright (C) Stichting Deltares 2017. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +//------------------------------------------------------------------------------ +// +// This code was generated from a template. +// +// Manual changes to this file may cause unexpected behavior in your application. +// Manual changes to this file will be overwritten if the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Application.Ringtoets.Storage.DbContext +{ + public class TopLevelSubmechanismIllustrationPointEntity + { + public long TopLevelSubmechanismIllustrationPointEntityId { get; set; } + public long GeneralResultSubmechanismIllustrationPointEntityId { get; set; } + public long SubmechanismIllustrationPointEntityId { get; set; } + public string ClosingSituation { get; set; } + public string WindDirectionName { get; set; } + public double WindDirectionAngle { get; set; } + public double Beta { get; set; } + public int Order { get; set; } + + public virtual GeneralResultSubmechanismIllustrationPointEntity GeneralResultSubmechanismIllustrationPointEntity { get; set; } + public virtual SubmechanismIllustrationPointEntity SubmechanismIllustrationPointEntity { get; set; } + } +} \ No newline at end of file Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/IllustrationPoints/IIllustrationPointResultEntityReadExtensions.cs =================================================================== diff -u -r4938d7e24964edb84ebeb51f96d021bd03501d1f -r54242411470f330f6f4c75d1d05bfd0911706873 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/IllustrationPoints/IIllustrationPointResultEntityReadExtensions.cs (.../IIllustrationPointResultEntityReadExtensions.cs) (revision 4938d7e24964edb84ebeb51f96d021bd03501d1f) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/IllustrationPoints/IIllustrationPointResultEntityReadExtensions.cs (.../IIllustrationPointResultEntityReadExtensions.cs) (revision 54242411470f330f6f4c75d1d05bfd0911706873) @@ -26,20 +26,20 @@ namespace Application.Ringtoets.Storage.Read.IllustrationPoints { /// - /// Extension methods for related to creating an + /// Extension methods for related to creating an /// . /// - internal static class IIllustrationPointResultEntityReadExtensions + internal static class IllustrationPointResultEntityReadExtensions { /// - /// Reads the and use the information to + /// Reads the and use the information to /// construct an . /// - /// The to create + /// The to create /// for. /// A new . /// Thrown when is null. - public static IllustrationPointResult Read(this IIllustrationPointResultEntity entity) + public static IllustrationPointResult Read(this IllustrationPointResultEntity entity) { if (entity == null) { Fisheye: Tag 54242411470f330f6f4c75d1d05bfd0911706873 refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/Read/IllustrationPoints/IStochastEntityReadExtensions.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 54242411470f330f6f4c75d1d05bfd0911706873 refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/Read/IllustrationPoints/ISubmechanismIllustrationPointStochastEntityReadExtensions.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/IllustrationPoints/StochastEntityReadExtensions.cs =================================================================== diff -u --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/IllustrationPoints/StochastEntityReadExtensions.cs (revision 0) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/IllustrationPoints/StochastEntityReadExtensions.cs (revision 54242411470f330f6f4c75d1d05bfd0911706873) @@ -0,0 +1,51 @@ +// Copyright (C) Stichting Deltares 2017. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System; +using Application.Ringtoets.Storage.DbContext; +using Ringtoets.Common.Data.Hydraulics.IllustrationPoints; + +namespace Application.Ringtoets.Storage.Read.IllustrationPoints +{ + /// + /// Extension methods for related to creating a . + /// + internal static class StochastEntityReadExtensions + { + /// + /// Reads the and use the information to construct a . + /// + /// The to create for. + /// A new . + /// Thrown when is null. + public static Stochast Read(this StochastEntity entity) + { + if (entity == null) + { + throw new ArgumentNullException(nameof(entity)); + } + + return new Stochast(entity.Name, + entity.Duration, + entity.Alpha); + } + } +} \ No newline at end of file Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/IllustrationPoints/SubmechanismIllustrationPointStochastEntityReadExtensions.cs =================================================================== diff -u --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/IllustrationPoints/SubmechanismIllustrationPointStochastEntityReadExtensions.cs (revision 0) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/IllustrationPoints/SubmechanismIllustrationPointStochastEntityReadExtensions.cs (revision 54242411470f330f6f4c75d1d05bfd0911706873) @@ -0,0 +1,55 @@ +// Copyright (C) Stichting Deltares 2017. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System; +using Application.Ringtoets.Storage.DbContext; +using Ringtoets.Common.Data.Hydraulics.IllustrationPoints; + +namespace Application.Ringtoets.Storage.Read.IllustrationPoints +{ + /// + /// Extension methods for + /// related to creating a . + /// + internal static class SubmechanismIllustrationPointStochastEntityReadExtensions + { + /// + /// Reads the + /// and use the information to construct a . + /// + /// The to create + /// for. + /// A new . + /// Thrown when is null. + public static SubmechanismIllustrationPointStochast Read(this SubmechanismIllustrationPointStochastEntity entity) + { + if (entity == null) + { + throw new ArgumentNullException(nameof(entity)); + } + + return new SubmechanismIllustrationPointStochast(entity.Name, + entity.Duration, + entity.Alpha, + entity.Realization); + } + } +} \ No newline at end of file Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj =================================================================== diff -u -ra06740b53b2afe4f6db49a0f54ba9f743da131b1 -r54242411470f330f6f4c75d1d05bfd0911706873 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj (.../Application.Ringtoets.Storage.Test.csproj) (revision a06740b53b2afe4f6db49a0f54ba9f743da131b1) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj (.../Application.Ringtoets.Storage.Test.csproj) (revision 54242411470f330f6f4c75d1d05bfd0911706873) @@ -124,9 +124,9 @@ - - - + + + Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/IllustrationPoints/IllustrationPointResultCreateExtensionsTest.cs =================================================================== diff -u -r4938d7e24964edb84ebeb51f96d021bd03501d1f -r54242411470f330f6f4c75d1d05bfd0911706873 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/IllustrationPoints/IllustrationPointResultCreateExtensionsTest.cs (.../IllustrationPointResultCreateExtensionsTest.cs) (revision 4938d7e24964edb84ebeb51f96d021bd03501d1f) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/IllustrationPoints/IllustrationPointResultCreateExtensionsTest.cs (.../IllustrationPointResultCreateExtensionsTest.cs) (revision 54242411470f330f6f4c75d1d05bfd0911706873) @@ -33,18 +33,18 @@ public class IllustrationPointResultCreateExtensionsTest { [Test] - public void CreateHydraulicLocationIllustrationPointResultEntity_IllustrationPointResultNull_ThrowsArgumentNullException() + public void CreateIllustrationPointResultEntity_IllustrationPointResultNull_ThrowsArgumentNullException() { // Call - TestDelegate call = () => ((IllustrationPointResult) null).CreateHydraulicLocationIllustrationPointResultEntity(0); + TestDelegate call = () => ((IllustrationPointResult) null).CreateIllustrationPointResultEntity(0); // Assert string paramName = Assert.Throws(call).ParamName; Assert.AreEqual("illustrationPointResult", paramName); } [Test] - public void CreateHydraulicLocationIllustrationPointResultEntity_ValidIllustrationPointResult_ReturnEntity() + public void CreateIllustrationPointResultEntity_ValidIllustrationPointResult_ReturnEntity() { // Setup var random = new Random(123); @@ -53,45 +53,13 @@ int order = random.Next(); // Call - HydraulicLocationIllustrationPointResultEntity entity = - illustrationPointResult.CreateHydraulicLocationIllustrationPointResultEntity(order); + IllustrationPointResultEntity entity = + illustrationPointResult.CreateIllustrationPointResultEntity(order); // Assert - Assert.IsInstanceOf(entity); TestHelper.AssertAreEqualButNotSame(illustrationPointResult.Description, entity.Description); Assert.AreEqual(illustrationPointResult.Value, entity.Value, illustrationPointResult.Value.GetAccuracy()); Assert.AreEqual(order, entity.Order); } - - [Test] - public void CreateGrassCoverErosionOutwardsHydraulicLocationIllustrationPointResultEntity_IllustrationPointResultNull_ThrowsArgumentNullException() - { - // Call - TestDelegate call = () => ((IllustrationPointResult) null).CreateGrassCoverErosionOutwardsHydraulicLocationIllustrationPointResultEntity(0); - - // Assert - string paramName = Assert.Throws(call).ParamName; - Assert.AreEqual("illustrationPointResult", paramName); - } - - [Test] - public void CreateGrassCoverErosionOutwardsHydraulicLocationIllustrationPointResultEntity_ValidIllustrationPointResult_ReturnEntity() - { - // Setup - var random = new Random(123); - var illustrationPointResult = new IllustrationPointResult("Some description", - random.NextDouble()); - int order = random.Next(); - - // Call - GrassCoverErosionOutwardsHydraulicLocationIllustrationPointResultEntity entity = - illustrationPointResult.CreateGrassCoverErosionOutwardsHydraulicLocationIllustrationPointResultEntity(order); - - // Assert - Assert.IsInstanceOf(entity); - TestHelper.AssertAreEqualButNotSame(illustrationPointResult.Description, entity.Description); - Assert.AreEqual(illustrationPointResult.Value, entity.Value, illustrationPointResult.Value.GetAccuracy()); - Assert.AreEqual(order, entity.Order); - } } } \ No newline at end of file Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/IllustrationPoints/StochastCreateExtensionsTest.cs =================================================================== diff -u -r30df7a3cabc5c48307afa542944fc17fd7a355e3 -r54242411470f330f6f4c75d1d05bfd0911706873 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/IllustrationPoints/StochastCreateExtensionsTest.cs (.../StochastCreateExtensionsTest.cs) (revision 30df7a3cabc5c48307afa542944fc17fd7a355e3) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/IllustrationPoints/StochastCreateExtensionsTest.cs (.../StochastCreateExtensionsTest.cs) (revision 54242411470f330f6f4c75d1d05bfd0911706873) @@ -33,18 +33,18 @@ public class StochastCreateExtensionsTest { [Test] - public void CreateHydraulicLocationStochastEntity_StochastNull_ThrowsArgumentNullException() + public void CreateStochastEntity_StochastNull_ThrowsArgumentNullException() { // Call - TestDelegate call = () => ((Stochast) null).CreateHydraulicLocationStochastEntity(0); + TestDelegate call = () => ((Stochast) null).CreateStochastEntity(0); // Assert string paramName = Assert.Throws(call).ParamName; Assert.AreEqual("stochast", paramName); } [Test] - public void CreateHydraulicLocationStochastEntity_ValidStochast_ReturnEntity() + public void CreateStochastEntity_ValidStochast_ReturnEntity() { // Setup var random = new Random(123); @@ -54,47 +54,13 @@ int order = random.Next(); // Call - HydraulicLocationStochastEntity entity = stochast.CreateHydraulicLocationStochastEntity(order); + StochastEntity entity = stochast.CreateStochastEntity(order); // Assert - Assert.IsInstanceOf(entity); TestHelper.AssertAreEqualButNotSame(stochast.Name, entity.Name); Assert.AreEqual(stochast.Alpha, entity.Alpha, stochast.Alpha.GetAccuracy()); Assert.AreEqual(stochast.Duration, entity.Duration, stochast.Duration.GetAccuracy()); Assert.AreEqual(order, entity.Order); } - - [Test] - public void CreateGrassCoverErosionOutwardsHydraulicLocationStochastEntity_StochastNull_ThrowsArgumentNullException() - { - // Call - TestDelegate call = () => ((Stochast) null).CreateGrassCoverErosionOutwardsHydraulicLocationStochastEntity(0); - - // Assert - string paramName = Assert.Throws(call).ParamName; - Assert.AreEqual("stochast", paramName); - } - - [Test] - public void CreateGrassCoverErosionOutwardsHydraulicLocationStochastEntity_ValidStochast_ReturnEntity() - { - // Setup - var random = new Random(123); - var stochast = new Stochast("Some description", - random.NextDouble(), - random.NextDouble()); - int order = random.Next(); - - // Call - GrassCoverErosionOutwardsHydraulicLocationStochastEntity entity = - stochast.CreateGrassCoverErosionOutwardsHydraulicLocationStochastEntity(order); - - // Assert - Assert.IsInstanceOf(entity); - TestHelper.AssertAreEqualButNotSame(stochast.Name, entity.Name); - Assert.AreEqual(stochast.Alpha, entity.Alpha, stochast.Alpha.GetAccuracy()); - Assert.AreEqual(stochast.Duration, entity.Duration, stochast.Duration.GetAccuracy()); - Assert.AreEqual(order, entity.Order); - } } } \ No newline at end of file Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/IllustrationPoints/SubmechanismIllustrationPointStochastCreateExtensionsTest.cs =================================================================== diff -u -r20c6cddf9031f8721e60fceba6b3a6bc2791522a -r54242411470f330f6f4c75d1d05bfd0911706873 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/IllustrationPoints/SubmechanismIllustrationPointStochastCreateExtensionsTest.cs (.../SubmechanismIllustrationPointStochastCreateExtensionsTest.cs) (revision 20c6cddf9031f8721e60fceba6b3a6bc2791522a) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/IllustrationPoints/SubmechanismIllustrationPointStochastCreateExtensionsTest.cs (.../SubmechanismIllustrationPointStochastCreateExtensionsTest.cs) (revision 54242411470f330f6f4c75d1d05bfd0911706873) @@ -33,7 +33,7 @@ public class SubmechanismIllustrationPointStochastCreateExtensionsTest { [Test] - public void CreateHydraulicLocationRealizedStochastEntity_StochastNull_ThrowsArgumentNullException() + public void CreateSubmechanismIllustrationPointStochastEntity_StochastNull_ThrowsArgumentNullException() { // Call TestDelegate call = () => ((SubmechanismIllustrationPointStochast) null).CreateHydraulicLocationRealizedStochastEntity(0); @@ -44,7 +44,7 @@ } [Test] - public void CreateHydraulicLocationRealizedStochastEntity_ValidRealizedStochast_ReturnEntity() + public void CreateSubmechanismIllustrationPointStochastEntity_ValidRealizedStochast_ReturnEntity() { // Setup var random = new Random(123); @@ -55,50 +55,14 @@ int order = random.Next(); // Call - HydraulicLocationRealizedStochastEntity entity = stochast.CreateHydraulicLocationRealizedStochastEntity(order); + SubmechanismIllustrationPointStochastEntity entity = stochast.CreateHydraulicLocationRealizedStochastEntity(order); // Assert - Assert.IsInstanceOf(entity); TestHelper.AssertAreEqualButNotSame(stochast.Name, entity.Name); Assert.AreEqual(stochast.Alpha, entity.Alpha, stochast.Alpha.GetAccuracy()); Assert.AreEqual(stochast.Duration, entity.Duration, stochast.Duration.GetAccuracy()); Assert.AreEqual(stochast.Realization, entity.Realization, stochast.Realization.GetAccuracy()); Assert.AreEqual(order, entity.Order); } - - [Test] - public void CreateGrassCoverErosionOutwardsHydraulicLocationRealizedStochastEntity_StochastNull_ThrowsArgumentNullException() - { - // Call - TestDelegate call = () => ((SubmechanismIllustrationPointStochast) null).CreateGrassCoverErosionOutwardsHydraulicLocationRealizedStochastEntity(0); - - // Assert - string paramName = Assert.Throws(call).ParamName; - Assert.AreEqual("submechanismIllustrationPointStochast", paramName); - } - - [Test] - public void CreateGrassCoverErosionOutwardsHydraulicLocationRealizedStochastEntity_ValidRealizedStochast_ReturnEntity() - { - // Setup - var random = new Random(123); - var stochast = new SubmechanismIllustrationPointStochast("Some description", - random.NextDouble(), - random.NextDouble(), - random.NextDouble()); - int order = random.Next(); - - // Call - GrassCoverErosionOutwardsHydraulicLocationRealizedStochastEntity entity = - stochast.CreateGrassCoverErosionOutwardsHydraulicLocationRealizedStochastEntity(order); - - // Assert - Assert.IsInstanceOf(entity); - TestHelper.AssertAreEqualButNotSame(stochast.Name, entity.Name); - Assert.AreEqual(stochast.Alpha, entity.Alpha, stochast.Alpha.GetAccuracy()); - Assert.AreEqual(stochast.Duration, entity.Duration, stochast.Duration.GetAccuracy()); - Assert.AreEqual(stochast.Realization, entity.Realization, stochast.Realization.GetAccuracy()); - Assert.AreEqual(order, entity.Order); - } } } \ No newline at end of file Fisheye: Tag 54242411470f330f6f4c75d1d05bfd0911706873 refers to a dead (removed) revision in file `Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/IllustrationPoints/IIllustrationPointResultEntityReadExtensionsTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 54242411470f330f6f4c75d1d05bfd0911706873 refers to a dead (removed) revision in file `Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/IllustrationPoints/IStochastEntityReadExtensionsTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 54242411470f330f6f4c75d1d05bfd0911706873 refers to a dead (removed) revision in file `Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/IllustrationPoints/ISubmechanismIllustrationPointStochastEntityReadExtensionsTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/IllustrationPoints/IllustrationPointResultEntityReadExtensionsTest.cs =================================================================== diff -u --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/IllustrationPoints/IllustrationPointResultEntityReadExtensionsTest.cs (revision 0) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/IllustrationPoints/IllustrationPointResultEntityReadExtensionsTest.cs (revision 54242411470f330f6f4c75d1d05bfd0911706873) @@ -0,0 +1,64 @@ +// Copyright (C) Stichting Deltares 2017. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System; +using Application.Ringtoets.Storage.DbContext; +using Application.Ringtoets.Storage.Read.IllustrationPoints; +using NUnit.Framework; +using Ringtoets.Common.Data.Hydraulics.IllustrationPoints; +using Ringtoets.Common.Data.TestUtil; + +namespace Application.Ringtoets.Storage.Test.Read.IllustrationPoints +{ + [TestFixture] + public class IllustrationPointResultEntityReadExtensionsTest + { + [Test] + public void Read_EntityNull_ThrowsArgumentNullException() + { + // Call + TestDelegate call = () => ((IllustrationPointResultEntity) null).Read(); + + // Assert + string paramName = Assert.Throws(call).ParamName; + Assert.AreEqual("entity", paramName); + } + + [Test] + public void Read_ValidEntity_ReturnIllustrationPointResult() + { + // Setup + var random = new Random(123); + var entity = new IllustrationPointResultEntity + { + Description = "Description", + Value = random.NextDouble() + }; + + // Call + IllustrationPointResult illustrationPointResult = entity.Read(); + + // Assert + Assert.AreEqual(entity.Description, illustrationPointResult.Description); + Assert.AreEqual(entity.Value, illustrationPointResult.Value, illustrationPointResult.Value.GetAccuracy()); + } + } +} \ No newline at end of file Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/IllustrationPoints/StochastEntityReadExtensionsTest.cs =================================================================== diff -u --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/IllustrationPoints/StochastEntityReadExtensionsTest.cs (revision 0) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/IllustrationPoints/StochastEntityReadExtensionsTest.cs (revision 54242411470f330f6f4c75d1d05bfd0911706873) @@ -0,0 +1,66 @@ +// Copyright (C) Stichting Deltares 2017. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System; +using Application.Ringtoets.Storage.DbContext; +using Application.Ringtoets.Storage.Read.IllustrationPoints; +using NUnit.Framework; +using Ringtoets.Common.Data.Hydraulics.IllustrationPoints; +using Ringtoets.Common.Data.TestUtil; + +namespace Application.Ringtoets.Storage.Test.Read.IllustrationPoints +{ + [TestFixture] + public class StochastEntityReadExtensionsTest + { + [Test] + public void Read_EntityNull_ThrowsArgumentNullException() + { + // Call + TestDelegate call = () => ((StochastEntity) null).Read(); + + // Assert + string paramName = Assert.Throws(call).ParamName; + Assert.AreEqual("entity", paramName); + } + + [Test] + public void Read_ValidEntity_ReturnStochast() + { + // Setup + var random = new Random(123); + var entity = new StochastEntity + { + Name = "Description", + Alpha = random.NextDouble(), + Duration = random.NextDouble() + }; + + // Call + Stochast illustrationPointResult = entity.Read(); + + // Assert + Assert.AreEqual(entity.Name, illustrationPointResult.Name); + Assert.AreEqual(entity.Alpha, illustrationPointResult.Alpha, illustrationPointResult.Alpha.GetAccuracy()); + Assert.AreEqual(entity.Duration, illustrationPointResult.Duration, illustrationPointResult.Duration.GetAccuracy()); + } + } +} \ No newline at end of file Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/IllustrationPoints/SubmechanismIllustrationPointStochastEntityReadExtensionsTest.cs =================================================================== diff -u --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/IllustrationPoints/SubmechanismIllustrationPointStochastEntityReadExtensionsTest.cs (revision 0) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/IllustrationPoints/SubmechanismIllustrationPointStochastEntityReadExtensionsTest.cs (revision 54242411470f330f6f4c75d1d05bfd0911706873) @@ -0,0 +1,68 @@ +// Copyright (C) Stichting Deltares 2017. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System; +using Application.Ringtoets.Storage.DbContext; +using NUnit.Framework; +using Ringtoets.Common.Data.Hydraulics.IllustrationPoints; +using Ringtoets.Common.Data.TestUtil; +using Application.Ringtoets.Storage.Read.IllustrationPoints; + +namespace Application.Ringtoets.Storage.Test.Read.IllustrationPoints +{ + [TestFixture] + public class SubmechanismIllustrationPointStochastEntityReadExtensionsTest + { + [Test] + public void Read_EntityNull_ThrowsArgumentNullException() + { + // Call + TestDelegate call = () => ((SubmechanismIllustrationPointStochastEntity) null).Read(); + + // Assert + string paramName = Assert.Throws(call).ParamName; + Assert.AreEqual("entity", paramName); + } + + [Test] + public void Read_ValidEntity_ReturnRealizedStochast() + { + // Setup + var random = new Random(123); + var entity = new SubmechanismIllustrationPointStochastEntity + { + Name = "Description", + Alpha = random.NextDouble(), + Duration = random.NextDouble(), + Realization = random.NextDouble() + }; + + // Call + SubmechanismIllustrationPointStochast illustrationPointResult = entity.Read(); + + // Assert + Assert.AreEqual(entity.Name, illustrationPointResult.Name); + Assert.AreEqual(entity.Alpha, illustrationPointResult.Alpha, illustrationPointResult.Alpha.GetAccuracy()); + Assert.AreEqual(entity.Duration, illustrationPointResult.Duration, illustrationPointResult.Duration.GetAccuracy()); + Assert.AreEqual(entity.Realization, illustrationPointResult.Realization, illustrationPointResult.Realization.GetAccuracy()); + } + } +} \ No newline at end of file Index: build/DatabaseStructure.sql =================================================================== diff -u -rc0467a5ee5f6d7163ce9d8ba61fc8b22828bb44e -r54242411470f330f6f4c75d1d05bfd0911706873 --- build/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision c0467a5ee5f6d7163ce9d8ba61fc8b22828bb44e) +++ build/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 54242411470f330f6f4c75d1d05bfd0911706873) @@ -1,6 +1,6 @@ /* ---------------------------------------------------- */ /* Generated by Enterprise Architect Version 12.0 */ -/* Created On : 28-Jun-2017 11:35:44 AM */ +/* Created On : 30-Jun-2017 15:41:39 */ /* DBMS : SQLite */ /* ---------------------------------------------------- */ @@ -24,36 +24,36 @@ DROP TABLE IF EXISTS 'FailureMechanismSectionEntity' ; -DROP TABLE IF EXISTS 'FailureMechanismEntity' -; - DROP TABLE IF EXISTS 'PipingFailureMechanismMetaEntity' ; -DROP TABLE IF EXISTS 'ClosingStructuresFailureMechanismMetaEntity' +DROP TABLE IF EXISTS 'FailureMechanismEntity' ; DROP TABLE IF EXISTS 'StabilityStoneCoverFailureMechanismMetaEntity' ; +DROP TABLE IF EXISTS 'ClosingStructuresFailureMechanismMetaEntity' +; + DROP TABLE IF EXISTS 'CalculationGroupEntity' ; DROP TABLE IF EXISTS 'StabilityPointStructuresFailureMechanismMetaEntity' ; -DROP TABLE IF EXISTS 'HydraulicLocationEntity' -; - DROP TABLE IF EXISTS 'DuneErosionFailureMechanismMetaEntity' ; -DROP TABLE IF EXISTS 'GrassCoverErosionInwardsFailureMechanismMetaEntity' +DROP TABLE IF EXISTS 'HydraulicLocationEntity' ; DROP TABLE IF EXISTS 'PipingCalculationEntity' ; +DROP TABLE IF EXISTS 'GrassCoverErosionInwardsFailureMechanismMetaEntity' +; + DROP TABLE IF EXISTS 'HeightStructuresFailureMechanismMetaEntity' ; @@ -63,10 +63,10 @@ DROP TABLE IF EXISTS 'GrassCoverErosionOutwardsFailureMechanismMetaEntity' ; -DROP TABLE IF EXISTS 'SoilLayerEntity' +DROP TABLE IF EXISTS 'SoilProfileEntity' ; -DROP TABLE IF EXISTS 'SoilProfileEntity' +DROP TABLE IF EXISTS 'SoilLayerEntity' ; DROP TABLE IF EXISTS 'StochasticSoilProfileEntity' @@ -219,36 +219,27 @@ DROP TABLE IF EXISTS 'GrassCoverErosionInwardsOvertoppingRateOutputEntity' ; -DROP TABLE IF EXISTS 'GrassCoverErosionOutwardsHydraulicLocationGeneralResultEntity' +DROP TABLE IF EXISTS 'GeneralResultSubmechanismIllustrationPointEntity' ; -DROP TABLE IF EXISTS 'GrassCoverErosionOutwardsHydraulicLocationStochastEntity' +DROP TABLE IF EXISTS 'SubmechanismIllustrationPointEntity' ; -DROP TABLE IF EXISTS 'GrassCoverErosionOutwardsHydraulicLocationWindDirectionClosingSituationIllustrationPointEntity' +DROP TABLE IF EXISTS 'IllustrationPointResultEntity' ; -DROP TABLE IF EXISTS 'GrassCoverErosionOutwardsHydraulicLocationIllustrationPointResultEntity' +DROP TABLE IF EXISTS 'StochastEntity' ; -DROP TABLE IF EXISTS 'GrassCoverErosionOutwardsHydraulicLocationRealizedStochastEntity' +DROP TABLE IF EXISTS 'GeneralResultSubmechanismIllustrationPointStochastEntity' ; -DROP TABLE IF EXISTS 'HydraulicLocationGeneralResultEntity' +DROP TABLE IF EXISTS 'TopLevelSubmechanismIllustrationPointEntity' ; -DROP TABLE IF EXISTS 'HydraulicLocationWindDirectionClosingSituationIllustrationPointEntity' +DROP TABLE IF EXISTS 'SubmechanismIllustrationPointStochastEntity' ; -DROP TABLE IF EXISTS 'HydraulicLocationStochastEntity' -; - -DROP TABLE IF EXISTS 'HydraulicLocationIllustrationPointResultEntity' -; - -DROP TABLE IF EXISTS 'HydraulicLocationRealizedStochastEntity' -; - /* Create Tables with Primary and Foreign Keys, Check and Unique Constraints */ CREATE TABLE 'VersionEntity' @@ -381,6 +372,18 @@ ) ; +CREATE TABLE 'PipingFailureMechanismMetaEntity' +( + 'PipingFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + 'FailureMechanismEntityId' INTEGER NOT NULL, + 'A' REAL NOT NULL, + 'WaterVolumetricWeight' REAL NOT NULL, + 'StochasticSoilModelCollectionSourcePath' TEXT, + 'SurfaceLineCollectionSourcePath' TEXT, + CONSTRAINT 'FK_PipingFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade +) +; + CREATE TABLE 'FailureMechanismEntity' ( 'FailureMechanismEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -397,15 +400,12 @@ ) ; -CREATE TABLE 'PipingFailureMechanismMetaEntity' +CREATE TABLE 'StabilityStoneCoverFailureMechanismMetaEntity' ( - 'PipingFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + 'StabilityStoneCoverFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, 'FailureMechanismEntityId' INTEGER NOT NULL, - 'A' REAL NOT NULL, - 'WaterVolumetricWeight' REAL NOT NULL, - 'StochasticSoilModelCollectionSourcePath' TEXT, - 'SurfaceLineCollectionSourcePath' TEXT, - CONSTRAINT 'FK_PipingFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade + 'ForeshoreProfileCollectionSourcePath' TEXT, + CONSTRAINT 'FK_StabilityStoneCoverFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade ) ; @@ -420,15 +420,6 @@ ) ; -CREATE TABLE 'StabilityStoneCoverFailureMechanismMetaEntity' -( - 'StabilityStoneCoverFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, - 'FailureMechanismEntityId' INTEGER NOT NULL, - 'ForeshoreProfileCollectionSourcePath' TEXT, - CONSTRAINT 'FK_StabilityStoneCoverFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade -) -; - CREATE TABLE 'CalculationGroupEntity' ( 'CalculationGroupEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -450,6 +441,15 @@ ) ; +CREATE TABLE 'DuneErosionFailureMechanismMetaEntity' +( + 'DuneErosionFailureMechanismMetaEntityId' 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 +) +; + CREATE TABLE 'HydraulicLocationEntity' ( 'HydraulicLocationEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -465,25 +465,6 @@ ) ; -CREATE TABLE 'DuneErosionFailureMechanismMetaEntity' -( - 'DuneErosionFailureMechanismMetaEntityId' 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 -) -; - -CREATE TABLE 'GrassCoverErosionInwardsFailureMechanismMetaEntity' -( - 'GrassCoverErosionInwardsFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, - 'FailureMechanismEntityId' INTEGER NOT NULL, - 'N' INT (4) NOT NULL, - 'DikeProfileCollectionSourcePath' TEXT, - CONSTRAINT 'FK_GrassCoverErosionInwardsFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade -) -; - CREATE TABLE 'PipingCalculationEntity' ( 'PipingCalculationEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -511,6 +492,16 @@ ) ; +CREATE TABLE 'GrassCoverErosionInwardsFailureMechanismMetaEntity' +( + 'GrassCoverErosionInwardsFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + 'FailureMechanismEntityId' INTEGER NOT NULL, + 'N' INT (4) NOT NULL, + 'DikeProfileCollectionSourcePath' TEXT, + CONSTRAINT 'FK_GrassCoverErosionInwardsFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade +) +; + CREATE TABLE 'HeightStructuresFailureMechanismMetaEntity' ( 'HeightStructuresFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -557,6 +548,14 @@ ) ; +CREATE TABLE 'SoilProfileEntity' +( + 'SoilProfileEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + 'Bottom' REAL, + 'Name' TEXT +) +; + CREATE TABLE 'SoilLayerEntity' ( 'SoilLayerEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -577,14 +576,6 @@ ) ; -CREATE TABLE 'SoilProfileEntity' -( - 'SoilProfileEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, - 'Bottom' REAL, - 'Name' TEXT -) -; - CREATE TABLE 'StochasticSoilProfileEntity' ( 'StochasticSoilProfileEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -1353,13 +1344,15 @@ ( 'HydraulicLocationEntityOutputId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, 'HydraulicLocationEntityId' INTEGER NOT NULL, + 'GeneralResultSubmechanismIllustrationPointEntityId' INTEGER, 'HydraulicLocationOutputType' TINYINT (1) NOT NULL, -- Enum: 1 = DesignWaterLevel, 2 = WaveHeight 'Result' REAL, 'TargetProbability' REAL, 'TargetReliability' REAL, 'CalculatedProbability' REAL, 'CalculatedReliability' REAL, 'CalculationConvergence' TINYINT (1) NOT NULL, -- Enum: 1 = NotCalculated, 2 = CalculatedNotConverged, 3 = CalculatedConverged + CONSTRAINT 'FK_HydraulicLocationOutputEntity_GeneralResultSubMechanismIllustrationPointEntity' FOREIGN KEY ('GeneralResultSubmechanismIllustrationPointEntityId') REFERENCES 'GeneralResultSubmechanismIllustrationPointEntity' ('GeneralResultSubmechanismIllustrationPointEntityId') ON DELETE No Action ON UPDATE No Action, CONSTRAINT 'FK_HydraulicLocationOutputEntity_HydraulicLocationEntity' FOREIGN KEY ('HydraulicLocationEntityId') REFERENCES 'HydraulicLocationEntity' ('HydraulicLocationEntityId') ON DELETE Cascade ON UPDATE Cascade, CONSTRAINT 'U_HydraulicLocationEntityOutputType' UNIQUE ('HydraulicLocationEntityId','HydraulicLocationOutputType') ) @@ -1369,13 +1362,15 @@ ( 'GrassCoverErosionOutwardsHydraulicLocationOutputEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, 'GrassCoverErosionOutwardsHydraulicLocationEntityId' INTEGER NOT NULL, + 'GeneralResultSubmechanismIllustrationPointEntityId' INTEGER, 'HydraulicLocationOutputType' TINYINT (1) NOT NULL, -- Enum: 1 = DesignWaterLevel, 2 = WaveHeight 'Result' REAL, 'TargetProbability' REAL, 'TargetReliability' REAL, 'CalculatedProbability' REAL, 'CalculatedReliability' REAL, 'CalculationConvergence' TINYINT (1) NOT NULL, -- Enum: 1 = NotCalculated, 2 = CalculatedNotConverged, 3 = CalculatedConverged + CONSTRAINT 'FK_GrassCoverErosionOutwardsHydraulicLocationOutputEntity_GeneralResultSubMechanismIllustrationPointEntity' FOREIGN KEY ('GeneralResultSubmechanismIllustrationPointEntityId') REFERENCES 'GeneralResultSubmechanismIllustrationPointEntity' ('GeneralResultSubmechanismIllustrationPointEntityId') ON DELETE No Action ON UPDATE No Action, CONSTRAINT 'FK_GrassCoverErosionOutwardsHydraulicLocationOutputEntity_GrassCoverErosionOutwardsHydraulicLocationEntity' FOREIGN KEY ('GrassCoverErosionOutwardsHydraulicLocationEntityId') REFERENCES 'GrassCoverErosionOutwardsHydraulicLocationEntity' ('GrassCoverErosionOutwardsHydraulicLocationEntityId') ON DELETE Cascade ON UPDATE Cascade, CONSTRAINT 'U_HydraulicLocationOutputType' UNIQUE ('GrassCoverErosionOutwardsHydraulicLocationEntityId','HydraulicLocationOutputType') ) @@ -1452,123 +1447,79 @@ ) ; -CREATE TABLE 'GrassCoverErosionOutwardsHydraulicLocationGeneralResultEntity' +CREATE TABLE 'GeneralResultSubmechanismIllustrationPointEntity' ( - 'GrassCoverErosionOutwardsHydraulicLocationGeneralResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, - 'GrassCoverErosionOutwardsHydraulicLocationOutputEntityId' INTEGER NOT NULL, + 'GeneralResultSubmechanismIllustrationPointEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, 'GoverningWindDirectionName' TEXT NOT NULL, - 'GoverningWindDirectionAngle' REAL NOT NULL, - CONSTRAINT 'FK_GrassCoverErosionOutwardsHydraulicLocationGeneralResultEntity_GrassCoverErosionOutwardsHydraulicLocationOutputEntity' FOREIGN KEY ('GrassCoverErosionOutwardsHydraulicLocationOutputEntityId') REFERENCES 'GrassCoverErosionOutwardsHydraulicLocationOutputEntity' ('GrassCoverErosionOutwardsHydraulicLocationOutputEntityId') ON DELETE Cascade ON UPDATE Cascade + 'GoverningWindDirectionAngle' REAL NOT NULL ) ; -CREATE TABLE 'GrassCoverErosionOutwardsHydraulicLocationStochastEntity' +CREATE TABLE 'SubmechanismIllustrationPointEntity' ( - 'GrassCoverErosionOutwardsHydraulicLocationStochastEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, - 'GrassCoverErosionOutwardsHydraulicLocationGeneralResultEntityId' INTEGER NOT NULL, + 'SubmechanismIllustrationPointEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, 'Name' TEXT NOT NULL, - 'Duration' REAL NOT NULL, - 'Alpha' REAL NOT NULL, - 'Order' INT (4) NOT NULL, - CONSTRAINT 'FK_GrassCoverErosionOutwardsHydraulicLocationStochastEntity_GrassCoverErosionOutwardsHydraulicLocationGeneralResultEntity' FOREIGN KEY ('GrassCoverErosionOutwardsHydraulicLocationGeneralResultEntityId') REFERENCES 'GrassCoverErosionOutwardsHydraulicLocationGeneralResultEntity' ('GrassCoverErosionOutwardsHydraulicLocationGeneralResultEntityId') ON DELETE Cascade ON UPDATE Cascade -) -; - -CREATE TABLE 'GrassCoverErosionOutwardsHydraulicLocationWindDirectionClosingSituationIllustrationPointEntity' -( - 'GrassCoverErosionOutwardsHydraulicLocationWindDirectionClosingSituationIllustrationPointEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, - 'GrassCoverErosionOutwardsHydraulicLocationGeneralResultEntityId' INTEGER NOT NULL, - 'IllustrationPointName' TEXT NOT NULL, - 'ClosingSituation' TEXT NOT NULL, - 'WindDirectionName' TEXT NOT NULL, - 'WindDirectionAngle' REAL NOT NULL, 'Beta' REAL NOT NULL, - 'Order' INT (4) NOT NULL, - CONSTRAINT 'FK_GrassCoverErosionOutwardsHydraulicLocationWindDirectionClosingSituationIllustrationPointEntity_GrassCoverErosionOutwardsHydraulicLocationGeneralResultEntity' FOREIGN KEY ('GrassCoverErosionOutwardsHydraulicLocationGeneralResultEntityId') REFERENCES 'GrassCoverErosionOutwardsHydraulicLocationGeneralResultEntity' ('GrassCoverErosionOutwardsHydraulicLocationGeneralResultEntityId') ON DELETE Cascade ON UPDATE Cascade + 'Order' INT (4) NOT NULL ) ; -CREATE TABLE 'GrassCoverErosionOutwardsHydraulicLocationIllustrationPointResultEntity' +CREATE TABLE 'IllustrationPointResultEntity' ( - 'GrassCoverErosionOutwardsHydraulicLocationIllustrationPointResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, - 'GrassCoverErosionOutwardsHydraulicLocationWindDirectionClosingSituationIllustrationPointEntityId' INTEGER NOT NULL, + 'IllustrationPointResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + 'SubmechanismIllustrationPointEntityId' INTEGER NOT NULL, 'Description' TEXT NOT NULL, 'Value' REAL NOT NULL, 'Order' INT (4) NOT NULL, - CONSTRAINT 'FK_GrassCoverErosionOutwardsHydraulicLocationIllustrationPointResultEntity_GrassCoverErosionOutwardsHydraulicLocationWindDirectionClosingSituationIllustrationPointEntity' FOREIGN KEY ('GrassCoverErosionOutwardsHydraulicLocationWindDirectionClosingSituationIllustrationPointEntityId') REFERENCES 'GrassCoverErosionOutwardsHydraulicLocationWindDirectionClosingSituationIllustrationPointEntity' ('GrassCoverErosionOutwardsHydraulicLocationWindDirectionClosingSituationIllustrationPointEntityId') ON DELETE Cascade ON UPDATE Cascade + CONSTRAINT 'FK_IllustrationPointResultEntity_SubmechanismIllustrationPointEntity' FOREIGN KEY ('SubmechanismIllustrationPointEntityId') REFERENCES 'SubmechanismIllustrationPointEntity' ('SubmechanismIllustrationPointEntityId') ON DELETE Cascade ON UPDATE Cascade ) ; -CREATE TABLE 'GrassCoverErosionOutwardsHydraulicLocationRealizedStochastEntity' +CREATE TABLE 'StochastEntity' ( - 'GrassCoverErosionOutwardsHydraulicLocationRealizedStochastEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, - 'GrassCoverErosionOutwardsHydraulicLocationWindDirectionClosingSituationIllustrationPointEntityId' INTEGER NOT NULL, + 'StochastEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, 'Name' TEXT NOT NULL, 'Duration' REAL NOT NULL, 'Alpha' REAL NOT NULL, - 'Realization' REAL NOT NULL, - 'Order' INT (4) NOT NULL, - CONSTRAINT 'FK_GrassCoverErosionOutwardsHydraulicLocationRealizedStochastEntity_GrassCoverErosionOutwardsHydraulicLocationWindDirectionClosingSituationIllustrationPointEntity' FOREIGN KEY ('GrassCoverErosionOutwardsHydraulicLocationWindDirectionClosingSituationIllustrationPointEntityId') REFERENCES 'GrassCoverErosionOutwardsHydraulicLocationWindDirectionClosingSituationIllustrationPointEntity' ('GrassCoverErosionOutwardsHydraulicLocationWindDirectionClosingSituationIllustrationPointEntityId') ON DELETE Cascade ON UPDATE Cascade + 'Order' INT (4) NOT NULL ) ; -CREATE TABLE 'HydraulicLocationGeneralResultEntity' +CREATE TABLE 'GeneralResultSubmechanismIllustrationPointStochastEntity' ( - 'HydraulicLocationGeneralResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, - 'HydraulicLocationEntityOutputId' INTEGER NOT NULL, - 'GoverningWindDirectionName' TEXT NOT NULL, - 'GoverningWindDirectionAngle' REAL NOT NULL, - CONSTRAINT 'FK_HydraulicLocationGeneralResultEntity_HydraulicLocationOutputEntity' FOREIGN KEY ('HydraulicLocationEntityOutputId') REFERENCES 'HydraulicLocationOutputEntity' ('HydraulicLocationEntityOutputId') ON DELETE Cascade ON UPDATE Cascade + 'GeneralResultSubmechanismIllustrationPointEntityId' INTEGER NOT NULL, + 'StochastEntityId' INTEGER NOT NULL, + CONSTRAINT 'PK_GeneralResultSubmechanismIllustrationPointStochastEntity' PRIMARY KEY ('GeneralResultSubmechanismIllustrationPointEntityId','StochastEntityId'), + CONSTRAINT 'FK_GeneralResultSubmechanisIllustrationPointStochastEntity_GeneralResultSubmechanismIllustrationPointEntity' FOREIGN KEY ('GeneralResultSubmechanismIllustrationPointEntityId') REFERENCES 'GeneralResultSubmechanismIllustrationPointEntity' ('GeneralResultSubmechanismIllustrationPointEntityId') ON DELETE Cascade ON UPDATE Cascade, + CONSTRAINT 'FK_GeneralResultSubmechanismIllustrationPointStochastEntity_StochastEntity' FOREIGN KEY ('StochastEntityId') REFERENCES 'StochastEntity' ('StochastEntityId') ON DELETE No Action ON UPDATE No Action ) ; -CREATE TABLE 'HydraulicLocationWindDirectionClosingSituationIllustrationPointEntity' +CREATE TABLE 'TopLevelSubmechanismIllustrationPointEntity' ( - 'HydraulicLocationWindDirectionClosingSituationIllustrationPointEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, - 'HydraulicLocationGeneralResultEntityId' INTEGER NOT NULL, - 'IllustrationPointName' TEXT NOT NULL, + 'TopLevelSubmechanismIllustrationPointEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + 'GeneralResultSubmechanismIllustrationPointEntityId' INTEGER NOT NULL, + 'SubmechanismIllustrationPointEntityId' INTEGER NOT NULL, 'ClosingSituation' TEXT NOT NULL, 'WindDirectionName' TEXT NOT NULL, 'WindDirectionAngle' REAL NOT NULL, 'Beta' REAL NOT NULL, 'Order' INT (4) NOT NULL, - CONSTRAINT 'FK_HydraulicLocationWindDirectionClosingSituationIllustrationPointEntity_HydraulicLocationGeneralResultEntity' FOREIGN KEY ('HydraulicLocationGeneralResultEntityId') REFERENCES 'HydraulicLocationGeneralResultEntity' ('HydraulicLocationGeneralResultEntityId') ON DELETE Cascade ON UPDATE Cascade + CONSTRAINT 'FK_TopLevelSubmechanismIllustrationPointEntity_GeneralResultSubmechanismIllustrationPointEntity' FOREIGN KEY ('GeneralResultSubmechanismIllustrationPointEntityId') REFERENCES 'GeneralResultSubmechanismIllustrationPointEntity' ('GeneralResultSubmechanismIllustrationPointEntityId') ON DELETE Cascade ON UPDATE Cascade, + CONSTRAINT 'FK_TopLevelSubmechanismIllustrationPointEntity_SubmechanismIllustrationPointEntity' FOREIGN KEY ('SubmechanismIllustrationPointEntityId') REFERENCES 'SubmechanismIllustrationPointEntity' ('SubmechanismIllustrationPointEntityId') ON DELETE Cascade ON UPDATE Cascade ) ; -CREATE TABLE 'HydraulicLocationStochastEntity' +CREATE TABLE 'SubmechanismIllustrationPointStochastEntity' ( - 'HydraulicLocationStochastEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, - 'HydraulicLocationGeneralResultEntityId' INTEGER NOT NULL, + 'SubmechanismIllustrationPointStochastEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + 'SubmechanismIllustrationPointEntityId' INTEGER NOT NULL, 'Name' TEXT NOT NULL, 'Duration' REAL NOT NULL, 'Alpha' REAL NOT NULL, - 'Order' INT (4) NOT NULL, - CONSTRAINT 'FK_HydraulicLocationStochastEntity_HydraulicLocationGeneralResultEntity' FOREIGN KEY ('HydraulicLocationGeneralResultEntityId') REFERENCES 'HydraulicLocationGeneralResultEntity' ('HydraulicLocationGeneralResultEntityId') ON DELETE Cascade ON UPDATE Cascade -) -; - -CREATE TABLE 'HydraulicLocationIllustrationPointResultEntity' -( - 'HydraulicLocationIllustrationPointResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, - 'HydraulicLocationWindDirectionClosingSituationIllustrationPointEntityId' INTEGER NOT NULL, - 'Description' TEXT NOT NULL, - 'Value' REAL NOT NULL, - 'Order' INT (4) NOT NULL, - CONSTRAINT 'FK_HydraulicLocationIllustrationPointResultEntity_HydraulicLocationWindDirectionClosingSituationIllustrationPointEntity' FOREIGN KEY ('HydraulicLocationWindDirectionClosingSituationIllustrationPointEntityId') REFERENCES 'HydraulicLocationWindDirectionClosingSituationIllustrationPointEntity' ('HydraulicLocationWindDirectionClosingSituationIllustrationPointEntityId') ON DELETE Cascade ON UPDATE Cascade -) -; - -CREATE TABLE 'HydraulicLocationRealizedStochastEntity' -( - 'HydraulicLocationRealizedStochastEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, - 'HydraulicLocationWindDirectionClosingSituationIllustrationPointEntityId' INTEGER NOT NULL, - 'Name' TEXT NOT NULL, - 'Duration' REAL NOT NULL, - 'Alpha' REAL NOT NULL, 'Realization' REAL NOT NULL, 'Order' INT (4) NOT NULL, - CONSTRAINT 'FK_HydraulicLocationRealizedStochastEntity_HydraulicLocationWindDirectionClosingSituationIllustrationPointEntity' FOREIGN KEY ('HydraulicLocationWindDirectionClosingSituationIllustrationPointEntityId') REFERENCES 'HydraulicLocationWindDirectionClosingSituationIllustrationPointEntity' ('HydraulicLocationWindDirectionClosingSituationIllustrationPointEntityId') ON DELETE Cascade ON UPDATE Cascade + CONSTRAINT 'FK_SubmechanismIllustrationPointStochast_SubmechanismIllustrationPointEntity' FOREIGN KEY ('SubmechanismIllustrationPointEntityId') REFERENCES 'SubmechanismIllustrationPointEntity' ('SubmechanismIllustrationPointEntityId') ON DELETE No Action ON UPDATE No Action ) ; @@ -1602,6 +1553,10 @@ ON 'FailureMechanismSectionEntity' ('FailureMechanismEntityId' ASC) ; +CREATE INDEX 'IXFK_PipingFailureMechanismMetaEntity_FailureMechanismEntity' + ON 'PipingFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC) +; + CREATE INDEX 'IXFK_FailureMechanismEntity_AssessmentSectionEntity' ON 'FailureMechanismEntity' ('AssessmentSectionEntityId' ASC) ; @@ -1610,18 +1565,14 @@ ON 'FailureMechanismEntity' ('CalculationGroupEntityId' ASC) ; -CREATE INDEX 'IXFK_PipingFailureMechanismMetaEntity_FailureMechanismEntity' - ON 'PipingFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC) +CREATE INDEX 'IXFK_StabilityStoneCoverFailureMechanismMetaEntity_FailureMechanismEntity' + ON 'StabilityStoneCoverFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC) ; CREATE INDEX 'IXFK_ClosingStructuresFailureMechanismMetaEntity_FailureMechanismEntity' ON 'ClosingStructuresFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC) ; -CREATE INDEX 'IXFK_StabilityStoneCoverFailureMechanismMetaEntity_FailureMechanismEntity' - ON 'StabilityStoneCoverFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC) -; - CREATE INDEX 'IXFK_CalculationGroupEntity_CalculationGroupEntity' ON 'CalculationGroupEntity' ('ParentCalculationGroupEntityId' ASC) ; @@ -1630,16 +1581,12 @@ ON 'StabilityPointStructuresFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC) ; -CREATE INDEX 'IXFK_HydraulicLocationEntity_AssessmentSectionEntity' - ON 'HydraulicLocationEntity' ('AssessmentSectionEntityId' ASC) -; - CREATE INDEX 'IXFK_DuneErosionFailureMechanismMetaEntity_FailureMechanismEntity' ON 'DuneErosionFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC) ; -CREATE INDEX 'IXFK_GrassCoverErosionInwardsFailureMechanismMetaEntity_FailureMechanismEntity' - ON 'GrassCoverErosionInwardsFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC) +CREATE INDEX 'IXFK_HydraulicLocationEntity_AssessmentSectionEntity' + ON 'HydraulicLocationEntity' ('AssessmentSectionEntityId' ASC) ; CREATE INDEX 'IXFK_PipingCalculationEntity_StochasticSoilProfileEntity' @@ -1658,6 +1605,10 @@ ON 'PipingCalculationEntity' ('CalculationGroupEntityId' ASC) ; +CREATE INDEX 'IXFK_GrassCoverErosionInwardsFailureMechanismMetaEntity_FailureMechanismEntity' + ON 'GrassCoverErosionInwardsFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC) +; + CREATE INDEX 'IXFK_HeightStructuresFailureMechanismMetaEntity_FailureMechanismEntity' ON 'HeightStructuresFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC) ; @@ -1918,13 +1869,41 @@ ON 'StabilityPointStructuresOutputEntity' ('StabilityPointStructuresCalculationEntityId' ASC) ; +CREATE INDEX 'IXFK_HydraulicLocationOutputEntity_GeneralResultSubMechanismIllustrationPointEntity' + ON 'HydraulicLocationOutputEntity' ('GeneralResultSubmechanismIllustrationPointEntityId' ASC) +; + CREATE INDEX 'IXFK_HydraulicLocationOutputEntity_HydraulicLocationEntity' ON 'HydraulicLocationOutputEntity' ('HydraulicLocationEntityId' ASC) ; +CREATE TRIGGER [TR_AfterDeleteHydraulicLocationOutputEntity_RemoveGeneralResultSubmechanismIllustrationPointEntity] + AFTER DELETE + ON HydraulicLocationOutputEntity + FOR EACH ROW + BEGIN + DELETE FROM GeneralResultSubmechanismIllustrationPointEntity + WHERE OLD.GeneralResultSubmechanismIllustrationPointEntityId IS NOT NULL AND + GeneralResultSubmechanismIllustrationPointEntityId IS OLD.GeneralResultSubmechanismIllustrationPointEntityId; +END; +; +CREATE INDEX 'IXFK_GrassCoverErosionOutwardsHydraulicLocationOutputEntity_GeneralResultSubMechanismIllustrationPointEntity' + ON 'GrassCoverErosionOutwardsHydraulicLocationOutputEntity' ('GeneralResultSubmechanismIllustrationPointEntityId' ASC) +; + CREATE INDEX 'IXFK_GrassCoverErosionOutwardsHydraulicLocationOutputEntity_GrassCoverErosionOutwardsHydraulicLocationEntity' ON 'GrassCoverErosionOutwardsHydraulicLocationOutputEntity' ('GrassCoverErosionOutwardsHydraulicLocationEntityId' ASC) ; +CREATE TRIGGER [TR_AfterDeleteGrassCoverErosionOuwardsHydraulicLocationOutputEntity_RemoveGeneralResultSubmechanismIllustrationPointEntity] + AFTER DELETE + ON GrassCoverErosionOutwardsHydraulicLocationOutputEntity + FOR EACH ROW + BEGIN + DELETE FROM GrassCoverErosionOutwardsHydraulicLocationOutputEntity + WHERE OLD.GrassCoverErosionOutwardsHydraulicLocationOutputEntityId IS NOT NULL AND + GrassCoverErosionOutwardsHydraulicLocationOutputEntityId IS OLD.GrassCoverErosionOutwardsHydraulicLocationOutputEntityId; +END; +; CREATE INDEX 'IXFK_DuneLocationEntity_FailureMechanismEntity' ON 'DuneLocationEntity' ('FailureMechanismEntityId' ASC) @@ -1946,42 +1925,46 @@ ON 'GrassCoverErosionInwardsOvertoppingRateOutputEntity' ('GrassCoverErosionInwardsOutputEntityId' ASC) ; -CREATE INDEX 'IXFK_GrassCoverErosionOutwardsHydraulicLocationGeneralResultEntity_GrassCoverErosionOutwardsHydraulicLocationOutputEntity' - ON 'GrassCoverErosionOutwardsHydraulicLocationGeneralResultEntity' ('GrassCoverErosionOutwardsHydraulicLocationOutputEntityId' ASC) +CREATE INDEX 'IXFK_IllustrationPointResultEntity_SubmechanismIllustrationPointEntity' + ON 'IllustrationPointResultEntity' ('SubmechanismIllustrationPointEntityId' ASC) ; -CREATE INDEX 'IXFK_GrassCoverErosionOutwardsHydraulicLocationStochastEntity_GrassCoverErosionOutwardsHydraulicLocationGeneralResultEntity' - ON 'GrassCoverErosionOutwardsHydraulicLocationStochastEntity' ('GrassCoverErosionOutwardsHydraulicLocationGeneralResultEntityId' ASC) +CREATE INDEX 'IXFK_GeneralResultSubmechanismIllustrationPointStochastEntity_GeneralResultSubmechanismIllustrationPointEntity' + ON 'GeneralResultSubmechanismIllustrationPointStochastEntity' ('GeneralResultSubmechanismIllustrationPointEntityId' ASC) ; -CREATE INDEX 'IXFK_GrassCoverErosionOutwardsHydraulicLocationWindDirectionClosingSituationIllustrationPointEntity_GrassCoverErosionOutwardsHydraulicLocationGeneralResultEntity' - ON 'GrassCoverErosionOutwardsHydraulicLocationWindDirectionClosingSituationIllustrationPointEntity' ('GrassCoverErosionOutwardsHydraulicLocationGeneralResultEntityId' ASC) +CREATE INDEX 'IXFK_GeneralResultSubmechanismIllustrationPointStochastEntity_StochastEntity' + ON 'GeneralResultSubmechanismIllustrationPointStochastEntity' ('StochastEntityId' ASC) ; - -CREATE INDEX 'IXFK_GrassCoverErosionOutwardsHydraulicLocationIllustrationPointResultEntity_GrassCoverErosionOutwardsHydraulicLocationWindDirectionClosingSituationIllustrationPointEntity' - ON 'GrassCoverErosionOutwardsHydraulicLocationIllustrationPointResultEntity' ('GrassCoverErosionOutwardsHydraulicLocationWindDirectionClosingSituationIllustrationPointEntityId' ASC) +CREATE TRIGGER [TR_AfterDeleteGeneralResultSubmechanismIllustrationPointStochastEntity_RemoveStochastEntity] + AFTER DELETE + ON GeneralResultSubmechanismIllustrationPointStochastEntity + FOR EACH ROW +BEGIN + DELETE FROM StochastEntity + WHERE OLD.StochastEntityId IS NOT NULL AND + StochastEntityId IS OLD.StochastEntityId; +END; ; -CREATE INDEX 'IXFK_GrassCoverErosionOutwardsHydraulicLocationRealizedStochastEntity_GrassCoverErosionOutwardsHydraulicLocationWindDirectionClosingSituationIllustrationPointEntity' - ON 'GrassCoverErosionOutwardsHydraulicLocationRealizedStochastEntity' ('GrassCoverErosionOutwardsHydraulicLocationWindDirectionClosingSituationIllustrationPointEntityId' ASC) +CREATE INDEX 'IXFK_TopLevelSubmechanismIllustrationPointEntity_GeneralResultSubmechanismIllustrationPointEntity' + ON 'TopLevelSubmechanismIllustrationPointEntity' ('GeneralResultSubmechanismIllustrationPointEntityId' ASC) ; -CREATE INDEX 'IXFK_HydraulicLocationGeneralResultEntity_HydraulicLocationOutputEntity' - ON 'HydraulicLocationGeneralResultEntity' ('HydraulicLocationEntityOutputId' ASC) +CREATE INDEX 'IXFK_TopLevelSubmechanismIllustrationPointEntity_SubmechanismIllustrationPointEntity' + ON 'TopLevelSubmechanismIllustrationPointEntity' ('SubmechanismIllustrationPointEntityId' ASC) ; - -CREATE INDEX 'IXFK_HydraulicLocationWindDirectionClosingSituationIllustrationPointEntity_HydraulicLocationGeneralResultEntity' - ON 'HydraulicLocationWindDirectionClosingSituationIllustrationPointEntity' ('HydraulicLocationGeneralResultEntityId' ASC) +CREATE TRIGGER [TR_AfterDeleteTopLevelSubmechanismIllustrationPointEntity_RemoveSubmechanismIllustrationPointEntity] + AFTER DELETE + ON TopLevelSubmechanismIllustrationPointEntity + FOR EACH ROW +BEGIN + DELETE FROM SubmechanismIllustrationPointEntity + WHERE OLD.SubmechanismIllustrationPointEntityId IS NOT NULL AND + SubmechanismIllustrationPointEntityId IS OLD.SubmechanismIllustrationPointEntityId; +END; ; -CREATE INDEX 'IXFK_HydraulicLocationStochastEntity_HydraulicLocationGeneralResultEntity' - ON 'HydraulicLocationStochastEntity' ('HydraulicLocationGeneralResultEntityId' ASC) +CREATE INDEX 'IXFK_SubmechanismIllustrationPointStochast_SubmechanismIllustrationPointEntity' + ON 'SubmechanismIllustrationPointStochastEntity' ('SubmechanismIllustrationPointEntityId' ASC) ; - -CREATE INDEX 'IXFK_HydraulicLocationIllustrationPointResultEntity_HydraulicLocationWindDirectionClosingSituationIllustrationPointEntity' - ON 'HydraulicLocationIllustrationPointResultEntity' ('HydraulicLocationWindDirectionClosingSituationIllustrationPointEntityId' ASC) -; - -CREATE INDEX 'IXFK_HydraulicLocationRealizedStochastEntity_HydraulicLocationWindDirectionClosingSituationIllustrationPointEntity' - ON 'HydraulicLocationRealizedStochastEntity' ('HydraulicLocationWindDirectionClosingSituationIllustrationPointEntityId' ASC) -; Index: design/DatabaseDesign.eap =================================================================== diff -u -r4c73ff49c5294afbb42c65555c171562cefdc68c -r54242411470f330f6f4c75d1d05bfd0911706873 Binary files differ