Index: Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql =================================================================== diff -u -r36d4b4090a4169cc8d25ede0029a3244df8fe74d -r899d227631395ebeb5154719f7b92a42ddbc6f96 --- Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql (.../DatabaseStructure18.1.sql) (revision 36d4b4090a4169cc8d25ede0029a3244df8fe74d) +++ Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql (.../DatabaseStructure18.1.sql) (revision 899d227631395ebeb5154719f7b92a42ddbc6f96) @@ -1,6 +1,6 @@ /* ---------------------------------------------------- */ /* Generated by Enterprise Architect Version 12.0 */ -/* Created On : 26-jan-2018 15:38:38 */ +/* Created On : 29-jan-2018 11:07:03 */ /* DBMS : SQLite */ /* ---------------------------------------------------- */ @@ -90,6 +90,9 @@ DROP TABLE IF EXISTS 'PipingCalculationOutputEntity' ; +DROP TABLE IF EXISTS 'PipingStructureFailureMechanismMetaEntity' +; + DROP TABLE IF EXISTS 'PipingSemiProbabilisticOutputEntity' ; @@ -126,10 +129,10 @@ DROP TABLE IF EXISTS 'MacroStabilityInwardsSectionResultEntity' ; -DROP TABLE IF EXISTS 'MacroStabilityOutwardsSectionResultEntity' +DROP TABLE IF EXISTS 'WaveImpactAsphaltCoverFailureMechanismMetaEntity' ; -DROP TABLE IF EXISTS 'WaveImpactAsphaltCoverFailureMechanismMetaEntity' +DROP TABLE IF EXISTS 'MacroStabilityOutwardsSectionResultEntity' ; DROP TABLE IF EXISTS 'WaveImpactAsphaltCoverSectionResultEntity' @@ -737,6 +740,15 @@ ) ; +CREATE TABLE 'PipingStructureFailureMechanismMetaEntity' +( + 'PipingStructureFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + 'FailureMechanismEntityId' INTEGER NOT NULL, + 'N' REAL NOT NULL, + CONSTRAINT 'FK_PipingStructureFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade +) +; + CREATE TABLE 'PipingSemiProbabilisticOutputEntity' ( 'PipingSemiProbabilisticOutputEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -880,6 +892,15 @@ ) ; +CREATE TABLE 'WaveImpactAsphaltCoverFailureMechanismMetaEntity' +( + 'WaveImpactAsphaltCoverFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + 'FailureMechanismEntityId' INTEGER NOT NULL, + 'ForeshoreProfileCollectionSourcePath' TEXT, + CONSTRAINT 'FK_WaveImpactAsphaltCoverFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade +) +; + CREATE TABLE 'MacroStabilityOutwardsSectionResultEntity' ( 'MacroStabilityOutwardsSectionResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -891,15 +912,6 @@ ) ; -CREATE TABLE 'WaveImpactAsphaltCoverFailureMechanismMetaEntity' -( - 'WaveImpactAsphaltCoverFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, - 'FailureMechanismEntityId' INTEGER NOT NULL, - 'ForeshoreProfileCollectionSourcePath' TEXT, - CONSTRAINT 'FK_WaveImpactAsphaltCoverFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade -) -; - CREATE TABLE 'WaveImpactAsphaltCoverSectionResultEntity' ( 'WaveImpactAsphaltCoverSectionResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -2106,6 +2118,10 @@ ON 'PipingCalculationOutputEntity' ('PipingCalculationEntityId' ASC) ; +CREATE INDEX 'IXFK_PipingStructureFailureMechanismMetaEntity_FailureMechanismEntity' + ON 'PipingStructureFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC) +; + CREATE INDEX 'IXFK_PipingSemiProbabilisticOutputEntity_PipingCalculationEntity' ON 'PipingSemiProbabilisticOutputEntity' ('PipingCalculationEntityId' ASC) ; @@ -2166,14 +2182,14 @@ ON 'MacroStabilityInwardsSectionResultEntity' ('FailureMechanismSectionEntityId' ASC) ; -CREATE INDEX 'IXFK_MacroStabilityOutwardsSectionResultEntity_FailureMechanismSectionEntity' - ON 'MacroStabilityOutwardsSectionResultEntity' ('FailureMechanismSectionEntityId' ASC) -; - CREATE INDEX 'IXFK_WaveImpactAsphaltCoverFailureMechanismMetaEntity_FailureMechanismEntity' ON 'WaveImpactAsphaltCoverFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC) ; +CREATE INDEX 'IXFK_MacroStabilityOutwardsSectionResultEntity_FailureMechanismSectionEntity' + ON 'MacroStabilityOutwardsSectionResultEntity' ('FailureMechanismSectionEntityId' ASC) +; + CREATE INDEX 'IXFK_WaveImpactAsphaltCoverSectionResultEntity_FailureMechanismSectionEntity' ON 'WaveImpactAsphaltCoverSectionResultEntity' ('FailureMechanismSectionEntityId' ASC) ; Index: Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_17.3_18.1.sql =================================================================== diff -u -r36d4b4090a4169cc8d25ede0029a3244df8fe74d -r899d227631395ebeb5154719f7b92a42ddbc6f96 --- Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_17.3_18.1.sql (.../Migration_17.3_18.1.sql) (revision 36d4b4090a4169cc8d25ede0029a3244df8fe74d) +++ Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_17.3_18.1.sql (.../Migration_17.3_18.1.sql) (revision 899d227631395ebeb5154719f7b92a42ddbc6f96) @@ -196,7 +196,14 @@ [A]) SELECT FailureMechanismEntityId, 0.033 - FROM FailureMechanismEntity WHERE FailureMechanismType = 13; +FROM FailureMechanismEntity WHERE FailureMechanismType = 13; + +INSERT INTO PipingStructureFailureMechanismMetaEntity ( + [FailureMechanismEntityId], + [N]) +SELECT FailureMechanismEntityId, + 1.0 +FROM FailureMechanismEntity WHERE FailureMechanismType = 11; /* Write migration logging Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj =================================================================== diff -u -r36d4b4090a4169cc8d25ede0029a3244df8fe74d -r899d227631395ebeb5154719f7b92a42ddbc6f96 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision 36d4b4090a4169cc8d25ede0029a3244df8fe74d) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision 899d227631395ebeb5154719f7b92a42ddbc6f96) @@ -289,6 +289,9 @@ RingtoetsEntities.tt + + RingtoetsEntities.tt + RingtoetsEntities.tt @@ -492,7 +495,7 @@ - + Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PipingStructure/PipingStructureFailureMechanismCreateExtensions.cs =================================================================== diff -u -r3fb0df0ed6e64657154700ee7706e035d5bf99f5 -r899d227631395ebeb5154719f7b92a42ddbc6f96 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PipingStructure/PipingStructureFailureMechanismCreateExtensions.cs (.../PipingStructureFailureMechanismCreateExtensions.cs) (revision 3fb0df0ed6e64657154700ee7706e035d5bf99f5) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PipingStructure/PipingStructureFailureMechanismCreateExtensions.cs (.../PipingStructureFailureMechanismCreateExtensions.cs) (revision 899d227631395ebeb5154719f7b92a42ddbc6f96) @@ -43,7 +43,7 @@ { FailureMechanismEntity entity = mechanism.Create(FailureMechanismType.PipingAtStructure, registry); AddEntitiesForSectionResults(mechanism.SectionResults, registry); - + AddEntitiesForFailureMechanismMeta(mechanism, entity); return entity; } @@ -58,5 +58,16 @@ section.PipingStructureSectionResultEntities.Add(sectionResultEntity); } } + + private static void AddEntitiesForFailureMechanismMeta(PipingStructureFailureMechanism failureMechanism, + FailureMechanismEntity entity) + { + var metaEntity = new PipingStructureFailureMechanismMetaEntity + { + N = failureMechanism.N + }; + + entity.PipingStructureFailureMechanismMetaEntities.Add(metaEntity); + } } } \ No newline at end of file Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/FailureMechanismEntity.cs =================================================================== diff -u -r36d4b4090a4169cc8d25ede0029a3244df8fe74d -r899d227631395ebeb5154719f7b92a42ddbc6f96 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/FailureMechanismEntity.cs (.../FailureMechanismEntity.cs) (revision 36d4b4090a4169cc8d25ede0029a3244df8fe74d) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/FailureMechanismEntity.cs (.../FailureMechanismEntity.cs) (revision 899d227631395ebeb5154719f7b92a42ddbc6f96) @@ -53,6 +53,7 @@ MacroStabilityInwardsFailureMechanismMetaEntities = new HashSet(); MacroStabilityOutwardsFailureMechanismMetaEntities = new HashSet(); PipingFailureMechanismMetaEntities = new HashSet(); + PipingStructureFailureMechanismMetaEntities = new HashSet(); StabilityPointStructureEntities = new HashSet(); StabilityPointStructuresFailureMechanismMetaEntities = new HashSet(); StabilityStoneCoverFailureMechanismMetaEntities = new HashSet(); @@ -119,6 +120,9 @@ public virtual ICollection PipingFailureMechanismMetaEntities { get; set; } [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection PipingStructureFailureMechanismMetaEntities { get; set; } + + [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection StabilityPointStructureEntities { get; set; } [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PartialRingtoetsEntities.cs =================================================================== diff -u -r36d4b4090a4169cc8d25ede0029a3244df8fe74d -r899d227631395ebeb5154719f7b92a42ddbc6f96 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PartialRingtoetsEntities.cs (.../PartialRingtoetsEntities.cs) (revision 36d4b4090a4169cc8d25ede0029a3244df8fe74d) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PartialRingtoetsEntities.cs (.../PartialRingtoetsEntities.cs) (revision 899d227631395ebeb5154719f7b92a42ddbc6f96) @@ -108,6 +108,7 @@ PipingSemiProbabilisticOutputEntities.Load(); PipingSoilLayerEntities.Load(); PipingSoilProfileEntities.Load(); + PipingStructureFailureMechanismMetaEntities.Load(); PipingStructureSectionResultEntities.Load(); PipingStochasticSoilProfileEntities.Load(); StabilityPointStructureEntities.Load(); Fisheye: Tag 37652d7a208ab210033b48025d8d768d409086a8 refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingStructureFailureMechanismMetaEntity.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs =================================================================== diff -u -r36d4b4090a4169cc8d25ede0029a3244df8fe74d -r899d227631395ebeb5154719f7b92a42ddbc6f96 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs (.../RingtoetsEntities.Context.cs) (revision 36d4b4090a4169cc8d25ede0029a3244df8fe74d) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs (.../RingtoetsEntities.Context.cs) (revision 899d227631395ebeb5154719f7b92a42ddbc6f96) @@ -35,7 +35,6 @@ { public partial class RingtoetsEntities : System.Data.Entity.DbContext { - public virtual DbSet MacroStabilityOutwardsSectionResultEntities { get; set; } public virtual DbSet AssessmentSectionEntities { get; set; } public virtual DbSet BackgroundDataEntities { get; set; } public virtual DbSet BackgroundDataMetaEntities { get; set; } @@ -92,6 +91,7 @@ public virtual DbSet MacroStabilityInwardsSoilProfileTwoDEntities { get; set; } public virtual DbSet MacroStabilityInwardsStochasticSoilProfileEntities { get; set; } public virtual DbSet MacroStabilityOutwardsFailureMechanismMetaEntities { get; set; } + public virtual DbSet MacroStabilityOutwardsSectionResultEntities { get; set; } public virtual DbSet MicrostabilitySectionResultEntities { get; set; } public virtual DbSet PipingCalculationEntities { get; set; } public virtual DbSet PipingCalculationOutputEntities { get; set; } @@ -102,6 +102,7 @@ public virtual DbSet PipingSoilLayerEntities { get; set; } public virtual DbSet PipingSoilProfileEntities { get; set; } public virtual DbSet PipingStochasticSoilProfileEntities { get; set; } + public virtual DbSet PipingStructureFailureMechanismMetaEntities { get; set; } public virtual DbSet PipingStructureSectionResultEntities { get; set; } public virtual DbSet ProjectEntities { get; set; } public virtual DbSet StabilityPointStructureEntities { get; set; } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx =================================================================== diff -u -r36d4b4090a4169cc8d25ede0029a3244df8fe74d -r899d227631395ebeb5154719f7b92a42ddbc6f96 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 36d4b4090a4169cc8d25ede0029a3244df8fe74d) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 899d227631395ebeb5154719f7b92a42ddbc6f96) @@ -1096,6 +1096,14 @@ + + + + + + + + @@ -2726,6 +2734,18 @@ + + + + + + + + + + + + @@ -3195,6 +3215,7 @@ + @@ -3629,6 +3650,10 @@ + + + + @@ -3767,7 +3792,6 @@ - @@ -3824,6 +3848,7 @@ + @@ -3834,6 +3859,7 @@ + @@ -4028,6 +4054,10 @@ + + + + @@ -4380,18 +4410,7 @@ - - - - - - - - - - - - + @@ -4694,6 +4713,7 @@ + @@ -5479,6 +5499,17 @@ + + + + + + + + + + + @@ -5640,6 +5671,15 @@ + + + + + + + + + @@ -6602,6 +6642,18 @@ + + + + + + + + + + + + @@ -7624,17 +7676,6 @@ - - - - - - - - - - - @@ -8589,6 +8630,17 @@ + + + + + + + + + + + @@ -8742,6 +8794,15 @@ + + + + + + + + + @@ -9214,7 +9275,7 @@ - + Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram =================================================================== diff -u -r36d4b4090a4169cc8d25ede0029a3244df8fe74d -r899d227631395ebeb5154719f7b92a42ddbc6f96 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision 36d4b4090a4169cc8d25ede0029a3244df8fe74d) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision 899d227631395ebeb5154719f7b92a42ddbc6f96) @@ -4,101 +4,101 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - + + + + + @@ -141,6 +141,7 @@ + @@ -153,6 +154,7 @@ + @@ -228,7 +230,7 @@ - + \ No newline at end of file Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs =================================================================== diff -u -r36d4b4090a4169cc8d25ede0029a3244df8fe74d -r899d227631395ebeb5154719f7b92a42ddbc6f96 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs (.../FailureMechanismEntityReadExtensions.cs) (revision 36d4b4090a4169cc8d25ede0029a3244df8fe74d) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs (.../FailureMechanismEntityReadExtensions.cs) (revision 899d227631395ebeb5154719f7b92a42ddbc6f96) @@ -35,6 +35,7 @@ using Application.Ringtoets.Storage.Read.StabilityPointStructures; using Application.Ringtoets.Storage.Read.StabilityStoneCover; using Application.Ringtoets.Storage.Read.WaveImpactAsphaltCover; +using Core.Common.Base.Data; using Ringtoets.ClosingStructures.Data; using Ringtoets.Common.Data; using Ringtoets.Common.Data.Calculation; @@ -590,10 +591,26 @@ /// The to create for. /// The target of the read operation. /// The object keeping track of read operations. + /// Thrown when any input parameter is null. internal static void ReadAsMacroStabilityOutwardsFailureMechanism(this FailureMechanismEntity entity, MacroStabilityOutwardsFailureMechanism failureMechanism, ReadConversionCollector collector) { + if (entity == null) + { + throw new ArgumentNullException(nameof(entity)); + } + + if (failureMechanism == null) + { + throw new ArgumentNullException(nameof(failureMechanism)); + } + + if (collector == null) + { + throw new ArgumentNullException(nameof(collector)); + } + entity.ReadCommonFailureMechanismProperties(failureMechanism, collector); entity.ReadMacroStabilityOutwardsMechanismSectionResults(failureMechanism, collector); MacroStabilityOutwardsFailureMechanismMetaEntity metaEntity = entity.MacroStabilityOutwardsFailureMechanismMetaEntities.Single(); @@ -835,12 +852,30 @@ /// The to create for. /// The target of the read operation. /// The object keeping track of read operations. + /// Thrown when any input parameter is null. internal static void ReadAsPipingStructureFailureMechanism(this FailureMechanismEntity entity, PipingStructureFailureMechanism failureMechanism, ReadConversionCollector collector) { + if (entity == null) + { + throw new ArgumentNullException(nameof(entity)); + } + + if (failureMechanism == null) + { + throw new ArgumentNullException(nameof(failureMechanism)); + } + + if (collector == null) + { + throw new ArgumentNullException(nameof(collector)); + } + entity.ReadCommonFailureMechanismProperties(failureMechanism, collector); entity.ReadPipingStructureMechanismSectionResults(failureMechanism, collector); + + failureMechanism.N = (RoundedDouble) entity.PipingStructureFailureMechanismMetaEntities.Single().N; } private static void ReadPipingStructureMechanismSectionResults(this FailureMechanismEntity entity, Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/PipingStructure/PipingStructureSectionResultEntityReadExtensions.cs =================================================================== diff -u --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/PipingStructure/PipingStructureSectionResultEntityReadExtensions.cs (revision 0) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/PipingStructure/PipingStructureSectionResultEntityReadExtensions.cs (revision 899d227631395ebeb5154719f7b92a42ddbc6f96) @@ -0,0 +1,56 @@ +// Copyright (C) Stichting Deltares 2017. 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. + +using System; +using Application.Ringtoets.Storage.DbContext; +using Core.Common.Base.Data; +using Ringtoets.Common.Data.FailureMechanism; +using Ringtoets.Integration.Data.StandAlone.SectionResults; + +namespace Application.Ringtoets.Storage.Read.PipingStructures +{ + /// + /// This class defines extension methods for read operations for a based on the + /// . + /// + internal static class PipingStructureSectionResultEntityReadExtensions + { + /// + /// Reads the and use the information to update a + /// . + /// + /// The to create for. + /// The target of the read operation. + /// A new . + /// Thrown when is null. + internal static void Read(this PipingStructureSectionResultEntity entity, PipingStructureFailureMechanismSectionResult sectionResult) + { + if (sectionResult == null) + { + throw new ArgumentNullException(nameof(sectionResult)); + } + + sectionResult.AssessmentLayerOne = (AssessmentLayerOneState) entity.LayerOne; + sectionResult.AssessmentLayerTwoA = (AssessmentLayerTwoAResult) entity.LayerTwoA; + sectionResult.AssessmentLayerThree = (RoundedDouble) entity.LayerThree.ToNullAsNaN(); + } + } +} \ No newline at end of file Fisheye: Tag 899d227631395ebeb5154719f7b92a42ddbc6f96 refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/Read/PipingStructures/PipingStructureSectionResultEntityReadExtensions.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Ringtoets.rtd =================================================================== diff -u -r36d4b4090a4169cc8d25ede0029a3244df8fe74d -r899d227631395ebeb5154719f7b92a42ddbc6f96 Binary files differ Index: Application/Ringtoets/test/Application.Ringtoets.Migration.Core.Test/test-data/FullTestProject181.rtd =================================================================== diff -u -r36d4b4090a4169cc8d25ede0029a3244df8fe74d -r899d227631395ebeb5154719f7b92a42ddbc6f96 Binary files differ Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PipingStructure/PipingStructureFailureMechanismCreateExtensionsTest.cs =================================================================== diff -u -rfe90a6d174a01975381e6cda55ed1f7f4e831a51 -r899d227631395ebeb5154719f7b92a42ddbc6f96 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PipingStructure/PipingStructureFailureMechanismCreateExtensionsTest.cs (.../PipingStructureFailureMechanismCreateExtensionsTest.cs) (revision fe90a6d174a01975381e6cda55ed1f7f4e831a51) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PipingStructure/PipingStructureFailureMechanismCreateExtensionsTest.cs (.../PipingStructureFailureMechanismCreateExtensionsTest.cs) (revision 899d227631395ebeb5154719f7b92a42ddbc6f96) @@ -25,6 +25,7 @@ using Application.Ringtoets.Storage.Create.PipingStructure; using Application.Ringtoets.Storage.DbContext; using Application.Ringtoets.Storage.TestUtil; +using Core.Common.Base.Data; using NUnit.Framework; using Ringtoets.Integration.Data.StandAlone; @@ -53,6 +54,7 @@ public void Create_WithCollectorAndPropertiesSet_ReturnsFailureMechanismEntityWithPropertiesSet(bool isRelevant) { // Setup + const double n = 8.0; var failureMechanism = new PipingStructureFailureMechanism { IsRelevant = isRelevant, @@ -67,7 +69,8 @@ NotRelevantComments = { Body = "Really not relevant" - } + }, + N = (RoundedDouble) n }; var registry = new PersistenceRegistry(); @@ -81,6 +84,7 @@ Assert.AreEqual(failureMechanism.InputComments.Body, entity.InputComments); Assert.AreEqual(failureMechanism.OutputComments.Body, entity.OutputComments); Assert.AreEqual(failureMechanism.NotRelevantComments.Body, entity.NotRelevantComments); + Assert.AreEqual(n, entity.PipingStructureFailureMechanismMetaEntities.Single().N); } [Test] Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo181IntegrationTest.cs =================================================================== diff -u -r36d4b4090a4169cc8d25ede0029a3244df8fe74d -r899d227631395ebeb5154719f7b92a42ddbc6f96 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo181IntegrationTest.cs (.../MigrationTo181IntegrationTest.cs) (revision 36d4b4090a4169cc8d25ede0029a3244df8fe74d) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo181IntegrationTest.cs (.../MigrationTo181IntegrationTest.cs) (revision 899d227631395ebeb5154719f7b92a42ddbc6f96) @@ -64,6 +64,7 @@ AssertHydraRingPreprocessor(reader); AssertStabilityStoneCoverFailureMechanism(reader); AssertMacroStabilityOutwardsFailureMechanism(reader); + AssertPipingStructureFailureMechanism(reader); } AssertLogDatabase(logFilePath); @@ -292,5 +293,16 @@ "(SELECT [FailureMechanismEntityId] FROM [FailureMechanismEntity] WHERE [FailureMechanismType] = 13);"; reader.AssertReturnedDataIsValid(validateFailureMechanisms); } + + private static void AssertPipingStructureFailureMechanism(MigratedDatabaseReader reader) + { + const string validateFailureMechanisms = + "SELECT COUNT() = (SELECT COUNT() FROM FailureMechanismEntity WHERE FailureMechanismType = 11) " + + "FROM [PipingStructureFailureMechanismMetaEntity] " + + "WHERE [N] = 1.0 " + + "AND [FailureMechanismEntityId] IN " + + "(SELECT [FailureMechanismEntityId] FROM [FailureMechanismEntity] WHERE [FailureMechanismType] = 11);"; + reader.AssertReturnedDataIsValid(validateFailureMechanisms); + } } } \ No newline at end of file Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/FailureMechanismEntityReadExtensionsTest.cs =================================================================== diff -u -r680d50ac48c78aba5bcdb6cc459343ef6941f7a0 -r899d227631395ebeb5154719f7b92a42ddbc6f96 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/FailureMechanismEntityReadExtensionsTest.cs (.../FailureMechanismEntityReadExtensionsTest.cs) (revision 680d50ac48c78aba5bcdb6cc459343ef6941f7a0) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/FailureMechanismEntityReadExtensionsTest.cs (.../FailureMechanismEntityReadExtensionsTest.cs) (revision 899d227631395ebeb5154719f7b92a42ddbc6f96) @@ -42,6 +42,7 @@ using Ringtoets.GrassCoverErosionInwards.Data; using Ringtoets.GrassCoverErosionOutwards.Data; using Ringtoets.HeightStructures.Data; +using Ringtoets.Integration.Data.StandAlone; using Ringtoets.MacroStabilityInwards.Data; using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.Piping.Data; @@ -938,6 +939,128 @@ #endregion + #region MacroStabilityOutwards + + [Test] + public void ReadAsMacroStabilityOutwardsFailureMechanism_EntityNull_ThrowsArgumentNullException() + { + // Setup + var failureMechanism = new MacroStabilityOutwardsFailureMechanism(); + var collector = new ReadConversionCollector(); + + // Call + TestDelegate test = () => ((FailureMechanismEntity) null).ReadAsMacroStabilityOutwardsFailureMechanism( + failureMechanism, + collector); + + // Assert + string parameter = Assert.Throws(test).ParamName; + Assert.AreEqual("entity", parameter); + } + + [Test] + public void ReadAsMacroStabilityOutwardsFailureMechanism_FailureMechanismNull_ThrowsArgumentNullException() + { + // Setup + var entity = new FailureMechanismEntity(); + + // Call + TestDelegate test = () => entity.ReadAsMacroStabilityOutwardsFailureMechanism( + null, new ReadConversionCollector()); + + // Assert + string parameter = Assert.Throws(test).ParamName; + Assert.AreEqual("failureMechanism", parameter); + } + + [Test] + public void ReadAsMacroStabilityOutwardsFailureMechanism_WithoutCollector_ThrowsArgumentNullException() + { + // Setup + var entity = new FailureMechanismEntity(); + + // Call + TestDelegate test = () => entity.ReadAsMacroStabilityOutwardsFailureMechanism( + new MacroStabilityOutwardsFailureMechanism(), null); + + // Assert + string parameter = Assert.Throws(test).ParamName; + Assert.AreEqual("collector", parameter); + } + + [Test] + public void ReadAsMacroStabilityOutwardsFailureMechanism_WithPropertiesSet_SetsMacroStabilityOutwardsFailureMechanismProperties() + { + // Setup + var random = new Random(31); + bool isRelevant = random.NextBoolean(); + var entity = new FailureMechanismEntity + { + IsRelevant = Convert.ToByte(isRelevant), + InputComments = "Some input text", + OutputComments = "Some output text", + NotRelevantComments = "Really not relevant", + CalculationGroupEntity = new CalculationGroupEntity(), + MacroStabilityOutwardsFailureMechanismMetaEntities = new[] + { + new MacroStabilityOutwardsFailureMechanismMetaEntity + { + A = random.NextDouble() + } + } + }; + var collector = new ReadConversionCollector(); + var failureMechanism = new MacroStabilityOutwardsFailureMechanism(); + + // Call + entity.ReadAsMacroStabilityOutwardsFailureMechanism(failureMechanism, collector); + + // Assert + Assert.IsNotNull(failureMechanism); + Assert.AreEqual(isRelevant, failureMechanism.IsRelevant); + Assert.AreEqual(entity.InputComments, failureMechanism.InputComments.Body); + Assert.AreEqual(entity.OutputComments, failureMechanism.OutputComments.Body); + Assert.AreEqual(entity.NotRelevantComments, failureMechanism.NotRelevantComments.Body); + CollectionAssert.IsEmpty(failureMechanism.Sections); + + MacroStabilityOutwardsFailureMechanismMetaEntity metaEntity = entity.MacroStabilityOutwardsFailureMechanismMetaEntities.Single(); + Assert.AreEqual(metaEntity.A, failureMechanism.MacroStabilityOutwardsProbabilityAssessmentInput.A); + } + + [Test] + public void ReadAsMacroStabilityOutwardsFailureMechanism_WithSectionsSet_MacroStabilityOutwardsFailureMechanismWithFailureMechanismSectionsSet() + { + // Setup + FailureMechanismSectionEntity failureMechanismSectionEntity = CreateSimpleFailureMechanismSectionEntity(); + failureMechanismSectionEntity.MacroStabilityOutwardsSectionResultEntities.Add(new MacroStabilityOutwardsSectionResultEntity + { + FailureMechanismSectionEntity = failureMechanismSectionEntity + }); + var entity = new FailureMechanismEntity + { + CalculationGroupEntity = new CalculationGroupEntity(), + FailureMechanismSectionEntities = + { + failureMechanismSectionEntity + }, + MacroStabilityOutwardsFailureMechanismMetaEntities = + { + new MacroStabilityOutwardsFailureMechanismMetaEntity() + } + }; + var collector = new ReadConversionCollector(); + var failureMechanism = new MacroStabilityOutwardsFailureMechanism(); + + // Call + entity.ReadAsMacroStabilityOutwardsFailureMechanism(failureMechanism, collector); + + // Assert + Assert.AreEqual(failureMechanismSectionEntity.MacroStabilityOutwardsSectionResultEntities.Count, + failureMechanism.Sections.Count()); + } + + #endregion + #region Grass Cover Erosion Inwards [Test] @@ -2438,5 +2561,130 @@ } #endregion + + #region PipingStructure + + [Test] + public void ReadAsPipingStructureFailureMechanism_EntityNull_ThrowsArgumentNullException() + { + // Setup + var failureMechanism = new PipingStructureFailureMechanism(); + var collector = new ReadConversionCollector(); + + // Call + TestDelegate test = () => ((FailureMechanismEntity) null).ReadAsPipingStructureFailureMechanism( + failureMechanism, + collector); + + // Assert + string parameter = Assert.Throws(test).ParamName; + Assert.AreEqual("entity", parameter); + } + + [Test] + public void ReadAsPipingStructureFailureMechanism_FailureMechanismNull_ThrowsArgumentNullException() + { + // Setup + var entity = new FailureMechanismEntity(); + + // Call + TestDelegate test = () => entity.ReadAsPipingStructureFailureMechanism( + null, new ReadConversionCollector()); + + // Assert + string parameter = Assert.Throws(test).ParamName; + Assert.AreEqual("failureMechanism", parameter); + } + + [Test] + public void ReadAsPipingStructureFailureMechanism_WithoutCollector_ThrowsArgumentNullException() + { + // Setup + var entity = new FailureMechanismEntity(); + + // Call + TestDelegate test = () => entity.ReadAsPipingStructureFailureMechanism( + new PipingStructureFailureMechanism(), null); + + // Assert + string parameter = Assert.Throws(test).ParamName; + Assert.AreEqual("collector", parameter); + } + + [Test] + public void ReadAsPipingStructureFailureMechanism_WithPropertiesSet_SetsPipingStructureFailureMechanismProperties() + { + // Setup + var random = new Random(31); + bool isRelevant = random.NextBoolean(); + var entity = new FailureMechanismEntity + { + IsRelevant = Convert.ToByte(isRelevant), + InputComments = "Some input text", + OutputComments = "Some output text", + NotRelevantComments = "Really not relevant", + CalculationGroupEntity = new CalculationGroupEntity(), + PipingStructureFailureMechanismMetaEntities = new[] + { + new PipingStructureFailureMechanismMetaEntity + { + N = random.NextDouble() + 1.0 + } + } + }; + var collector = new ReadConversionCollector(); + var failureMechanism = new PipingStructureFailureMechanism(); + + // Call + entity.ReadAsPipingStructureFailureMechanism(failureMechanism, collector); + + // Assert + Assert.IsNotNull(failureMechanism); + Assert.AreEqual(isRelevant, failureMechanism.IsRelevant); + Assert.AreEqual(entity.InputComments, failureMechanism.InputComments.Body); + Assert.AreEqual(entity.OutputComments, failureMechanism.OutputComments.Body); + Assert.AreEqual(entity.NotRelevantComments, failureMechanism.NotRelevantComments.Body); + CollectionAssert.IsEmpty(failureMechanism.Sections); + + PipingStructureFailureMechanismMetaEntity metaEntity = entity.PipingStructureFailureMechanismMetaEntities.Single(); + Assert.AreEqual(metaEntity.N, failureMechanism.N, failureMechanism.N.GetAccuracy()); + } + + [Test] + public void ReadAsPipingStructureFailureMechanism_WithSectionsSet_PipingStructureFailureMechanismWithFailureMechanismSectionsSet() + { + // Setup + FailureMechanismSectionEntity failureMechanismSectionEntity = CreateSimpleFailureMechanismSectionEntity(); + failureMechanismSectionEntity.PipingStructureSectionResultEntities.Add(new PipingStructureSectionResultEntity + { + FailureMechanismSectionEntity = failureMechanismSectionEntity + }); + var entity = new FailureMechanismEntity + { + CalculationGroupEntity = new CalculationGroupEntity(), + FailureMechanismSectionEntities = + { + failureMechanismSectionEntity + }, + PipingStructureFailureMechanismMetaEntities = + { + new PipingStructureFailureMechanismMetaEntity + { + N = 1.0 + } + } + }; + var collector = new ReadConversionCollector(); + var failureMechanism = new PipingStructureFailureMechanism(); + + // Call + entity.ReadAsPipingStructureFailureMechanism(failureMechanism, collector); + + // Assert + Assert.AreEqual(failureMechanismSectionEntity.PipingStructureSectionResultEntities.Count, + failureMechanism.Sections.Count()); + } + + #endregion } } \ No newline at end of file Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/RingtoetsProjectTestHelperTest.cs =================================================================== diff -u -rbb0ee66946e737d3e30d34ab27659ecdc5646992 -r899d227631395ebeb5154719f7b92a42ddbc6f96 --- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/RingtoetsProjectTestHelperTest.cs (.../RingtoetsProjectTestHelperTest.cs) (revision bb0ee66946e737d3e30d34ab27659ecdc5646992) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/RingtoetsProjectTestHelperTest.cs (.../RingtoetsProjectTestHelperTest.cs) (revision 899d227631395ebeb5154719f7b92a42ddbc6f96) @@ -463,6 +463,12 @@ Assert.AreSame(calculationWithOutput, sectionResult.Calculation); } + private static void AsserPipingStructureFailureMechanism(AssessmentSection assessmentSection) + { + PipingStructureFailureMechanism failureMechanism = assessmentSection.PipingStructure; + Assert.AreEqual(12.5, failureMechanism.N, failureMechanism.N.GetAccuracy()); + } + private static void AssertGeneralResultTopLevelFaultTreeIllustrationPoint(GeneralResult generalResult) { WindDirection actualGoverningWindDirection = generalResult.GoverningWindDirection; Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs =================================================================== diff -u -rbb0ee66946e737d3e30d34ab27659ecdc5646992 -r899d227631395ebeb5154719f7b92a42ddbc6f96 --- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs (.../RingtoetsProjectTestHelper.cs) (revision bb0ee66946e737d3e30d34ab27659ecdc5646992) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs (.../RingtoetsProjectTestHelper.cs) (revision 899d227631395ebeb5154719f7b92a42ddbc6f96) @@ -160,11 +160,15 @@ (StructuresCalculation) stabilityPointStructuresFailureMechanism.Calculations.First()); MacroStabilityOutwardsFailureMechanism macroStabilityOutwardsFailureMechanism = assessmentSection.MacroStabilityOutwards; - ConfigureMacroStabilityOutwardsFailureMechanism(macroStabilityOutwardsFailureMechanism, - assessmentSection); + ConfigureMacroStabilityOutwardsFailureMechanism(macroStabilityOutwardsFailureMechanism); AddSections(macroStabilityOutwardsFailureMechanism); SetSectionResults(macroStabilityOutwardsFailureMechanism.SectionResults); + PipingStructureFailureMechanism pipingStructureFailureMechanism = assessmentSection.PipingStructure; + ConfigurePipingStructureFailureMechanism(pipingStructureFailureMechanism); + AddSections(pipingStructureFailureMechanism); + SetSectionResults(pipingStructureFailureMechanism.SectionResults); + AddSections(assessmentSection.Microstability); SetSectionResults(assessmentSection.Microstability.SectionResults); AddSections(assessmentSection.WaterPressureAsphaltCover); @@ -175,8 +179,6 @@ SetSectionResults(assessmentSection.GrassCoverSlipOffOutwards.SectionResults); AddSections(assessmentSection.StrengthStabilityLengthwiseConstruction); SetSectionResults(assessmentSection.StrengthStabilityLengthwiseConstruction.SectionResults); - AddSections(assessmentSection.PipingStructure); - SetSectionResults(assessmentSection.PipingStructure.SectionResults); SetSectionResults(assessmentSection.DuneErosion.SectionResults); AddSections(assessmentSection.TechnicalInnovation); SetSectionResults(assessmentSection.TechnicalInnovation.SectionResults); @@ -468,8 +470,7 @@ #region MacroStabilityOutwards FailureMechanism - private static void ConfigureMacroStabilityOutwardsFailureMechanism(MacroStabilityOutwardsFailureMechanism macroStabilityOutwardsFailureMechanism, - AssessmentSection assessmentSection) + private static void ConfigureMacroStabilityOutwardsFailureMechanism(MacroStabilityOutwardsFailureMechanism macroStabilityOutwardsFailureMechanism) { macroStabilityOutwardsFailureMechanism.MacroStabilityOutwardsProbabilityAssessmentInput.A = 0.6; } @@ -2043,5 +2044,14 @@ } #endregion + + #region PipingStructure FailureMechanism + + private static void ConfigurePipingStructureFailureMechanism(PipingStructureFailureMechanism pipingStructureFailureMechanism) + { + pipingStructureFailureMechanism.N = (RoundedDouble) 12.5; + } + + #endregion } } \ No newline at end of file Index: build/DatabaseStructure.sql =================================================================== diff -u -r36d4b4090a4169cc8d25ede0029a3244df8fe74d -r899d227631395ebeb5154719f7b92a42ddbc6f96 --- build/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 36d4b4090a4169cc8d25ede0029a3244df8fe74d) +++ build/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 899d227631395ebeb5154719f7b92a42ddbc6f96) @@ -1,6 +1,6 @@ /* ---------------------------------------------------- */ /* Generated by Enterprise Architect Version 12.0 */ -/* Created On : 26-jan-2018 15:38:38 */ +/* Created On : 29-jan-2018 11:07:03 */ /* DBMS : SQLite */ /* ---------------------------------------------------- */ @@ -90,6 +90,9 @@ DROP TABLE IF EXISTS 'PipingCalculationOutputEntity' ; +DROP TABLE IF EXISTS 'PipingStructureFailureMechanismMetaEntity' +; + DROP TABLE IF EXISTS 'PipingSemiProbabilisticOutputEntity' ; @@ -126,10 +129,10 @@ DROP TABLE IF EXISTS 'MacroStabilityInwardsSectionResultEntity' ; -DROP TABLE IF EXISTS 'MacroStabilityOutwardsSectionResultEntity' +DROP TABLE IF EXISTS 'WaveImpactAsphaltCoverFailureMechanismMetaEntity' ; -DROP TABLE IF EXISTS 'WaveImpactAsphaltCoverFailureMechanismMetaEntity' +DROP TABLE IF EXISTS 'MacroStabilityOutwardsSectionResultEntity' ; DROP TABLE IF EXISTS 'WaveImpactAsphaltCoverSectionResultEntity' @@ -737,6 +740,15 @@ ) ; +CREATE TABLE 'PipingStructureFailureMechanismMetaEntity' +( + 'PipingStructureFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + 'FailureMechanismEntityId' INTEGER NOT NULL, + 'N' REAL NOT NULL, + CONSTRAINT 'FK_PipingStructureFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade +) +; + CREATE TABLE 'PipingSemiProbabilisticOutputEntity' ( 'PipingSemiProbabilisticOutputEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -880,6 +892,15 @@ ) ; +CREATE TABLE 'WaveImpactAsphaltCoverFailureMechanismMetaEntity' +( + 'WaveImpactAsphaltCoverFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + 'FailureMechanismEntityId' INTEGER NOT NULL, + 'ForeshoreProfileCollectionSourcePath' TEXT, + CONSTRAINT 'FK_WaveImpactAsphaltCoverFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade +) +; + CREATE TABLE 'MacroStabilityOutwardsSectionResultEntity' ( 'MacroStabilityOutwardsSectionResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -891,15 +912,6 @@ ) ; -CREATE TABLE 'WaveImpactAsphaltCoverFailureMechanismMetaEntity' -( - 'WaveImpactAsphaltCoverFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, - 'FailureMechanismEntityId' INTEGER NOT NULL, - 'ForeshoreProfileCollectionSourcePath' TEXT, - CONSTRAINT 'FK_WaveImpactAsphaltCoverFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade -) -; - CREATE TABLE 'WaveImpactAsphaltCoverSectionResultEntity' ( 'WaveImpactAsphaltCoverSectionResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -2106,6 +2118,10 @@ ON 'PipingCalculationOutputEntity' ('PipingCalculationEntityId' ASC) ; +CREATE INDEX 'IXFK_PipingStructureFailureMechanismMetaEntity_FailureMechanismEntity' + ON 'PipingStructureFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC) +; + CREATE INDEX 'IXFK_PipingSemiProbabilisticOutputEntity_PipingCalculationEntity' ON 'PipingSemiProbabilisticOutputEntity' ('PipingCalculationEntityId' ASC) ; @@ -2166,14 +2182,14 @@ ON 'MacroStabilityInwardsSectionResultEntity' ('FailureMechanismSectionEntityId' ASC) ; -CREATE INDEX 'IXFK_MacroStabilityOutwardsSectionResultEntity_FailureMechanismSectionEntity' - ON 'MacroStabilityOutwardsSectionResultEntity' ('FailureMechanismSectionEntityId' ASC) -; - CREATE INDEX 'IXFK_WaveImpactAsphaltCoverFailureMechanismMetaEntity_FailureMechanismEntity' ON 'WaveImpactAsphaltCoverFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC) ; +CREATE INDEX 'IXFK_MacroStabilityOutwardsSectionResultEntity_FailureMechanismSectionEntity' + ON 'MacroStabilityOutwardsSectionResultEntity' ('FailureMechanismSectionEntityId' ASC) +; + CREATE INDEX 'IXFK_WaveImpactAsphaltCoverSectionResultEntity_FailureMechanismSectionEntity' ON 'WaveImpactAsphaltCoverSectionResultEntity' ('FailureMechanismSectionEntityId' ASC) ; Index: design/DatabaseDesign.eap =================================================================== diff -u -r36d4b4090a4169cc8d25ede0029a3244df8fe74d -r899d227631395ebeb5154719f7b92a42ddbc6f96 Binary files differ