Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj =================================================================== diff -u -r8f13852513ec66f8725df3da17aa0c1895b04382 -radfa3c3e4d889f4038d1add832f3ea16aaeaadac --- Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision 8f13852513ec66f8725df3da17aa0c1895b04382) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision adfa3c3e4d889f4038d1add832f3ea16aaeaadac) @@ -68,6 +68,9 @@ RingtoetsEntities.tt + + RingtoetsEntities.tt + RingtoetsEntities.tt Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql =================================================================== diff -u -r8f13852513ec66f8725df3da17aa0c1895b04382 -radfa3c3e4d889f4038d1add832f3ea16aaeaadac --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 8f13852513ec66f8725df3da17aa0c1895b04382) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision adfa3c3e4d889f4038d1add832f3ea16aaeaadac) @@ -1,51 +1,59 @@ /* ---------------------------------------------------- */ /* Generated by Enterprise Architect Version 12.0 */ -/* Created On : 17-Mar-2016 11:55:25 */ +/* Created On : 17-Mar-2016 1:37:07 PM */ /* DBMS : SQLite */ /* ---------------------------------------------------- */ /* Drop Tables */ -DROP TABLE IF EXISTS 'DikeAssessmentSectionEntity' +DROP TABLE IF EXISTS 'Version' ; -DROP TABLE IF EXISTS 'FailureMechanismEntity' +DROP TABLE IF EXISTS 'ReferenceLinePointEntity' ; +DROP TABLE IF EXISTS 'ProjectEntity' +; + DROP TABLE IF EXISTS 'HydraulicLocationEntity' ; -DROP TABLE IF EXISTS 'ProjectEntity' +DROP TABLE IF EXISTS 'FailureMechanismEntity' ; -DROP TABLE IF EXISTS 'Version' +DROP TABLE IF EXISTS 'DikeAssessmentSectionEntity' ; /* Create Tables with Primary and Foreign Keys, Check and Unique Constraints */ -CREATE TABLE 'DikeAssessmentSectionEntity' +CREATE TABLE 'Version' ( - 'DikeAssessmentSectionEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, - 'ProjectEntityId' INTEGER NOT NULL, - 'Name' VARCHAR NOT NULL, - 'Norm' INT(4) NOT NULL, - 'Order' INT(4) NOT NULL, - 'HydraulicDatabaseVersion' TEXT, - 'HydraulicDatabaseLocation' TEXT, - CONSTRAINT 'FK_AssessmentSection_ProjectEntity' FOREIGN KEY ('ProjectEntityId') REFERENCES 'ProjectEntity' ('ProjectEntityId') ON DELETE Cascade ON UPDATE Cascade + 'VersionId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + 'FromVersion' TEXT, + 'ToVersion' TEXT, + 'Timestamp' NUMERIC ) ; -CREATE TABLE 'FailureMechanismEntity' +CREATE TABLE 'ReferenceLinePointEntity' ( - 'FailureMechanismEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, - 'DikeAssessmentSectionEntityId' INTEGER NOT NULL, - 'FailureMechanismType' SMALLINT NOT NULL, -- Enumerator for different failure mechanism types (piping, macrostability, dunes, etc) - CONSTRAINT 'FK_FailureMechanismEntity_AssessmentSectionEntity' FOREIGN KEY ('DikeAssessmentSectionEntityId') REFERENCES 'DikeAssessmentSectionEntity' ('DikeAssessmentSectionEntityId') ON DELETE Cascade ON UPDATE Cascade, - CONSTRAINT 'UI_AS_FMT' UNIQUE ('FailureMechanismType','DikeAssessmentSectionEntityId') + 'ReferenceLinePointEntityId' INTEGER NOT NULL PRIMARY KEY, + 'DikeAssessmentSectionEntityId' INTEGER, + 'X' NUMERIC, + 'Y' NUMERIC, + 'Order' INTEGER, + CONSTRAINT 'FK_ReferenceLinePointEntity_DikeAssessmentSectionEntity' FOREIGN KEY ('DikeAssessmentSectionEntityId') REFERENCES 'DikeAssessmentSectionEntity' ('DikeAssessmentSectionEntityId') ON DELETE Cascade ON UPDATE Cascade ) ; +CREATE TABLE 'ProjectEntity' +( + 'ProjectEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + 'Description' TEXT, + 'LastUpdated' NUMERIC DEFAULT CURRENT_TIMESTAMP +) +; + CREATE TABLE 'HydraulicLocationEntity' ( 'HydraulicLocationEntityId' INTEGER NOT NULL PRIMARY KEY, @@ -58,33 +66,43 @@ ) ; -CREATE TABLE 'ProjectEntity' +CREATE TABLE 'FailureMechanismEntity' ( - 'ProjectEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, - 'Description' TEXT, - 'LastUpdated' NUMERIC DEFAULT CURRENT_TIMESTAMP + 'FailureMechanismEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + 'DikeAssessmentSectionEntityId' INTEGER NOT NULL, + 'FailureMechanismType' SMALLINT NOT NULL, -- Enumerator for different failure mechanism types (piping, macrostability, dunes, etc) + CONSTRAINT 'FK_FailureMechanismEntity_AssessmentSectionEntity' FOREIGN KEY ('DikeAssessmentSectionEntityId') REFERENCES 'DikeAssessmentSectionEntity' ('DikeAssessmentSectionEntityId') ON DELETE Cascade ON UPDATE Cascade, + CONSTRAINT 'UI_AS_FMT' UNIQUE ('FailureMechanismType','DikeAssessmentSectionEntityId') ) ; -CREATE TABLE 'Version' +CREATE TABLE 'DikeAssessmentSectionEntity' ( - 'VersionId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, - 'FromVersion' TEXT, - 'ToVersion' TEXT, - 'Timestamp' NUMERIC + 'DikeAssessmentSectionEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + 'ProjectEntityId' INTEGER NOT NULL, + 'Name' VARCHAR NOT NULL, + 'Norm' INT(4) NOT NULL, + 'Order' INT(4) NOT NULL, + 'HydraulicDatabaseVersion' TEXT, + 'HydraulicDatabaseLocation' TEXT, + CONSTRAINT 'FK_AssessmentSection_ProjectEntity' FOREIGN KEY ('ProjectEntityId') REFERENCES 'ProjectEntity' ('ProjectEntityId') ON DELETE Cascade ON UPDATE Cascade ) ; /* Create Indexes and Triggers */ -CREATE INDEX 'IXFK_AssessmentSection_ProjectEntity' - ON 'DikeAssessmentSectionEntity' ('ProjectEntityId' ASC) +CREATE INDEX 'IXFK_ReferenceLinePointEntity_DikeAssessmentSectionEntity' + ON 'ReferenceLinePointEntity' ('DikeAssessmentSectionEntityId' ASC) ; +CREATE INDEX 'IXFK_HydraulicLocationEntity_DikeAssessmentSectionEntity' + ON 'HydraulicLocationEntity' ('DikeAssessmentSectionEntityId' ASC) +; + CREATE INDEX 'IXFK_FailureMechanismEntity_AssessmentSectionEntity' ON 'FailureMechanismEntity' ('DikeAssessmentSectionEntityId' ASC) ; -CREATE INDEX 'IXFK_HydraulicLocationEntity_DikeAssessmentSectionEntity' - ON 'HydraulicLocationEntity' ('DikeAssessmentSectionEntityId' ASC) +CREATE INDEX 'IXFK_AssessmentSection_ProjectEntity' + ON 'DikeAssessmentSectionEntity' ('ProjectEntityId' ASC) ; Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DikeAssessmentSectionEntity.cs =================================================================== diff -u -r8f13852513ec66f8725df3da17aa0c1895b04382 -radfa3c3e4d889f4038d1add832f3ea16aaeaadac --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DikeAssessmentSectionEntity.cs (.../DikeAssessmentSectionEntity.cs) (revision 8f13852513ec66f8725df3da17aa0c1895b04382) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DikeAssessmentSectionEntity.cs (.../DikeAssessmentSectionEntity.cs) (revision adfa3c3e4d889f4038d1add832f3ea16aaeaadac) @@ -40,6 +40,7 @@ { this.FailureMechanismEntities = new HashSet(); this.HydraulicLocationEntities = new HashSet(); + this.ReferenceLinePointEntities = new HashSet(); } public long DikeAssessmentSectionEntityId { get; set; } @@ -55,5 +56,7 @@ public virtual ICollection FailureMechanismEntities { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection HydraulicLocationEntities { get; set; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection ReferenceLinePointEntities { get; set; } } } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ReferenceLinePointEntity.cs =================================================================== diff -u --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ReferenceLinePointEntity.cs (revision 0) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ReferenceLinePointEntity.cs (revision adfa3c3e4d889f4038d1add832f3ea16aaeaadac) @@ -0,0 +1,46 @@ +// 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 ReferenceLinePointEntity + { + public long ReferenceLinePointEntityId { get; set; } + public Nullable DikeAssessmentSectionEntityId { get; set; } + public Nullable X { get; set; } + public Nullable Y { get; set; } + public Nullable Order { get; set; } + + public virtual DikeAssessmentSectionEntity DikeAssessmentSectionEntity { get; set; } + } +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs =================================================================== diff -u -r8f13852513ec66f8725df3da17aa0c1895b04382 -radfa3c3e4d889f4038d1add832f3ea16aaeaadac --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs (.../RingtoetsEntities.Context.cs) (revision 8f13852513ec66f8725df3da17aa0c1895b04382) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs (.../RingtoetsEntities.Context.cs) (revision adfa3c3e4d889f4038d1add832f3ea16aaeaadac) @@ -56,6 +56,7 @@ public virtual IDbSet FailureMechanismEntities { get; set; } public virtual IDbSet HydraulicLocationEntities { get; set; } public virtual IDbSet ProjectEntities { get; set; } + public virtual IDbSet ReferenceLinePointEntities { get; set; } public virtual IDbSet Versions { get; set; } } } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs =================================================================== diff -u -r8f13852513ec66f8725df3da17aa0c1895b04382 -radfa3c3e4d889f4038d1add832f3ea16aaeaadac --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs (.../RingtoetsEntities.Designer.cs) (revision 8f13852513ec66f8725df3da17aa0c1895b04382) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs (.../RingtoetsEntities.Designer.cs) (revision adfa3c3e4d889f4038d1add832f3ea16aaeaadac) @@ -1,4 +1,4 @@ -// T4 code generation is enabled for model 'D:\Repos\Ringtoets\Application\Ringtoets\src\Application.Ringtoets.Storage\DbContext\RingtoetsEntities.edmx'. +// T4 code generation is enabled for model 'D:\repos\WettelijkToetsInstrumentarium\Application\Ringtoets\src\Application.Ringtoets.Storage\DbContext\RingtoetsEntities.edmx'. // To enable legacy code generation, change the value of the 'Code Generation Strategy' designer // property to 'Legacy ObjectContext'. This property is available in the Properties Window when the model // is open in the designer. Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx =================================================================== diff -u -r8f13852513ec66f8725df3da17aa0c1895b04382 -radfa3c3e4d889f4038d1add832f3ea16aaeaadac --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 8f13852513ec66f8725df3da17aa0c1895b04382) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision adfa3c3e4d889f4038d1add832f3ea16aaeaadac) @@ -4,7 +4,7 @@ - + @@ -44,6 +44,16 @@ + + + + + + + + + + @@ -89,11 +99,24 @@ + + + + + + + + + + + + + @@ -107,6 +130,10 @@ + + + + @@ -117,6 +144,7 @@ + @@ -130,6 +158,10 @@ + + + + @@ -145,6 +177,7 @@ + @@ -176,6 +209,17 @@ + + + + + + + + + + + @@ -221,6 +265,18 @@ + + + + + + + + + + + + @@ -270,6 +326,17 @@ + + + + + + + + + + + Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram =================================================================== diff -u -r8f13852513ec66f8725df3da17aa0c1895b04382 -radfa3c3e4d889f4038d1add832f3ea16aaeaadac --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision 8f13852513ec66f8725df3da17aa0c1895b04382) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision adfa3c3e4d889f4038d1add832f3ea16aaeaadac) @@ -5,14 +5,16 @@ - - - - - + + + + + + +