Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj =================================================================== diff -u -r02f18ee78d2e0520b90c8bfcb13f563e7d41365a -r8130cde70fa4a5ef16789bad2a8b64175d77d9a2 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision 02f18ee78d2e0520b90c8bfcb13f563e7d41365a) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision 8130cde70fa4a5ef16789bad2a8b64175d77d9a2) @@ -124,6 +124,9 @@ RingtoetsEntities.tt + + RingtoetsEntities.tt + RingtoetsEntities.tt Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql =================================================================== diff -u -r21d94a2cc5a3a916d02a441f80414455b80d85dc -r8130cde70fa4a5ef16789bad2a8b64175d77d9a2 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 21d94a2cc5a3a916d02a441f80414455b80d85dc) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 8130cde70fa4a5ef16789bad2a8b64175d77d9a2) @@ -1,6 +1,6 @@ /* ---------------------------------------------------- */ /* Generated by Enterprise Architect Version 12.0 */ -/* Created On : 11-jul-2016 15:45:51 */ +/* Created On : 12-jul-2016 15:59:10 */ /* DBMS : SQLite */ /* ---------------------------------------------------- */ @@ -156,10 +156,10 @@ DROP TABLE IF EXISTS 'HeightStructuresCalculationEntity' ; -DROP TABLE IF EXISTS 'GrassCoverSlipOffOutwardsSectionResultEntity' +DROP TABLE IF EXISTS 'WaveImpactAsphaltCoverFailureMechanismMetaEntity' ; -DROP TABLE IF EXISTS 'WaveImpactAsphaltCoverFailureMechanismMetaEntity' +DROP TABLE IF EXISTS 'GrassCoverSlipOffOutwardsSectionResultEntity' ; DROP TABLE IF EXISTS 'GrassCoverSlipOffOutwardsFailureMechanismMetaEntity' @@ -180,6 +180,9 @@ DROP TABLE IF EXISTS 'DuneErosionFailureMechanismMetaEntity' ; +DROP TABLE IF EXISTS 'DikeProfileEntity' +; + DROP TABLE IF EXISTS 'ClosingStructureSectionResultEntity' ; @@ -762,6 +765,14 @@ ) ; +CREATE TABLE 'WaveImpactAsphaltCoverFailureMechanismMetaEntity' +( + 'WaveImpactAsphaltCoverFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + 'FailureMechanismEntityId' INTEGER, + CONSTRAINT 'FK_WaveImpactAsphaltCoverFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade +) +; + CREATE TABLE 'GrassCoverSlipOffOutwardsSectionResultEntity' ( 'GrassCoverSlipOffOutwardsSectionResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -773,14 +784,6 @@ ) ; -CREATE TABLE 'WaveImpactAsphaltCoverFailureMechanismMetaEntity' -( - 'WaveImpactAsphaltCoverFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, - 'FailureMechanismEntityId' INTEGER, - CONSTRAINT 'FK_WaveImpactAsphaltCoverFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade -) -; - CREATE TABLE 'GrassCoverSlipOffOutwardsFailureMechanismMetaEntity' ( 'GrassCoverSlipOffOutwardsFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -839,6 +842,21 @@ ) ; +CREATE TABLE 'DikeProfileEntity' +( + 'DikeProfileEntityId' INTEGER NOT NULL PRIMARY KEY, + 'FailureMechanismEntityId' INTEGER NOT NULL, + 'Name' VARCHAR (260) NOT NULL, + 'Orientation' REAL NOT NULL, + 'BreakWaterType' TINYINT (1), -- Enum: 1 = Wall 2 = Caisson 3 = Dam + 'BreakWaterHeight' REAL, + 'ForeShoreData' BLOB NOT NULL, + 'DikeGeometryData' BLOB NOT NULL, + 'DikeHeight' REAL NOT NULL, + CONSTRAINT 'FK_DikeProfileEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade +) +; + CREATE TABLE 'ClosingStructureSectionResultEntity' ( 'ClosingStructureSectionResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -1073,14 +1091,14 @@ ON 'HeightStructuresCalculationEntity' ('ProbabilisticOutputEntityId' ASC) ; -CREATE INDEX 'IXFK_GrassCoverSlipOffOutwardsSectionResultEntity_FailureMechanismSectionEntity' - ON 'GrassCoverSlipOffOutwardsSectionResultEntity' ('FailureMechanismSectionEntityId' ASC) -; - CREATE INDEX 'IXFK_WaveImpactAsphaltCoverFailureMechanismMetaEntity_FailureMechanismEntity' ON 'WaveImpactAsphaltCoverFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC) ; +CREATE INDEX 'IXFK_GrassCoverSlipOffOutwardsSectionResultEntity_FailureMechanismSectionEntity' + ON 'GrassCoverSlipOffOutwardsSectionResultEntity' ('FailureMechanismSectionEntityId' ASC) +; + CREATE INDEX 'IXFK_GrassCoverSlipOffOutwardsFailureMechanismMetaEntity_FailureMechanismEntity' ON 'GrassCoverSlipOffOutwardsFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC) ; @@ -1105,6 +1123,10 @@ ON 'DuneErosionFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC) ; +CREATE INDEX 'IXFK_DikeProfileEntity_FailureMechanismEntity' + ON 'DikeProfileEntity' ('FailureMechanismEntityId' ASC) +; + CREATE INDEX 'IXFK_ClosingStructureSectionResultEntity_FailureMechanismSectionEntity' ON 'ClosingStructureSectionResultEntity' ('FailureMechanismSectionEntityId' ASC) ; Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DikeProfileEntity.cs =================================================================== diff -u --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DikeProfileEntity.cs (revision 0) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DikeProfileEntity.cs (revision 8130cde70fa4a5ef16789bad2a8b64175d77d9a2) @@ -0,0 +1,50 @@ +// Copyright (C) Stichting Deltares 2016. 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 +{ + using System; + using System.Collections.Generic; + + public partial class DikeProfileEntity + { + public long DikeProfileEntityId { get; set; } + public long FailureMechanismEntityId { get; set; } + public string Name { get; set; } + public double Orientation { get; set; } + public Nullable BreakWaterType { get; set; } + public Nullable BreakWaterHeight { get; set; } + public byte[] ForeShoreData { get; set; } + public byte[] DikeGeometryData { get; set; } + public double DikeHeight { get; set; } + + public virtual FailureMechanismEntity FailureMechanismEntity { get; set; } + } +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/FailureMechanismEntity.cs =================================================================== diff -u -r21d94a2cc5a3a916d02a441f80414455b80d85dc -r8130cde70fa4a5ef16789bad2a8b64175d77d9a2 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/FailureMechanismEntity.cs (.../FailureMechanismEntity.cs) (revision 21d94a2cc5a3a916d02a441f80414455b80d85dc) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/FailureMechanismEntity.cs (.../FailureMechanismEntity.cs) (revision 8130cde70fa4a5ef16789bad2a8b64175d77d9a2) @@ -39,6 +39,7 @@ public FailureMechanismEntity() { this.ClosingStructureFailureMechanismMetaEntities = new HashSet(); + this.DikeProfileEntities = new HashSet(); this.DuneErosionFailureMechanismMetaEntities = new HashSet(); this.FailureMechanismSectionEntities = new HashSet(); this.GrassCoverErosionInwardsFailureMechanismMetaEntities = new HashSet(); @@ -73,6 +74,8 @@ [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection ClosingStructureFailureMechanismMetaEntities { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection DikeProfileEntities { get; set; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection DuneErosionFailureMechanismMetaEntities { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection FailureMechanismSectionEntities { get; set; } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/IRingtoetsEntities.cs =================================================================== diff -u -r21d94a2cc5a3a916d02a441f80414455b80d85dc -r8130cde70fa4a5ef16789bad2a8b64175d77d9a2 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/IRingtoetsEntities.cs (.../IRingtoetsEntities.cs) (revision 21d94a2cc5a3a916d02a441f80414455b80d85dc) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/IRingtoetsEntities.cs (.../IRingtoetsEntities.cs) (revision 8130cde70fa4a5ef16789bad2a8b64175d77d9a2) @@ -61,6 +61,12 @@ DbSet PipingSectionResultEntities { get; } /// + /// Gets a of containing + /// every entity found in the database. + /// + DbSet DikeProfileEntities { get; } + + /// /// Gets a of containing /// every entity found in the database. /// Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs =================================================================== diff -u -r21d94a2cc5a3a916d02a441f80414455b80d85dc -r8130cde70fa4a5ef16789bad2a8b64175d77d9a2 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs (.../RingtoetsEntities.Context.cs) (revision 21d94a2cc5a3a916d02a441f80414455b80d85dc) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs (.../RingtoetsEntities.Context.cs) (revision 8130cde70fa4a5ef16789bad2a8b64175d77d9a2) @@ -57,6 +57,7 @@ public virtual DbSet CharacteristicPointEntities { get; set; } public virtual DbSet ClosingStructureFailureMechanismMetaEntities { get; set; } public virtual DbSet ClosingStructureSectionResultEntities { get; set; } + public virtual DbSet DikeProfileEntities { get; set; } public virtual DbSet DuneErosionFailureMechanismMetaEntities { get; set; } public virtual DbSet DuneErosionSectionResultEntities { get; set; } public virtual DbSet FailureMechanismEntities { get; set; } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx =================================================================== diff -u -r21d94a2cc5a3a916d02a441f80414455b80d85dc -r8130cde70fa4a5ef16789bad2a8b64175d77d9a2 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 21d94a2cc5a3a916d02a441f80414455b80d85dc) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 8130cde70fa4a5ef16789bad2a8b64175d77d9a2) @@ -54,6 +54,20 @@ + + + + + + + + + + + + + + @@ -670,6 +684,18 @@ + + + + + + + + + + + + @@ -1396,6 +1422,7 @@ + @@ -1471,6 +1498,10 @@ + + + + @@ -1722,6 +1753,7 @@ + @@ -1825,6 +1857,10 @@ + + + + @@ -2100,6 +2136,21 @@ + + + + + + + + + + + + + + + @@ -2131,6 +2182,7 @@ + @@ -2917,6 +2969,18 @@ + + + + + + + + + + + + @@ -3613,6 +3677,21 @@ + + + + + + + + + + + + + + + Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram =================================================================== diff -u -r21d94a2cc5a3a916d02a441f80414455b80d85dc -r8130cde70fa4a5ef16789bad2a8b64175d77d9a2 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision 21d94a2cc5a3a916d02a441f80414455b80d85dc) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision 8130cde70fa4a5ef16789bad2a8b64175d77d9a2) @@ -5,66 +5,67 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + @@ -77,6 +78,7 @@ + Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsEntitiesHelper.cs =================================================================== diff -u -r21d94a2cc5a3a916d02a441f80414455b80d85dc -r8130cde70fa4a5ef16789bad2a8b64175d77d9a2 --- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsEntitiesHelper.cs (.../RingtoetsEntitiesHelper.cs) (revision 21d94a2cc5a3a916d02a441f80414455b80d85dc) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsEntitiesHelper.cs (.../RingtoetsEntitiesHelper.cs) (revision 8130cde70fa4a5ef16789bad2a8b64175d77d9a2) @@ -42,6 +42,7 @@ DbSet failureMechanismSectionsSet = CreateEmptyTestDbSet(); DbSet failureMechanismSectionPointsSet = CreateEmptyTestDbSet(); DbSet pipingSectionResultsSet = CreateEmptyTestDbSet(); + DbSet dikeProfileEntities = CreateEmptyTestDbSet(); DbSet grassCoverErosionInwardsMetaEntities = CreateEmptyTestDbSet(); DbSet grassCoverErosionInwardsSectionResultsSet = CreateEmptyTestDbSet(); DbSet heightStructuresSectionResultsSet = CreateEmptyTestDbSet(); @@ -83,6 +84,7 @@ ringtoetsEntities.Stub(r => r.FailureMechanismSectionEntities).Return(failureMechanismSectionsSet); ringtoetsEntities.Stub(r => r.FailureMechanismSectionPointEntities).Return(failureMechanismSectionPointsSet); ringtoetsEntities.Stub(r => r.PipingSectionResultEntities).Return(pipingSectionResultsSet); + ringtoetsEntities.Stub(r => r.DikeProfileEntities).Return(dikeProfileEntities); ringtoetsEntities.Stub(r => r.GrassCoverErosionInwardsFailureMechanismMetaEntities).Return(grassCoverErosionInwardsMetaEntities); ringtoetsEntities.Stub(r => r.GrassCoverErosionInwardsSectionResultEntities).Return(grassCoverErosionInwardsSectionResultsSet); ringtoetsEntities.Stub(r => r.HeightStructuresSectionResultEntities).Return(heightStructuresSectionResultsSet);