Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj
===================================================================
diff -u -rfa2d88ba58e524c1d132a21df4e0adf9fa6570c4 -r2651fdf110e56d0f48e416fcffc1b4922cff00a5
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision fa2d88ba58e524c1d132a21df4e0adf9fa6570c4)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision 2651fdf110e56d0f48e416fcffc1b4922cff00a5)
@@ -105,6 +105,9 @@
RingtoetsEntities.tt
+
+ RingtoetsEntities.tt
+
RingtoetsEntities.tt
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationCreateExtensions.cs
===================================================================
diff -u -rfa2d88ba58e524c1d132a21df4e0adf9fa6570c4 -r2651fdf110e56d0f48e416fcffc1b4922cff00a5
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationCreateExtensions.cs (.../GrassCoverErosionInwardsCalculationCreateExtensions.cs) (revision fa2d88ba58e524c1d132a21df4e0adf9fa6570c4)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationCreateExtensions.cs (.../GrassCoverErosionInwardsCalculationCreateExtensions.cs) (revision 2651fdf110e56d0f48e416fcffc1b4922cff00a5)
@@ -74,7 +74,7 @@
}
if (input.HydraulicBoundaryLocation != null)
{
- entity.HydraulicLocationEntity = registry.Get(input.HydraulicBoundaryLocation);
+ entity.HydraulicLocationEntity = registry.Get(input.HydraulicBoundaryLocation);
}
entity.BreakWaterHeight = input.BreakWater.Height.Value.ToNaNAsNull();
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HydraulicBoundaryLocationCreateExtensions.cs
===================================================================
diff -u -r05013c44d1273bac219a442dc7959706c6bac715 -r2651fdf110e56d0f48e416fcffc1b4922cff00a5
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HydraulicBoundaryLocationCreateExtensions.cs (.../HydraulicBoundaryLocationCreateExtensions.cs) (revision 05013c44d1273bac219a442dc7959706c6bac715)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HydraulicBoundaryLocationCreateExtensions.cs (.../HydraulicBoundaryLocationCreateExtensions.cs) (revision 2651fdf110e56d0f48e416fcffc1b4922cff00a5)
@@ -46,7 +46,7 @@
}
if (registry.Contains(location))
{
- return registry.Get(location);
+ return registry.Get(location);
}
var entity = new HydraulicLocationEntity
@@ -65,5 +65,42 @@
registry.Register(entity, location);
return entity;
}
+
+ ///
+ /// Creates a based on the information of the .
+ ///
+ /// The location to create a database entity for.
+ /// The object keeping track of create operations.
+ /// Index at which this instance resides inside its parent container.
+ /// A new .
+ /// Thrown when is null.
+ internal static GrassCoverErosionOutwardsHydraulicLocationEntity CreateGrassCoverErosionOutwardsHydraulicBoundaryLocation(
+ this HydraulicBoundaryLocation location, PersistenceRegistry registry, int order)
+ {
+ if (registry == null)
+ {
+ throw new ArgumentNullException("registry");
+ }
+ if (registry.Contains(location))
+ {
+ return registry.Get(location);
+ }
+
+ var entity = new GrassCoverErosionOutwardsHydraulicLocationEntity
+ {
+ LocationId = location.Id,
+ Name = location.Name.DeepClone(),
+ LocationX = location.Location.X.ToNaNAsNull(),
+ LocationY = location.Location.Y.ToNaNAsNull(),
+ DesignWaterLevel = double.IsNaN(location.DesignWaterLevel) ? (double?)null : location.DesignWaterLevel,
+ WaveHeight = double.IsNaN(location.WaveHeight) ? (double?)null : location.WaveHeight,
+ DesignWaterLevelCalculationConvergence = (byte)location.DesignWaterLevelCalculationConvergence,
+ WaveHeightCalculationConvergence = (byte)location.WaveHeightCalculationConvergence,
+ Order = order
+ };
+
+ registry.Register(entity, location);
+ return entity;
+ }
}
}
\ No newline at end of file
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PersistenceRegistry.cs
===================================================================
diff -u -r0540405a7dbabf85dc02db30c79c3c58b0faeea6 -r2651fdf110e56d0f48e416fcffc1b4922cff00a5
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PersistenceRegistry.cs (.../PersistenceRegistry.cs) (revision 0540405a7dbabf85dc02db30c79c3c58b0faeea6)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PersistenceRegistry.cs (.../PersistenceRegistry.cs) (revision 2651fdf110e56d0f48e416fcffc1b4922cff00a5)
@@ -45,12 +45,13 @@
private readonly Dictionary dikeProfiles = CreateDictionary();
private readonly Dictionary foreshoreProfiles = CreateDictionary();
private readonly Dictionary grassCoverErosionInwardsCalculations = CreateDictionary();
- private readonly Dictionary hydraulicLocations = CreateDictionary();
private readonly Dictionary stochasticSoilModels = CreateDictionary();
private readonly Dictionary stochasticSoilProfiles = CreateDictionary();
private readonly Dictionary soilProfiles = CreateDictionary();
private readonly Dictionary surfaceLines = CreateDictionary();
+ private readonly Dictionary hydraulicLocations = CreateDictionary();
+
///
/// Registers a create or update operation for and the
/// that was constructed with the information.
@@ -137,6 +138,22 @@
/// Registers a create or update operation for and the
/// that was constructed with the information.
///
+ /// The to be registered.
+ /// The to be registered.
+ /// Thrown when either:
+ ///
+ /// - is null
+ /// - is null
+ ///
+ internal void Register(GrassCoverErosionOutwardsHydraulicLocationEntity entity, HydraulicBoundaryLocation model)
+ {
+ Register(hydraulicLocations, entity, model);
+ }
+
+ ///
+ /// Registers a create or update operation for and the
+ /// that was constructed with the information.
+ ///
/// The to be registered.
/// The to be registered.
/// Thrown when either:
@@ -385,11 +402,11 @@
/// has been registered for .
/// Use to find out
/// whether a create/update operation has been registered for .
- internal HydraulicLocationEntity Get(HydraulicBoundaryLocation model)
+ internal T Get(HydraulicBoundaryLocation model) where T : class
{
- return Get(hydraulicLocations, model);
+ return Get(hydraulicLocations, model) as T;
}
-
+
///
/// Obtains the which was registered for the
/// given .
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingCalculationScenarioCreateExtensions.cs
===================================================================
diff -u -rfa2d88ba58e524c1d132a21df4e0adf9fa6570c4 -r2651fdf110e56d0f48e416fcffc1b4922cff00a5
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingCalculationScenarioCreateExtensions.cs (.../PipingCalculationScenarioCreateExtensions.cs) (revision fa2d88ba58e524c1d132a21df4e0adf9fa6570c4)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingCalculationScenarioCreateExtensions.cs (.../PipingCalculationScenarioCreateExtensions.cs) (revision 2651fdf110e56d0f48e416fcffc1b4922cff00a5)
@@ -69,7 +69,7 @@
}
if (inputParameters.HydraulicBoundaryLocation != null)
{
- entity.HydraulicLocationEntity = registry.Get(inputParameters.HydraulicBoundaryLocation);
+ entity.HydraulicLocationEntity = registry.Get(inputParameters.HydraulicBoundaryLocation);
}
if (inputParameters.StochasticSoilProfile != null)
{
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/AssessmentSectionEntity.cs
===================================================================
diff -u -r741fcc00e47a7ff8fa01bbf15edbaedf8dec2e57 -r2651fdf110e56d0f48e416fcffc1b4922cff00a5
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/AssessmentSectionEntity.cs (.../AssessmentSectionEntity.cs) (revision 741fcc00e47a7ff8fa01bbf15edbaedf8dec2e57)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/AssessmentSectionEntity.cs (.../AssessmentSectionEntity.cs) (revision 2651fdf110e56d0f48e416fcffc1b4922cff00a5)
@@ -43,8 +43,8 @@
}
public long AssessmentSectionEntityId { get; set; }
- public string Id { get; set; }
public long ProjectEntityId { get; set; }
+ public string Id { get; set; }
public string Name { get; set; }
public string Comments { get; set; }
public int Norm { get; set; }
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql
===================================================================
diff -u -rfa2d88ba58e524c1d132a21df4e0adf9fa6570c4 -r2651fdf110e56d0f48e416fcffc1b4922cff00a5
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision fa2d88ba58e524c1d132a21df4e0adf9fa6570c4)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 2651fdf110e56d0f48e416fcffc1b4922cff00a5)
@@ -1,6 +1,6 @@
/* ---------------------------------------------------- */
/* Generated by Enterprise Architect Version 12.0 */
-/* Created On : 16-Sep-2016 11:31:22 AM */
+/* Created On : 16-sep-2016 15:56:48 */
/* DBMS : SQLite */
/* ---------------------------------------------------- */
@@ -42,10 +42,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'
@@ -135,6 +135,9 @@
DROP TABLE IF EXISTS 'StabilityStoneCoverWaveConditionsOutputEntity'
;
+DROP TABLE IF EXISTS 'GrassCoverErosionOutwardsHydraulicLocationEntity'
+;
+
/* Create Tables with Primary and Foreign Keys, Check and Unique Constraints */
CREATE TABLE 'VersionEntity'
@@ -166,8 +169,8 @@
CREATE TABLE 'AssessmentSectionEntity'
(
'AssessmentSectionEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
- 'Id' TEXT,
'ProjectEntityId' INTEGER NOT NULL,
+ 'Id' TEXT,
'Name' VARCHAR (260),
'Comments' TEXT,
'Norm' INT (4) NOT NULL,
@@ -299,6 +302,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,
@@ -319,14 +330,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,
@@ -691,11 +694,28 @@
'WaveHeight' REAL,
'WavePeakPeriod' REAL,
'WaveAngle' REAL,
- CONSTRAINT 'FK_StabilityStoneCoverWaveConditionsOutputEntity_StabilityStoneCoverWaveConditionsCalculationEntity' FOREIGN KEY ('StabilityStoneCoverWaveConditionsCalculationEntityId') REFERENCES 'StabilityStoneCoverWaveConditionsCalculationEntity' ('StabilityStoneCoverWaveConditionsCalculationEntityId') ON DELETE Cascade ON UPDATE Cascade,
- CONSTRAINT 'U_StabilityStoneCoverWaveConditionsCalculationEntity' UNIQUE ('StabilityStoneCoverWaveConditionsCalculationEntityId')
+ 'OutputType' SMALLINT, -- 0 = column 1 = block
+ CONSTRAINT 'FK_StabilityStoneCoverWaveConditionsOutputEntity_StabilityStoneCoverWaveConditionsCalculationEntity' FOREIGN KEY ('StabilityStoneCoverWaveConditionsCalculationEntityId') REFERENCES 'StabilityStoneCoverWaveConditionsCalculationEntity' ('StabilityStoneCoverWaveConditionsCalculationEntityId') ON DELETE Cascade ON UPDATE Cascade
)
;
+CREATE TABLE 'GrassCoverErosionOutwardsHydraulicLocationEntity'
+(
+ 'GrassCoverErosionOutwardsHydraulicLocationEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+ 'FailureMechanismEntityId' INTEGER NOT NULL,
+ 'LocationId' INTEGER NOT NULL,
+ 'Name' VARCHAR (260) NOT NULL,
+ 'LocationX' REAL,
+ 'LocationY' REAL,
+ 'DesignWaterLevel' REAL,
+ 'WaveHeight' REAL,
+ 'DesignWaterLevelCalculationConvergence' TINYINT (1) NOT NULL, -- NotCalculated, CalculatedNotConverged or CalculatedConverged
+ 'WaveHeightCalculationConvergence' TINYINT (1) NOT NULL, -- NotCalculated, CalculatedNotConverged or CalculatedConverged
+ 'Order' INT (4) NOT NULL,
+ CONSTRAINT 'FK_GrassCoverErosionOutwardsHydraulicLocationEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE No Action ON UPDATE No Action
+)
+;
+
/* Create Indexes and Triggers */
CREATE INDEX 'IXFK_PipingFailureMechanismMetaEntity_FailureMechanismEntity'
@@ -893,3 +913,7 @@
CREATE INDEX 'IXFK_StabilityStoneCoverWaveConditionsOutputEntity_StabilityStoneCoverWaveConditionsCalculationEntity'
ON 'StabilityStoneCoverWaveConditionsOutputEntity' ('StabilityStoneCoverWaveConditionsCalculationEntityId' ASC)
;
+
+CREATE INDEX 'IXFK_GrassCoverErosionOutwardsHydraulicLocationEntity_FailureMechanismEntity'
+ ON 'GrassCoverErosionOutwardsHydraulicLocationEntity' ('FailureMechanismEntityId' ASC)
+;
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/FailureMechanismEntity.cs
===================================================================
diff -u -r8aaa7b9a8a2826cf8da31d0fd136f2d559933afe -r2651fdf110e56d0f48e416fcffc1b4922cff00a5
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/FailureMechanismEntity.cs (.../FailureMechanismEntity.cs) (revision 8aaa7b9a8a2826cf8da31d0fd136f2d559933afe)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/FailureMechanismEntity.cs (.../FailureMechanismEntity.cs) (revision 2651fdf110e56d0f48e416fcffc1b4922cff00a5)
@@ -43,6 +43,7 @@
this.ForeshoreProfileEntities = new HashSet();
this.GrassCoverErosionInwardsFailureMechanismMetaEntities = new HashSet();
this.GrassCoverErosionOutwardsFailureMechanismMetaEntities = new HashSet();
+ this.GrassCoverErosionOutwardsHydraulicLocationEntities = new HashSet();
this.PipingFailureMechanismMetaEntities = new HashSet();
this.StochasticSoilModelEntities = new HashSet();
this.SurfaceLineEntities = new HashSet();
@@ -68,6 +69,8 @@
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
public virtual ICollection GrassCoverErosionOutwardsFailureMechanismMetaEntities { get; set; }
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+ public virtual ICollection GrassCoverErosionOutwardsHydraulicLocationEntities { get; set; }
+ [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
public virtual ICollection PipingFailureMechanismMetaEntities { get; set; }
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
public virtual ICollection StochasticSoilModelEntities { get; set; }
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsHydraulicLocationEntity.cs
===================================================================
diff -u
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsHydraulicLocationEntity.cs (revision 0)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsHydraulicLocationEntity.cs (revision 2651fdf110e56d0f48e416fcffc1b4922cff00a5)
@@ -0,0 +1,52 @@
+// 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 GrassCoverErosionOutwardsHydraulicLocationEntity
+ {
+ public long GrassCoverErosionOutwardsHydraulicLocationEntityId { get; set; }
+ public long FailureMechanismEntityId { get; set; }
+ public long LocationId { get; set; }
+ public string Name { get; set; }
+ public Nullable LocationX { get; set; }
+ public Nullable LocationY { get; set; }
+ public Nullable DesignWaterLevel { get; set; }
+ public Nullable WaveHeight { get; set; }
+ public byte DesignWaterLevelCalculationConvergence { get; set; }
+ public byte WaveHeightCalculationConvergence { get; set; }
+ public int Order { get; set; }
+
+ public virtual FailureMechanismEntity FailureMechanismEntity { get; set; }
+ }
+}
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs
===================================================================
diff -u -rfa2d88ba58e524c1d132a21df4e0adf9fa6570c4 -r2651fdf110e56d0f48e416fcffc1b4922cff00a5
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs (.../RingtoetsEntities.Context.cs) (revision fa2d88ba58e524c1d132a21df4e0adf9fa6570c4)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs (.../RingtoetsEntities.Context.cs) (revision 2651fdf110e56d0f48e416fcffc1b4922cff00a5)
@@ -66,6 +66,7 @@
public virtual DbSet GrassCoverErosionInwardsOutputEntities { get; set; }
public virtual DbSet GrassCoverErosionInwardsSectionResultEntities { get; set; }
public virtual DbSet GrassCoverErosionOutwardsFailureMechanismMetaEntities { get; set; }
+ public virtual DbSet GrassCoverErosionOutwardsHydraulicLocationEntities { get; set; }
public virtual DbSet GrassCoverErosionOutwardsSectionResultEntities { get; set; }
public virtual DbSet GrassCoverSlipOffInwardsSectionResultEntities { get; set; }
public virtual DbSet GrassCoverSlipOffOutwardsSectionResultEntities { get; set; }
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs
===================================================================
diff -u -r217b6c069ac85aef817e5423cecb0b037edac668 -r2651fdf110e56d0f48e416fcffc1b4922cff00a5
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs (.../RingtoetsEntities.Designer.cs) (revision 217b6c069ac85aef817e5423cecb0b037edac668)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs (.../RingtoetsEntities.Designer.cs) (revision 2651fdf110e56d0f48e416fcffc1b4922cff00a5)
@@ -1,25 +1,4 @@
-// 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.
-
-// T4 code generation is enabled for model 'D:\repos\WettelijkToetsInstrumentarium\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 -rfa2d88ba58e524c1d132a21df4e0adf9fa6570c4 -r2651fdf110e56d0f48e416fcffc1b4922cff00a5
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision fa2d88ba58e524c1d132a21df4e0adf9fa6570c4)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 2651fdf110e56d0f48e416fcffc1b4922cff00a5)
@@ -4,14 +4,14 @@
-
+
-
+
@@ -178,6 +178,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -420,6 +436,7 @@
+
@@ -725,6 +742,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1124,6 +1153,7 @@
+
@@ -1225,6 +1255,10 @@
+
+
+
+
@@ -1373,6 +1407,7 @@
+
@@ -1470,6 +1505,10 @@
+
+
+
+
@@ -1608,8 +1647,8 @@
-
+
@@ -1708,6 +1747,7 @@
+
@@ -1831,6 +1871,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2104,6 +2161,7 @@
+
@@ -2411,6 +2469,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2824,8 +2894,8 @@
-
+
@@ -3000,6 +3070,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3254,6 +3341,7 @@
+
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram
===================================================================
diff -u -rfa2d88ba58e524c1d132a21df4e0adf9fa6570c4 -r2651fdf110e56d0f48e416fcffc1b4922cff00a5
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision fa2d88ba58e524c1d132a21df4e0adf9fa6570c4)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision 2651fdf110e56d0f48e416fcffc1b4922cff00a5)
@@ -5,49 +5,50 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
@@ -65,6 +66,7 @@
+
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityStoneCoverWaveConditionsOutputEntity.cs
===================================================================
diff -u -rfa2d88ba58e524c1d132a21df4e0adf9fa6570c4 -r2651fdf110e56d0f48e416fcffc1b4922cff00a5
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityStoneCoverWaveConditionsOutputEntity.cs (.../StabilityStoneCoverWaveConditionsOutputEntity.cs) (revision fa2d88ba58e524c1d132a21df4e0adf9fa6570c4)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityStoneCoverWaveConditionsOutputEntity.cs (.../StabilityStoneCoverWaveConditionsOutputEntity.cs) (revision 2651fdf110e56d0f48e416fcffc1b4922cff00a5)
@@ -41,6 +41,7 @@
public Nullable WaveHeight { get; set; }
public Nullable WavePeakPeriod { get; set; }
public Nullable WaveAngle { get; set; }
+ public Nullable OutputType { get; set; }
public virtual StabilityStoneCoverWaveConditionsCalculationEntity StabilityStoneCoverWaveConditionsCalculationEntity { get; set; }
}
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PersistenceRegistryTest.cs
===================================================================
diff -u -r0540405a7dbabf85dc02db30c79c3c58b0faeea6 -r2651fdf110e56d0f48e416fcffc1b4922cff00a5
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PersistenceRegistryTest.cs (.../PersistenceRegistryTest.cs) (revision 0540405a7dbabf85dc02db30c79c3c58b0faeea6)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PersistenceRegistryTest.cs (.../PersistenceRegistryTest.cs) (revision 2651fdf110e56d0f48e416fcffc1b4922cff00a5)
@@ -704,7 +704,7 @@
var registry = new PersistenceRegistry();
// Call
- TestDelegate test = () => registry.Get((HydraulicBoundaryLocation) null);
+ TestDelegate test = () => registry.Get(null);
// Assert
var paramName = Assert.Throws(test).ParamName;
@@ -721,7 +721,7 @@
registry.Register(entity, hydraulicBoundaryLocation);
// Call
- HydraulicLocationEntity result = registry.Get(hydraulicBoundaryLocation);
+ HydraulicLocationEntity result = registry.Get(hydraulicBoundaryLocation);
// Assert
Assert.AreSame(entity, result);
@@ -735,7 +735,7 @@
var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(5, "6", 7, 8);
// Call
- TestDelegate test = () => registry.Get(hydraulicBoundaryLocation);
+ TestDelegate test = () => registry.Get(hydraulicBoundaryLocation);
// Assert
Assert.Throws(test);
@@ -750,7 +750,7 @@
registry.Register(new HydraulicLocationEntity(), new HydraulicBoundaryLocation(1, "2", 3, 4));
// Call
- TestDelegate test = () => registry.Get(hydraulicBoundaryLocation);
+ TestDelegate test = () => registry.Get(hydraulicBoundaryLocation);
// Assert
Assert.Throws(test);
@@ -1245,7 +1245,7 @@
var registry = new PersistenceRegistry();
// Call
- TestDelegate test = () => registry.Register(null, new HydraulicBoundaryLocation(-1, "name", 0, 0));
+ TestDelegate test = () => registry.Register((HydraulicLocationEntity) null, new HydraulicBoundaryLocation(-1, "name", 0, 0));
// Assert
var paramName = Assert.Throws(test).ParamName;