Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj =================================================================== diff -u -re51296fb2257413d91bb35d40c3029333443068f -r284037154158ae94ae56e9f686d8b014d93f4f23 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision e51296fb2257413d91bb35d40c3029333443068f) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision 284037154158ae94ae56e9f686d8b014d93f4f23) @@ -109,12 +109,6 @@ RingtoetsEntities.tt - - RingtoetsEntities.tt - - - RingtoetsEntities.tt - RingtoetsEntities.tt Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql =================================================================== diff -u -re51296fb2257413d91bb35d40c3029333443068f -r284037154158ae94ae56e9f686d8b014d93f4f23 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision e51296fb2257413d91bb35d40c3029333443068f) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 284037154158ae94ae56e9f686d8b014d93f4f23) @@ -1,15 +1,15 @@ /* ---------------------------------------------------- */ /* Generated by Enterprise Architect Version 12.0 */ -/* Created On : 17-jun-2016 10:33:49 */ +/* Created On : 17-jun-2016 10:55:19 */ /* DBMS : SQLite */ /* ---------------------------------------------------- */ /* Drop Tables */ -DROP TABLE IF EXISTS 'PipingFailureMechanismMetaEntity' +DROP TABLE IF EXISTS 'VersionEntity' ; -DROP TABLE IF EXISTS 'VersionEntity' +DROP TABLE IF EXISTS 'PipingFailureMechanismMetaEntity' ; DROP TABLE IF EXISTS 'ProjectEntity' @@ -90,12 +90,6 @@ DROP TABLE IF EXISTS 'ClosingStructureSectionResultEntity' ; -DROP TABLE IF EXISTS 'GrassCoverSlipOffInwardsSectionResultEntity' -; - -DROP TABLE IF EXISTS 'GrassCoverSlipOffOutwardsSectionResultEntity' -; - DROP TABLE IF EXISTS 'MacrostabilityInwardsSectionResultEntity' ; @@ -107,15 +101,6 @@ /* Create Tables with Primary and Foreign Keys, Check and Unique Constraints */ -CREATE TABLE 'PipingFailureMechanismMetaEntity' -( - 'PipingFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, - 'FailureMechanismEntityId' INTEGER, - 'A' NUMERIC NOT NULL, - CONSTRAINT 'FK_PipingFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade -) -; - CREATE TABLE 'VersionEntity' ( 'VersionId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -125,6 +110,15 @@ ) ; +CREATE TABLE 'PipingFailureMechanismMetaEntity' +( + 'PipingFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + 'FailureMechanismEntityId' INTEGER, + 'A' NUMERIC NOT NULL, + CONSTRAINT 'FK_PipingFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade +) +; + CREATE TABLE 'ProjectEntity' ( 'ProjectEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -439,28 +433,6 @@ ) ; -CREATE TABLE 'GrassCoverSlipOffInwardsSectionResultEntity' -( - 'GrassCoverSlipOffInwardsSectionResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, - 'FailureMechanismSectionEntityId' INTEGER NOT NULL, - 'LayerOne' TINYINT (1) NOT NULL, -- true or false - 'LayerTwoA' NUMERIC, - 'LayerThree' NUMERIC, - CONSTRAINT 'FK_GrassCoverSlipOffInwardsSectionResultEntity_FailureMechanismSectionEntity' FOREIGN KEY ('FailureMechanismSectionEntityId') REFERENCES 'FailureMechanismSectionEntity' ('FailureMechanismSectionEntityId') ON DELETE Cascade ON UPDATE Cascade -) -; - -CREATE TABLE 'GrassCoverSlipOffOutwardsSectionResultEntity' -( - 'GrassCoverSlipOffOutwardsSectionResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, - 'FailureMechanismSectionEntityId' INTEGER NOT NULL, - 'LayerOne' TINYINT (1) NOT NULL, -- true or false - 'LayerTwoA' NUMERIC, - 'LayerThree' NUMERIC, - CONSTRAINT 'FK_GrassCoverSlipOffOutwardsSectionResultEntity_FailureMechanismSectionEntity' FOREIGN KEY ('FailureMechanismSectionEntityId') REFERENCES 'FailureMechanismSectionEntity' ('FailureMechanismSectionEntityId') ON DELETE Cascade ON UPDATE Cascade -) -; - CREATE TABLE 'MacrostabilityInwardsSectionResultEntity' ( 'MacrostabilityInwardsSectionResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -608,14 +580,6 @@ ON 'ClosingStructureSectionResultEntity' ('FailureMechanismSectionEntityId' ASC) ; -CREATE INDEX 'IXFK_GrassCoverSlipOffInwardsSectionResultEntity_FailureMechanismSectionEntity' - ON 'GrassCoverSlipOffInwardsSectionResultEntity' ('FailureMechanismSectionEntityId' ASC) -; - -CREATE INDEX 'IXFK_GrassCoverSlipOffOutwardsSectionResultEntity_FailureMechanismSectionEntity' - ON 'GrassCoverSlipOffOutwardsSectionResultEntity' ('FailureMechanismSectionEntityId' ASC) -; - CREATE INDEX 'IXFK_MacrostabilityInwardsSectionResultEntity_FailureMechanismSectionEntity' ON 'MacrostabilityInwardsSectionResultEntity' ('FailureMechanismSectionEntityId' ASC) ; Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/FailureMechanismSectionEntity.cs =================================================================== diff -u -re51296fb2257413d91bb35d40c3029333443068f -r284037154158ae94ae56e9f686d8b014d93f4f23 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/FailureMechanismSectionEntity.cs (.../FailureMechanismSectionEntity.cs) (revision e51296fb2257413d91bb35d40c3029333443068f) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/FailureMechanismSectionEntity.cs (.../FailureMechanismSectionEntity.cs) (revision 284037154158ae94ae56e9f686d8b014d93f4f23) @@ -41,8 +41,6 @@ this.ClosingStructureSectionResultEntities = new HashSet(); this.FailureMechanismSectionPointEntities = new HashSet(); this.GrassCoverErosionInwardsSectionResultEntities = new HashSet(); - this.GrassCoverSlipOffInwardsSectionResultEntities = new HashSet(); - this.GrassCoverSlipOffOutwardsSectionResultEntities = new HashSet(); this.HeightStructuresSectionResultEntities = new HashSet(); this.MacrostabilityInwardsSectionResultEntities = new HashSet(); this.MacrostabilityOutwardsSectionResultEntities = new HashSet(); @@ -65,10 +63,6 @@ [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection GrassCoverErosionInwardsSectionResultEntities { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection GrassCoverSlipOffInwardsSectionResultEntities { get; set; } - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection GrassCoverSlipOffOutwardsSectionResultEntities { get; set; } - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection HeightStructuresSectionResultEntities { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection MacrostabilityInwardsSectionResultEntities { get; set; } Fisheye: Tag 284037154158ae94ae56e9f686d8b014d93f4f23 refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverSlipOffInwardsSectionResultEntity.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 284037154158ae94ae56e9f686d8b014d93f4f23 refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverSlipOffOutwardsSectionResultEntity.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs =================================================================== diff -u -re51296fb2257413d91bb35d40c3029333443068f -r284037154158ae94ae56e9f686d8b014d93f4f23 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs (.../RingtoetsEntities.Context.cs) (revision e51296fb2257413d91bb35d40c3029333443068f) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs (.../RingtoetsEntities.Context.cs) (revision 284037154158ae94ae56e9f686d8b014d93f4f23) @@ -60,8 +60,6 @@ public virtual DbSet FailureMechanismSectionEntities { get; set; } public virtual DbSet FailureMechanismSectionPointEntities { get; set; } public virtual DbSet GrassCoverErosionInwardsSectionResultEntities { get; set; } - public virtual DbSet GrassCoverSlipOffInwardsSectionResultEntities { get; set; } - public virtual DbSet GrassCoverSlipOffOutwardsSectionResultEntities { get; set; } public virtual DbSet HeightStructuresSectionResultEntities { get; set; } public virtual DbSet HydraulicLocationEntities { get; set; } public virtual DbSet MacrostabilityInwardsSectionResultEntities { get; set; } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx =================================================================== diff -u -re51296fb2257413d91bb35d40c3029333443068f -r284037154158ae94ae56e9f686d8b014d93f4f23 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision e51296fb2257413d91bb35d40c3029333443068f) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 284037154158ae94ae56e9f686d8b014d93f4f23) @@ -84,26 +84,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -464,30 +444,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -785,8 +741,6 @@ - - @@ -846,14 +800,6 @@ - - - - - - - - @@ -964,8 +910,6 @@ - - @@ -1049,14 +993,6 @@ - - - - - - - - @@ -1209,8 +1145,6 @@ - - @@ -1241,28 +1175,6 @@ - - - - - - - - - - - - - - - - - - - - - - @@ -1731,30 +1643,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -2064,28 +1952,6 @@ - - - - - - - - - - - - - - - - - - - - - - Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram =================================================================== diff -u -re51296fb2257413d91bb35d40c3029333443068f -r284037154158ae94ae56e9f686d8b014d93f4f23 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision e51296fb2257413d91bb35d40c3029333443068f) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision 284037154158ae94ae56e9f686d8b014d93f4f23) @@ -5,39 +5,37 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + @@ -53,8 +51,6 @@ - -