Index: Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql =================================================================== diff -u -rbedba87880017e1cf22755bbe2da1d674b2be1e9 -rc020cda27aa3558aee28cce5cd2ec537ee6a9af4 --- Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql (.../DatabaseStructure18.1.sql) (revision bedba87880017e1cf22755bbe2da1d674b2be1e9) +++ Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql (.../DatabaseStructure18.1.sql) (revision c020cda27aa3558aee28cce5cd2ec537ee6a9af4) @@ -1,6 +1,6 @@ /* ---------------------------------------------------- */ /* Generated by Enterprise Architect Version 12.0 */ -/* Created On : 20-Mar-2018 14:36:05 */ +/* Created On : 21-Mar-2018 16:44:30 */ /* DBMS : SQLite */ /* ---------------------------------------------------- */ @@ -375,16 +375,24 @@ 'Composition' TINYINT (1) NOT NULL, -- Enum: 1 = Dike, 2 = Dune, 3 = DikeAndDune 'ReferenceLinePointXml' TEXT, 'Order' INT (4) NOT NULL, - CONSTRAINT 'FK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntity1Id') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade, - CONSTRAINT 'FK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity_02' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntity2Id') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade, - CONSTRAINT 'FK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity_03' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntity3Id') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade, - CONSTRAINT 'FK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity_04' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntity4Id') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade, - CONSTRAINT 'FK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity_05' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntity5Id') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade, - CONSTRAINT 'FK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity_06' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntity6Id') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade, - CONSTRAINT 'FK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity_07' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntity7Id') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade, - CONSTRAINT 'FK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity_08' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntity8Id') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade, + CONSTRAINT 'FK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity1' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntity1Id') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade, + CONSTRAINT 'FK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity2' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntity2Id') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade, + CONSTRAINT 'FK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity3' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntity3Id') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade, + CONSTRAINT 'FK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity4' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntity4Id') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade, + CONSTRAINT 'FK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity5' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntity5Id') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade, + CONSTRAINT 'FK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity6' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntity6Id') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade, + CONSTRAINT 'FK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity7' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntity7Id') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade, + CONSTRAINT 'FK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity8' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntity8Id') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade, CONSTRAINT 'FK_AssessmentSectionEntity_ProjectEntity' FOREIGN KEY ('ProjectEntityId') REFERENCES 'ProjectEntity' ('ProjectEntityId') ON DELETE Cascade ON UPDATE Cascade, - CONSTRAINT 'UQ_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntities' UNIQUE ('HydraulicLocationCalculationCollectionEntity1Id','HydraulicLocationCalculationCollectionEntity2Id','HydraulicLocationCalculationCollectionEntity3Id','HydraulicLocationCalculationCollectionEntity4Id','HydraulicLocationCalculationCollectionEntity5Id','HydraulicLocationCalculationCollectionEntity6Id','HydraulicLocationCalculationCollectionEntity7Id','HydraulicLocationCalculationCollectionEntity8Id') + CONSTRAINT 'U_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntities' UNIQUE ('HydraulicLocationCalculationCollectionEntity1Id','HydraulicLocationCalculationCollectionEntity2Id','HydraulicLocationCalculationCollectionEntity3Id','HydraulicLocationCalculationCollectionEntity4Id','HydraulicLocationCalculationCollectionEntity5Id','HydraulicLocationCalculationCollectionEntity6Id','HydraulicLocationCalculationCollectionEntity7Id','HydraulicLocationCalculationCollectionEntity8Id'), + CONSTRAINT 'U_HydraulicLocationCalculationCollectionEntity1' UNIQUE ('HydraulicLocationCalculationCollectionEntity1Id'), + CONSTRAINT 'U_HydraulicLocationCalculationCollectionEntity2' UNIQUE ('HydraulicLocationCalculationCollectionEntity2Id'), + CONSTRAINT 'U_HydraulicLocationCalculationCollectionEntity3' UNIQUE ('HydraulicLocationCalculationCollectionEntity3Id'), + CONSTRAINT 'U_HydraulicLocationCalculationCollectionEntity4' UNIQUE ('HydraulicLocationCalculationCollectionEntity4Id'), + CONSTRAINT 'U_HydraulicLocationCalculationCollectionEntity5' UNIQUE ('HydraulicLocationCalculationCollectionEntity5Id'), + CONSTRAINT 'U_HydraulicLocationCalculationCollectionEntity6' UNIQUE ('HydraulicLocationCalculationCollectionEntity6Id'), + CONSTRAINT 'U_HydraulicLocationCalculationCollectionEntity7' UNIQUE ('HydraulicLocationCalculationCollectionEntity7Id'), + CONSTRAINT 'U_HydraulicLocationCalculationCollectionEntity8' UNIQUE ('HydraulicLocationCalculationCollectionEntity8Id') ) ; @@ -1943,13 +1951,14 @@ 'HydraulicLocationCalculationCollectionEntityId' INTEGER NOT NULL, CONSTRAINT 'PK_HydraulicLocationCalculationCollectionToHydraulicCalculationEntity' PRIMARY KEY ('HydraulicLocationCalculationEntityId','HydraulicLocationCalculationCollectionEntityId'), CONSTRAINT 'FK_HydraulicLocationCalculationCollectionToHydraulicCalculationEntity_HydraulicLocationCalculationCollectionEntity' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntityId') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE Cascade ON UPDATE Cascade, - CONSTRAINT 'FK_HydraulicLocationCalculationCollectionToHydraulicCalculationEntity_HydraulicLocationCalculationEntity' FOREIGN KEY ('HydraulicLocationCalculationEntityId') REFERENCES 'HydraulicLocationCalculationEntity' ('HydraulicLocationCalculationEntityId') ON DELETE Cascade ON UPDATE Cascade + CONSTRAINT 'FK_HydraulicLocationCalculationCollectionToHydraulicCalculationEntity_HydraulicLocationCalculationEntity' FOREIGN KEY ('HydraulicLocationCalculationEntityId') REFERENCES 'HydraulicLocationCalculationEntity' ('HydraulicLocationCalculationEntityId') ON DELETE Cascade ON UPDATE Cascade, + CONSTRAINT 'U_HydraulicLocationCalculationEntityId' UNIQUE ('HydraulicLocationCalculationEntityId') ) ; CREATE TABLE 'HydraulicLocationCalculationCollectionEntity' ( - 'HydraulicLocationCalculationCollectionEntityId' INTEGER NOT NULL PRIMARY KEY + 'HydraulicLocationCalculationCollectionEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT ) ; @@ -1978,35 +1987,35 @@ ON 'MacroStabilityInwardsFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC) ; -CREATE INDEX 'IXFK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity' +CREATE INDEX 'IXFK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity1' ON 'AssessmentSectionEntity' ('HydraulicLocationCalculationCollectionEntity1Id' ASC) ; -CREATE INDEX 'IXFK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity_02' +CREATE INDEX 'IXFK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity2' ON 'AssessmentSectionEntity' ('HydraulicLocationCalculationCollectionEntity2Id' ASC) ; -CREATE INDEX 'IXFK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity_03' +CREATE INDEX 'IXFK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity3' ON 'AssessmentSectionEntity' ('HydraulicLocationCalculationCollectionEntity3Id' ASC) ; -CREATE INDEX 'IXFK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity_04' +CREATE INDEX 'IXFK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity4' ON 'AssessmentSectionEntity' ('HydraulicLocationCalculationCollectionEntity4Id' ASC) ; -CREATE INDEX 'IXFK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity_05' +CREATE INDEX 'IXFK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity5' ON 'AssessmentSectionEntity' ('HydraulicLocationCalculationCollectionEntity5Id' ASC) ; -CREATE INDEX 'IXFK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity_06' +CREATE INDEX 'IXFK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity6' ON 'AssessmentSectionEntity' ('HydraulicLocationCalculationCollectionEntity6Id' ASC) ; -CREATE INDEX 'IXFK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity_07' +CREATE INDEX 'IXFK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity7' ON 'AssessmentSectionEntity' ('HydraulicLocationCalculationCollectionEntity7Id' ASC) ; -CREATE INDEX 'IXFK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity_08' +CREATE INDEX 'IXFK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity8' ON 'AssessmentSectionEntity' ('HydraulicLocationCalculationCollectionEntity8Id' ASC) ; @@ -2708,14 +2717,3 @@ CREATE INDEX 'IXFK_HydraulicLocationCalculationCollectionToHydraulicCalculationEntity_HydraulicLocationCalculationEntity' ON 'HydraulicLocationCalculationCollectionToHydraulicCalculationEntity' ('HydraulicLocationCalculationEntityId' ASC) ; -CREATE TRIGGER [TR_AfterDeleteHydraulicLocationCalculationCollectionEntity_RemoveHydraulicLocationCalculationEntity] - AFTER DELETE - ON HydraulicLocationCalculationCollectionEntity - FOR EACH ROW -BEGIN - DELETE - FROM HydraulicLocationCalculationEntity - WHERE OLD.HydraulicLocationCalculationEntityId IS NOT NULL - AND HydraulicLocationCalculationEntityId IS OLD.HydraulicLocationCalculationEntityId; -END; -; Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HydraulicLocationCalculationEntity.cs =================================================================== diff -u -r0a615fd8fff795947585c1a7388a7cd205b6e57e -rc020cda27aa3558aee28cce5cd2ec537ee6a9af4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HydraulicLocationCalculationEntity.cs (.../HydraulicLocationCalculationEntity.cs) (revision 0a615fd8fff795947585c1a7388a7cd205b6e57e) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HydraulicLocationCalculationEntity.cs (.../HydraulicLocationCalculationEntity.cs) (revision c020cda27aa3558aee28cce5cd2ec537ee6a9af4) @@ -43,8 +43,8 @@ } public long HydraulicLocationCalculationEntityId { get; set; } - public byte ShouldIllustrationPointsBeCalculated { get; set; } public long HydraulicLocationEntityId { get; set; } + public byte ShouldIllustrationPointsBeCalculated { get; set; } public virtual HydraulicLocationEntity HydraulicLocationEntity { get; set; } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PartialRingtoetsEntities.cs =================================================================== diff -u -rbca00b0e437aeea92c5ef6fd0947ac64acf359cf -rc020cda27aa3558aee28cce5cd2ec537ee6a9af4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PartialRingtoetsEntities.cs (.../PartialRingtoetsEntities.cs) (revision bca00b0e437aeea92c5ef6fd0947ac64acf359cf) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PartialRingtoetsEntities.cs (.../PartialRingtoetsEntities.cs) (revision c020cda27aa3558aee28cce5cd2ec537ee6a9af4) @@ -81,6 +81,8 @@ HeightStructuresOutputEntities.Load(); HeightStructuresSectionResultEntities.Load(); HydraulicLocationEntities.Load(); + HydraulicLocationCalculationCollectionEntities.Include(e => e.HydraulicLocationCalculationEntities) + .Load(); HydraulicLocationCalculationEntities.Load(); HydraulicLocationOutputEntities.Load(); HydraRingPreprocessorEntities.Load(); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs =================================================================== diff -u -r0a615fd8fff795947585c1a7388a7cd205b6e57e -rc020cda27aa3558aee28cce5cd2ec537ee6a9af4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs (.../RingtoetsEntities.Context.cs) (revision 0a615fd8fff795947585c1a7388a7cd205b6e57e) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs (.../RingtoetsEntities.Context.cs) (revision c020cda27aa3558aee28cce5cd2ec537ee6a9af4) @@ -35,7 +35,10 @@ { public partial class RingtoetsEntities : System.Data.Entity.DbContext { - public virtual DbSet HydraulicLocationCalculationEntities { get; set; } + public virtual DbSet HydraulicLocationCalculationCollectionEntities { get; set; } + public virtual DbSet MacroStabilityOutwardsFailureMechanismMetaEntities { get; set; } + public virtual DbSet MacroStabilityOutwardsSectionResultEntities { get; set; } + public virtual DbSet PipingStructureFailureMechanismMetaEntities { get; set; } public virtual DbSet AssessmentSectionEntities { get; set; } public virtual DbSet BackgroundDataEntities { get; set; } public virtual DbSet BackgroundDataMetaEntities { get; set; } @@ -76,7 +79,7 @@ public virtual DbSet HeightStructuresOutputEntities { get; set; } public virtual DbSet HeightStructuresSectionResultEntities { get; set; } public virtual DbSet HydraRingPreprocessorEntities { get; set; } - public virtual DbSet HydraulicLocationCalculationCollectionEntities { get; set; } + public virtual DbSet HydraulicLocationCalculationEntities { get; set; } public virtual DbSet HydraulicLocationEntities { get; set; } public virtual DbSet HydraulicLocationOutputEntities { get; set; } public virtual DbSet IllustrationPointResultEntities { get; set; } @@ -91,8 +94,6 @@ public virtual DbSet MacroStabilityInwardsSoilProfileOneDEntities { get; set; } public virtual DbSet MacroStabilityInwardsSoilProfileTwoDEntities { get; set; } public virtual DbSet MacroStabilityInwardsStochasticSoilProfileEntities { get; set; } - public virtual DbSet MacroStabilityOutwardsFailureMechanismMetaEntities { get; set; } - public virtual DbSet MacroStabilityOutwardsSectionResultEntities { get; set; } public virtual DbSet MicrostabilitySectionResultEntities { get; set; } public virtual DbSet PipingCalculationEntities { get; set; } public virtual DbSet PipingCalculationOutputEntities { get; set; } @@ -102,7 +103,6 @@ public virtual DbSet PipingSoilLayerEntities { get; set; } public virtual DbSet PipingSoilProfileEntities { get; set; } public virtual DbSet PipingStochasticSoilProfileEntities { get; set; } - public virtual DbSet PipingStructureFailureMechanismMetaEntities { get; set; } public virtual DbSet PipingStructureSectionResultEntities { get; set; } public virtual DbSet ProjectEntities { get; set; } public virtual DbSet StabilityPointStructureEntities { get; set; } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx =================================================================== diff -u -r0a615fd8fff795947585c1a7388a7cd205b6e57e -rc020cda27aa3558aee28cce5cd2ec537ee6a9af4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 0a615fd8fff795947585c1a7388a7cd205b6e57e) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision c020cda27aa3558aee28cce5cd2ec537ee6a9af4) @@ -635,7 +635,7 @@ - + @@ -3914,7 +3914,10 @@ - + + + + @@ -3955,7 +3958,7 @@ - + @@ -3970,8 +3973,6 @@ - - @@ -3981,7 +3982,6 @@ - @@ -4565,17 +4565,50 @@ - + - + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -5329,20 +5362,16 @@ - + - + - - - - - - - - - - + + + + + + @@ -5656,26 +5685,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -5813,15 +5822,6 @@ - - - - - - - - - @@ -7903,15 +7903,42 @@ - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -8546,10 +8573,12 @@ - - - - + + + + + + @@ -8843,26 +8872,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -8993,15 +9002,6 @@ - - - - - - - - - Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram =================================================================== diff -u -r0a615fd8fff795947585c1a7388a7cd205b6e57e -rc020cda27aa3558aee28cce5cd2ec537ee6a9af4 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision 0a615fd8fff795947585c1a7388a7cd205b6e57e) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision c020cda27aa3558aee28cce5cd2ec537ee6a9af4) @@ -4,8 +4,10 @@ -<<<<<<< HEAD - + + + + @@ -35,172 +37,116 @@ +>>>>>>> 1579 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -======= - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - ->>>>>>> 1579 + + + + + - + @@ -236,9 +182,7 @@ - - @@ -251,7 +195,6 @@ - @@ -289,14 +232,7 @@ - - - - - - - - + @@ -307,7 +243,6 @@ - @@ -318,7 +253,6 @@ - @@ -335,100 +269,100 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Ringtoets.rtd =================================================================== diff -u -r0a615fd8fff795947585c1a7388a7cd205b6e57e -rc020cda27aa3558aee28cce5cd2ec537ee6a9af4 Binary files differ Index: build/DatabaseStructure.sql =================================================================== diff -u -r0a615fd8fff795947585c1a7388a7cd205b6e57e -rc020cda27aa3558aee28cce5cd2ec537ee6a9af4 --- build/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 0a615fd8fff795947585c1a7388a7cd205b6e57e) +++ build/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision c020cda27aa3558aee28cce5cd2ec537ee6a9af4) @@ -1,6 +1,6 @@ /* ---------------------------------------------------- */ /* Generated by Enterprise Architect Version 12.0 */ -/* Created On : 20-Mar-2018 14:36:05 */ +/* Created On : 21-Mar-2018 16:44:30 */ /* DBMS : SQLite */ /* ---------------------------------------------------- */ @@ -375,16 +375,24 @@ 'Composition' TINYINT (1) NOT NULL, -- Enum: 1 = Dike, 2 = Dune, 3 = DikeAndDune 'ReferenceLinePointXml' TEXT, 'Order' INT (4) NOT NULL, - CONSTRAINT 'FK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntity1Id') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade, - CONSTRAINT 'FK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity_02' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntity2Id') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade, - CONSTRAINT 'FK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity_03' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntity3Id') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade, - CONSTRAINT 'FK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity_04' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntity4Id') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade, - CONSTRAINT 'FK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity_05' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntity5Id') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade, - CONSTRAINT 'FK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity_06' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntity6Id') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade, - CONSTRAINT 'FK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity_07' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntity7Id') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade, - CONSTRAINT 'FK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity_08' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntity8Id') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade, + CONSTRAINT 'FK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity1' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntity1Id') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade, + CONSTRAINT 'FK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity2' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntity2Id') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade, + CONSTRAINT 'FK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity3' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntity3Id') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade, + CONSTRAINT 'FK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity4' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntity4Id') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade, + CONSTRAINT 'FK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity5' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntity5Id') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade, + CONSTRAINT 'FK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity6' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntity6Id') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade, + CONSTRAINT 'FK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity7' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntity7Id') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade, + CONSTRAINT 'FK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity8' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntity8Id') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE No Action ON UPDATE Cascade, CONSTRAINT 'FK_AssessmentSectionEntity_ProjectEntity' FOREIGN KEY ('ProjectEntityId') REFERENCES 'ProjectEntity' ('ProjectEntityId') ON DELETE Cascade ON UPDATE Cascade, - CONSTRAINT 'UQ_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntities' UNIQUE ('HydraulicLocationCalculationCollectionEntity1Id','HydraulicLocationCalculationCollectionEntity2Id','HydraulicLocationCalculationCollectionEntity3Id','HydraulicLocationCalculationCollectionEntity4Id','HydraulicLocationCalculationCollectionEntity5Id','HydraulicLocationCalculationCollectionEntity6Id','HydraulicLocationCalculationCollectionEntity7Id','HydraulicLocationCalculationCollectionEntity8Id') + CONSTRAINT 'U_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntities' UNIQUE ('HydraulicLocationCalculationCollectionEntity1Id','HydraulicLocationCalculationCollectionEntity2Id','HydraulicLocationCalculationCollectionEntity3Id','HydraulicLocationCalculationCollectionEntity4Id','HydraulicLocationCalculationCollectionEntity5Id','HydraulicLocationCalculationCollectionEntity6Id','HydraulicLocationCalculationCollectionEntity7Id','HydraulicLocationCalculationCollectionEntity8Id'), + CONSTRAINT 'U_HydraulicLocationCalculationCollectionEntity1' UNIQUE ('HydraulicLocationCalculationCollectionEntity1Id'), + CONSTRAINT 'U_HydraulicLocationCalculationCollectionEntity2' UNIQUE ('HydraulicLocationCalculationCollectionEntity2Id'), + CONSTRAINT 'U_HydraulicLocationCalculationCollectionEntity3' UNIQUE ('HydraulicLocationCalculationCollectionEntity3Id'), + CONSTRAINT 'U_HydraulicLocationCalculationCollectionEntity4' UNIQUE ('HydraulicLocationCalculationCollectionEntity4Id'), + CONSTRAINT 'U_HydraulicLocationCalculationCollectionEntity5' UNIQUE ('HydraulicLocationCalculationCollectionEntity5Id'), + CONSTRAINT 'U_HydraulicLocationCalculationCollectionEntity6' UNIQUE ('HydraulicLocationCalculationCollectionEntity6Id'), + CONSTRAINT 'U_HydraulicLocationCalculationCollectionEntity7' UNIQUE ('HydraulicLocationCalculationCollectionEntity7Id'), + CONSTRAINT 'U_HydraulicLocationCalculationCollectionEntity8' UNIQUE ('HydraulicLocationCalculationCollectionEntity8Id') ) ; @@ -1943,13 +1951,14 @@ 'HydraulicLocationCalculationCollectionEntityId' INTEGER NOT NULL, CONSTRAINT 'PK_HydraulicLocationCalculationCollectionToHydraulicCalculationEntity' PRIMARY KEY ('HydraulicLocationCalculationEntityId','HydraulicLocationCalculationCollectionEntityId'), CONSTRAINT 'FK_HydraulicLocationCalculationCollectionToHydraulicCalculationEntity_HydraulicLocationCalculationCollectionEntity' FOREIGN KEY ('HydraulicLocationCalculationCollectionEntityId') REFERENCES 'HydraulicLocationCalculationCollectionEntity' ('HydraulicLocationCalculationCollectionEntityId') ON DELETE Cascade ON UPDATE Cascade, - CONSTRAINT 'FK_HydraulicLocationCalculationCollectionToHydraulicCalculationEntity_HydraulicLocationCalculationEntity' FOREIGN KEY ('HydraulicLocationCalculationEntityId') REFERENCES 'HydraulicLocationCalculationEntity' ('HydraulicLocationCalculationEntityId') ON DELETE Cascade ON UPDATE Cascade + CONSTRAINT 'FK_HydraulicLocationCalculationCollectionToHydraulicCalculationEntity_HydraulicLocationCalculationEntity' FOREIGN KEY ('HydraulicLocationCalculationEntityId') REFERENCES 'HydraulicLocationCalculationEntity' ('HydraulicLocationCalculationEntityId') ON DELETE Cascade ON UPDATE Cascade, + CONSTRAINT 'U_HydraulicLocationCalculationEntityId' UNIQUE ('HydraulicLocationCalculationEntityId') ) ; CREATE TABLE 'HydraulicLocationCalculationCollectionEntity' ( - 'HydraulicLocationCalculationCollectionEntityId' INTEGER NOT NULL PRIMARY KEY + 'HydraulicLocationCalculationCollectionEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT ) ; @@ -1978,35 +1987,35 @@ ON 'MacroStabilityInwardsFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC) ; -CREATE INDEX 'IXFK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity' +CREATE INDEX 'IXFK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity1' ON 'AssessmentSectionEntity' ('HydraulicLocationCalculationCollectionEntity1Id' ASC) ; -CREATE INDEX 'IXFK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity_02' +CREATE INDEX 'IXFK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity2' ON 'AssessmentSectionEntity' ('HydraulicLocationCalculationCollectionEntity2Id' ASC) ; -CREATE INDEX 'IXFK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity_03' +CREATE INDEX 'IXFK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity3' ON 'AssessmentSectionEntity' ('HydraulicLocationCalculationCollectionEntity3Id' ASC) ; -CREATE INDEX 'IXFK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity_04' +CREATE INDEX 'IXFK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity4' ON 'AssessmentSectionEntity' ('HydraulicLocationCalculationCollectionEntity4Id' ASC) ; -CREATE INDEX 'IXFK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity_05' +CREATE INDEX 'IXFK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity5' ON 'AssessmentSectionEntity' ('HydraulicLocationCalculationCollectionEntity5Id' ASC) ; -CREATE INDEX 'IXFK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity_06' +CREATE INDEX 'IXFK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity6' ON 'AssessmentSectionEntity' ('HydraulicLocationCalculationCollectionEntity6Id' ASC) ; -CREATE INDEX 'IXFK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity_07' +CREATE INDEX 'IXFK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity7' ON 'AssessmentSectionEntity' ('HydraulicLocationCalculationCollectionEntity7Id' ASC) ; -CREATE INDEX 'IXFK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity_08' +CREATE INDEX 'IXFK_AssessmentSectionEntity_HydraulicLocationCalculationCollectionEntity8' ON 'AssessmentSectionEntity' ('HydraulicLocationCalculationCollectionEntity8Id' ASC) ; @@ -2708,14 +2717,3 @@ CREATE INDEX 'IXFK_HydraulicLocationCalculationCollectionToHydraulicCalculationEntity_HydraulicLocationCalculationEntity' ON 'HydraulicLocationCalculationCollectionToHydraulicCalculationEntity' ('HydraulicLocationCalculationEntityId' ASC) ; -CREATE TRIGGER [TR_AfterDeleteHydraulicLocationCalculationCollectionEntity_RemoveHydraulicLocationCalculationEntity] - AFTER DELETE - ON HydraulicLocationCalculationCollectionEntity - FOR EACH ROW -BEGIN - DELETE - FROM HydraulicLocationCalculationEntity - WHERE OLD.HydraulicLocationCalculationEntityId IS NOT NULL - AND HydraulicLocationCalculationEntityId IS OLD.HydraulicLocationCalculationEntityId; -END; -; Index: design/DatabaseDesign.eap =================================================================== diff -u -r39379a4c90811eb75977818b01960098ecf0f09c -rc020cda27aa3558aee28cce5cd2ec537ee6a9af4 Binary files differ