Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql
===================================================================
diff -u -r0ff93a746c6441fbc64c0507914d0db00fea9623 -rcc3d0b350842ff7a7fd54f746525e1cc4e800a2e
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 0ff93a746c6441fbc64c0507914d0db00fea9623)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision cc3d0b350842ff7a7fd54f746525e1cc4e800a2e)
@@ -1,6 +1,6 @@
/* ---------------------------------------------------- */
/* Generated by Enterprise Architect Version 12.0 */
-/* Created On : 01-Nov-2016 11:06:06 AM */
+/* Created On : 01-Nov-2016 12:53:48 PM */
/* DBMS : SQLite */
/* ---------------------------------------------------- */
@@ -755,9 +755,11 @@
(
'StabilityPointStructuresSectionResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
'FailureMechanismSectionEntityId' INTEGER NOT NULL,
+ 'StabilityPointStructuresCalculationEntityId' INTEGER,
'LayerOne' TINYINT (1) NOT NULL,
'LayerThree' REAL,
- CONSTRAINT 'FK_StabilityPointStructuresSectionResultEntity_FailureMechanismSectionEntity' FOREIGN KEY ('FailureMechanismSectionEntityId') REFERENCES 'FailureMechanismSectionEntity' ('FailureMechanismSectionEntityId') ON DELETE Cascade ON UPDATE Cascade
+ CONSTRAINT 'FK_StabilityPointStructuresSectionResultEntity_FailureMechanismSectionEntity' FOREIGN KEY ('FailureMechanismSectionEntityId') REFERENCES 'FailureMechanismSectionEntity' ('FailureMechanismSectionEntityId') ON DELETE Cascade ON UPDATE Cascade,
+ CONSTRAINT 'FK_StabilityPointStructuresSectionResultEntity_StabilityPointStructuresCalculationEntity' FOREIGN KEY ('StabilityPointStructuresCalculationEntityId') REFERENCES 'StabilityPointStructuresCalculationEntity' ('StabilityPointStructuresCalculationEntityId') ON DELETE Set Null ON UPDATE Cascade
)
;
@@ -1408,6 +1410,10 @@
ON 'StabilityPointStructuresSectionResultEntity' ('FailureMechanismSectionEntityId' ASC)
;
+CREATE INDEX 'IXFK_StabilityPointStructuresSectionResultEntity_StabilityPointStructuresCalculationEntity'
+ ON 'StabilityPointStructuresSectionResultEntity' ('StabilityPointStructuresCalculationEntityId' ASC)
+;
+
CREATE INDEX 'IXFK_DikeProfileEntity_FailureMechanismEntity'
ON 'DikeProfileEntity' ('FailureMechanismEntityId' ASC)
;
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx
===================================================================
diff -u -r0ff93a746c6441fbc64c0507914d0db00fea9623 -rcc3d0b350842ff7a7fd54f746525e1cc4e800a2e
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 0ff93a746c6441fbc64c0507914d0db00fea9623)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision cc3d0b350842ff7a7fd54f746525e1cc4e800a2e)
@@ -769,6 +769,7 @@
+
@@ -1699,6 +1700,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2232,6 +2245,10 @@
+
+
+
+
@@ -2557,7 +2574,7 @@
-
+
@@ -2685,6 +2702,10 @@
+
+
+
+
@@ -2955,7 +2976,7 @@
-
+
@@ -3573,6 +3594,7 @@
+
@@ -3602,9 +3624,11 @@
+
-
+
+
@@ -4351,7 +4375,7 @@
-
+
@@ -4735,6 +4759,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -5586,6 +5622,7 @@
+
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram
===================================================================
diff -u -r0ff93a746c6441fbc64c0507914d0db00fea9623 -rcc3d0b350842ff7a7fd54f746525e1cc4e800a2e
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision 0ff93a746c6441fbc64c0507914d0db00fea9623)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision cc3d0b350842ff7a7fd54f746525e1cc4e800a2e)
@@ -4,7 +4,7 @@
-
+
<<<<<<< .mine
@@ -126,66 +126,67 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -233,7 +234,7 @@
-
+
@@ -265,6 +266,7 @@
+
@@ -1771,6 +1773,147 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
=======
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructuresCalculationEntity.cs
===================================================================
diff -u -r0ff93a746c6441fbc64c0507914d0db00fea9623 -rcc3d0b350842ff7a7fd54f746525e1cc4e800a2e
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructuresCalculationEntity.cs (.../StabilityPointStructuresCalculationEntity.cs) (revision 0ff93a746c6441fbc64c0507914d0db00fea9623)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructuresCalculationEntity.cs (.../StabilityPointStructuresCalculationEntity.cs) (revision cc3d0b350842ff7a7fd54f746525e1cc4e800a2e)
@@ -39,6 +39,7 @@
public StabilityPointStructuresCalculationEntity()
{
this.StabilityPointStructuresOutputEntities = new HashSet();
+ this.StabilityPointStructuresSectionResultEntities = new HashSet();
}
public long StabilityPointStructuresCalculationEntityId { get; set; }
@@ -112,5 +113,7 @@
public virtual StabilityPointStructureEntity StabilityPointStructureEntity { get; set; }
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
public virtual ICollection StabilityPointStructuresOutputEntities { get; set; }
+ [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+ public virtual ICollection StabilityPointStructuresSectionResultEntities { get; set; }
}
}
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructuresSectionResultEntity.cs
===================================================================
diff -u -r481507356af9b0ed7ed0de2493275a6f8c2f47ea -rcc3d0b350842ff7a7fd54f746525e1cc4e800a2e
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructuresSectionResultEntity.cs (.../StabilityPointStructuresSectionResultEntity.cs) (revision 481507356af9b0ed7ed0de2493275a6f8c2f47ea)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructuresSectionResultEntity.cs (.../StabilityPointStructuresSectionResultEntity.cs) (revision cc3d0b350842ff7a7fd54f746525e1cc4e800a2e)
@@ -37,9 +37,11 @@
{
public long StabilityPointStructuresSectionResultEntityId { get; set; }
public long FailureMechanismSectionEntityId { get; set; }
+ public Nullable StabilityPointStructuresCalculationEntityId { get; set; }
public byte LayerOne { get; set; }
public Nullable LayerThree { get; set; }
public virtual FailureMechanismSectionEntity FailureMechanismSectionEntity { get; set; }
+ public virtual StabilityPointStructuresCalculationEntity StabilityPointStructuresCalculationEntity { get; set; }
}
}