Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql =================================================================== diff -u -r86e3c1e3b6568eea578004f3d9d93114cdb351b8 -r24cf947dc2fc0c56fb917b989bc4ad2ccb27bcae --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 86e3c1e3b6568eea578004f3d9d93114cdb351b8) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 24cf947dc2fc0c56fb917b989bc4ad2ccb27bcae) @@ -1,6 +1,6 @@ /* ---------------------------------------------------- */ /* Generated by Enterprise Architect Version 12.0 */ -/* Created On : 18-mei-2016 9:09:40 */ +/* Created On : 18-mei-2016 13:30:01 */ /* DBMS : SQLite */ /* ---------------------------------------------------- */ @@ -179,6 +179,20 @@ 'SurfaceLineEntityId' INTEGER NOT NULL PRIMARY KEY, 'FailureMechanismEntityId' INTEGER NOT NULL, 'Name' VARCHAR (255) NOT NULL, + 'ReferenceLineIntersectionX' NUMERIC NOT NULL, + 'ReferenceLineIntersectionY' NUMERIC NOT NULL, + 'DitchPolderSidePointEntityId' INTEGER, + 'BottomDitchPolderSidePointEntityId' INTEGER, + 'BottomDitchDikeSidePointEntityId' INTEGER, + 'DitchDikeSidePointEntityId' INTEGER, + 'DikeToeAtRiverEntityId' INTEGER, + 'DikeToeAtPolderEntityId' INTEGER, + CONSTRAINT 'FK_BottomDitchDikeSidePointEntity_SurfaceLinePointEntity' FOREIGN KEY ('BottomDitchDikeSidePointEntityId') REFERENCES 'SurfaceLinePointEntity' ('SurfaceLinePointEntityId') ON DELETE No Action ON UPDATE No Action, + CONSTRAINT 'FK_BottomDitchPolderSidePointEntity_SurfaceLinePointEntity' FOREIGN KEY ('BottomDitchPolderSidePointEntityId') REFERENCES 'SurfaceLinePointEntity' ('SurfaceLinePointEntityId') ON DELETE No Action ON UPDATE No Action, + CONSTRAINT 'FK_DikeToeAtPolderPointEntity_SurfaceLinePointEntity' FOREIGN KEY ('DikeToeAtPolderEntityId') REFERENCES 'SurfaceLinePointEntity' ('SurfaceLinePointEntityId') ON DELETE No Action ON UPDATE No Action, + CONSTRAINT 'FK_DikeToeAtRiverPointEntity_SurfaceLinePointEntity' FOREIGN KEY ('DikeToeAtRiverEntityId') REFERENCES 'SurfaceLinePointEntity' ('SurfaceLinePointEntityId') ON DELETE No Action ON UPDATE No Action, + CONSTRAINT 'FK_DitchDikeSidePointEntity_SurfaceLinePointEntity' FOREIGN KEY ('DitchDikeSidePointEntityId') REFERENCES 'SurfaceLinePointEntity' ('SurfaceLinePointEntityId') ON DELETE No Action ON UPDATE No Action, + CONSTRAINT 'FK_DitchPolderSidePointEntity_SurfaceLinePointEntity' FOREIGN KEY ('DitchPolderSidePointEntityId') REFERENCES 'SurfaceLinePointEntity' ('SurfaceLinePointEntityId') ON DELETE No Action ON UPDATE No Action, CONSTRAINT 'FK_SurfaceLineEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE No Action ON UPDATE No Action ) ; @@ -190,6 +204,7 @@ 'X' NUMERIC NOT NULL, 'Y' NUMERIC NOT NULL, 'Order' INT (4) NOT NULL, + 'Z' NUMERIC NOT NULL, CONSTRAINT 'FK_SurfaceLinePointEntity_SurfaceLineEntity' FOREIGN KEY ('SurfaceLineEntityId') REFERENCES 'SurfaceLineEntity' ('SurfaceLineEntityId') ON DELETE No Action ON UPDATE No Action ) ; @@ -236,6 +251,30 @@ ON 'SurfaceLineEntity' ('FailureMechanismEntityId' ASC) ; +CREATE INDEX 'IXFK_SurfaceLineEntity_SurfaceLinePointEntity' + ON 'SurfaceLineEntity' ('DitchPolderSidePointEntityId' ASC) +; + +CREATE INDEX 'IXFK_SurfaceLineEntity_SurfaceLinePointEntity_02' + ON 'SurfaceLineEntity' ('BottomDitchPolderSidePointEntityId' ASC) +; + +CREATE INDEX 'IXFK_SurfaceLineEntity_SurfaceLinePointEntity_03' + ON 'SurfaceLineEntity' ('BottomDitchDikeSidePointEntityId' ASC) +; + +CREATE INDEX 'IXFK_SurfaceLineEntity_SurfaceLinePointEntity_04' + ON 'SurfaceLineEntity' ('DitchDikeSidePointEntityId' ASC) +; + +CREATE INDEX 'IXFK_SurfaceLineEntity_SurfaceLinePointEntity_05' + ON 'SurfaceLineEntity' ('DikeToeAtRiverEntityId' ASC) +; + +CREATE INDEX 'IXFK_SurfaceLineEntity_SurfaceLinePointEntity_06' + ON 'SurfaceLineEntity' ('DikeToeAtPolderEntityId' ASC) +; + CREATE INDEX 'IXFK_SurfaceLinePointEntity_SurfaceLineEntity' ON 'SurfaceLinePointEntity' ('SurfaceLineEntityId' ASC) ; Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs =================================================================== diff -u -r86e3c1e3b6568eea578004f3d9d93114cdb351b8 -r24cf947dc2fc0c56fb917b989bc4ad2ccb27bcae --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs (.../RingtoetsEntities.Designer.cs) (revision 86e3c1e3b6568eea578004f3d9d93114cdb351b8) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs (.../RingtoetsEntities.Designer.cs) (revision 24cf947dc2fc0c56fb917b989bc4ad2ccb27bcae) @@ -1,4 +1,4 @@ -// T4 code generation is enabled for model 'D:\Clean_WTI2017\Application\Ringtoets\src\Application.Ringtoets.Storage\DbContext\RingtoetsEntities.edmx'. +// T4 code generation is enabled for model 'D:\Branch_WTI2017\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 -r86e3c1e3b6568eea578004f3d9d93114cdb351b8 -r24cf947dc2fc0c56fb917b989bc4ad2ccb27bcae --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 86e3c1e3b6568eea578004f3d9d93114cdb351b8) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 24cf947dc2fc0c56fb917b989bc4ad2ccb27bcae) @@ -4,7 +4,7 @@ - + @@ -116,6 +116,14 @@ + + + + + + + + @@ -126,6 +134,7 @@ + @@ -268,6 +277,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -339,6 +420,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -407,6 +512,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -544,7 +673,21 @@ + + + + + + + + + + + + + + @@ -556,6 +699,13 @@ + + + + + + + @@ -699,6 +849,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -835,6 +1057,14 @@ + + + + + + + + @@ -844,6 +1074,7 @@ + Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram =================================================================== diff -u -r86e3c1e3b6568eea578004f3d9d93114cdb351b8 -r24cf947dc2fc0c56fb917b989bc4ad2ccb27bcae --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision 86e3c1e3b6568eea578004f3d9d93114cdb351b8) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision 24cf947dc2fc0c56fb917b989bc4ad2ccb27bcae) @@ -5,19 +5,19 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -30,6 +30,12 @@ + + + + + + Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/SurfaceLineEntity.cs =================================================================== diff -u -r86e3c1e3b6568eea578004f3d9d93114cdb351b8 -r24cf947dc2fc0c56fb917b989bc4ad2ccb27bcae --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/SurfaceLineEntity.cs (.../SurfaceLineEntity.cs) (revision 86e3c1e3b6568eea578004f3d9d93114cdb351b8) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/SurfaceLineEntity.cs (.../SurfaceLineEntity.cs) (revision 24cf947dc2fc0c56fb917b989bc4ad2ccb27bcae) @@ -44,8 +44,22 @@ public long SurfaceLineEntityId { get; set; } public long FailureMechanismEntityId { get; set; } public string Name { get; set; } + public decimal ReferenceLineIntersectionX { get; set; } + public decimal ReferenceLineIntersectionY { get; set; } + public Nullable DitchPolderSidePointEntityId { get; set; } + public Nullable BottomDitchPolderSidePointEntityId { get; set; } + public Nullable BottomDitchDikeSidePointEntityId { get; set; } + public Nullable DitchDikeSidePointEntityId { get; set; } + public Nullable DikeToeAtRiverEntityId { get; set; } + public Nullable DikeToeAtPolderEntityId { get; set; } public virtual FailureMechanismEntity FailureMechanismEntity { get; set; } + public virtual SurfaceLinePointEntity DitchPolderSidePointEntity { get; set; } + public virtual SurfaceLinePointEntity DitchDikeSidePointEntity { get; set; } + public virtual SurfaceLinePointEntity DikeToeAtRiverPointEntity { get; set; } + public virtual SurfaceLinePointEntity DikeToeAtPolderPointEntity { get; set; } + public virtual SurfaceLinePointEntity BottomDitchPolderSidePointEntity { get; set; } + public virtual SurfaceLinePointEntity BottomDitchDikeSidePointEntity { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection SurfaceLinePointEntities { get; set; } } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/SurfaceLinePointEntity.cs =================================================================== diff -u -r86e3c1e3b6568eea578004f3d9d93114cdb351b8 -r24cf947dc2fc0c56fb917b989bc4ad2ccb27bcae --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/SurfaceLinePointEntity.cs (.../SurfaceLinePointEntity.cs) (revision 86e3c1e3b6568eea578004f3d9d93114cdb351b8) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/SurfaceLinePointEntity.cs (.../SurfaceLinePointEntity.cs) (revision 24cf947dc2fc0c56fb917b989bc4ad2ccb27bcae) @@ -35,12 +35,36 @@ public partial class SurfaceLinePointEntity { + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + public SurfaceLinePointEntity() + { + this.DitchPolderSidePointParentEntity = new HashSet(); + this.DitchDikeSidePointParentEntity = new HashSet(); + this.DikeToeAtRiverPointParentEntity = new HashSet(); + this.DikeToeAtPolderPointParentEntity = new HashSet(); + this.BottomDitchPolderSidePointParentEntity = new HashSet(); + this.BottomDitchDikeSidePointParentEntity = new HashSet(); + } + public long SurfaceLinePointEntityId { get; set; } public long SurfaceLineEntityId { get; set; } public decimal X { get; set; } public decimal Y { get; set; } public int Order { get; set; } + public decimal Z { get; set; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection DitchPolderSidePointParentEntity { get; set; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection DitchDikeSidePointParentEntity { get; set; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection DikeToeAtRiverPointParentEntity { get; set; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection DikeToeAtPolderPointParentEntity { get; set; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection BottomDitchPolderSidePointParentEntity { get; set; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection BottomDitchDikeSidePointParentEntity { get; set; } public virtual SurfaceLineEntity SurfaceLineEntity { get; set; } } }