Index: Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure17.2.sql =================================================================== diff -u -rd5d457c61d546522500542ac8fe3967882e0157e -r186010477a4482fc75d29ceef78f61840a98680e --- Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure17.2.sql (.../DatabaseStructure17.2.sql) (revision d5d457c61d546522500542ac8fe3967882e0157e) +++ Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure17.2.sql (.../DatabaseStructure17.2.sql) (revision 186010477a4482fc75d29ceef78f61840a98680e) @@ -1,6 +1,6 @@ /* ---------------------------------------------------- */ /* Generated by Enterprise Architect Version 12.0 */ -/* Created On : 13-Sep-2017 2:15:44 PM */ +/* Created On : 14-Sep-2017 12:42:30 PM */ /* DBMS : SQLite */ /* ---------------------------------------------------- */ @@ -322,7 +322,6 @@ 'MacroStabilityInwardsFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, 'FailureMechanismEntityId' INTEGER NOT NULL, 'A' REAL NOT NULL, - 'B' REAL NOT NULL, 'SectionLength' REAL, 'StochasticSoilModelCollectionSourcePath' TEXT, 'SurfaceLineCollectionSourcePath' TEXT, @@ -1787,15 +1786,15 @@ CREATE INDEX 'IXFK_GrassCoverErosionInwardsDikeHeightOutputEntity_GrassCoverErosionInwardsOutputEntity' ON 'GrassCoverErosionInwardsDikeHeightOutputEntity' ('GrassCoverErosionInwardsOutputEntityId' ASC) ; -CREATE TRIGGER [TR_AfterDeleteGrassCoverErosionInwardsDikeHeightOutputEntity_RemoveGeneralResultFaultTreeIllustrationPointEntity] - AFTER DELETE - ON GrassCoverErosionInwardsDikeHeightOutputEntity - FOR EACH ROW -BEGIN - DELETE - FROM GeneralResultFaultTreeIllustrationPointEntity - WHERE OLD.GeneralResultFaultTreeIllustrationPointEntityId IS NOT NULL - AND GeneralResultFaultTreeIllustrationPointEntityId IS OLD.GeneralResultFaultTreeIllustrationPointEntityId; +CREATE TRIGGER [TR_AfterDeleteGrassCoverErosionInwardsDikeHeightOutputEntity_RemoveGeneralResultFaultTreeIllustrationPointEntity] + AFTER DELETE + ON GrassCoverErosionInwardsDikeHeightOutputEntity + FOR EACH ROW +BEGIN + DELETE + FROM GeneralResultFaultTreeIllustrationPointEntity + WHERE OLD.GeneralResultFaultTreeIllustrationPointEntityId IS NOT NULL + AND GeneralResultFaultTreeIllustrationPointEntityId IS OLD.GeneralResultFaultTreeIllustrationPointEntityId; END; ; @@ -2034,15 +2033,15 @@ CREATE INDEX 'IXFK_GrassCoverErosionInwardsOutputEntity_GrassCoverErosionInwardsCalculationEntity' ON 'GrassCoverErosionInwardsOutputEntity' ('GrassCoverErosionInwardsCalculationEntityId' ASC) ; -CREATE TRIGGER [TR_AfterDeleteGrassCoverErosionInwardsOutputEntity_RemoveGeneralResultFaultTreeIllustrationPointEntity] - AFTER DELETE - ON GrassCoverErosionInwardsOutputEntity - FOR EACH ROW -BEGIN - DELETE - FROM GeneralResultFaultTreeIllustrationPointEntity - WHERE OLD.GeneralResultFaultTreeIllustrationPointEntityId IS NOT NULL - AND GeneralResultFaultTreeIllustrationPointEntityId IS OLD.GeneralResultFaultTreeIllustrationPointEntityId; +CREATE TRIGGER [TR_AfterDeleteGrassCoverErosionInwardsOutputEntity_RemoveGeneralResultFaultTreeIllustrationPointEntity] + AFTER DELETE + ON GrassCoverErosionInwardsOutputEntity + FOR EACH ROW +BEGIN + DELETE + FROM GeneralResultFaultTreeIllustrationPointEntity + WHERE OLD.GeneralResultFaultTreeIllustrationPointEntityId IS NOT NULL + AND GeneralResultFaultTreeIllustrationPointEntityId IS OLD.GeneralResultFaultTreeIllustrationPointEntityId; END; ; @@ -2105,15 +2104,15 @@ CREATE INDEX 'IXFK_HeightStructuresOutputEntity_HeightStructuresCalculationEntity' ON 'HeightStructuresOutputEntity' ('HeightStructuresCalculationEntityId' ASC) ; -CREATE TRIGGER [TR_AfterDeleteHeightStructuresOutputEntity_RemoveGeneralResultFaultTreeIllustrationPointEntity] - AFTER DELETE - ON HeightStructuresOutputEntity - FOR EACH ROW -BEGIN - DELETE - FROM GeneralResultFaultTreeIllustrationPointEntity - WHERE OLD.GeneralResultFaultTreeIllustrationPointEntityId IS NOT NULL - AND GeneralResultFaultTreeIllustrationPointEntityId IS OLD.GeneralResultFaultTreeIllustrationPointEntityId; +CREATE TRIGGER [TR_AfterDeleteHeightStructuresOutputEntity_RemoveGeneralResultFaultTreeIllustrationPointEntity] + AFTER DELETE + ON HeightStructuresOutputEntity + FOR EACH ROW +BEGIN + DELETE + FROM GeneralResultFaultTreeIllustrationPointEntity + WHERE OLD.GeneralResultFaultTreeIllustrationPointEntityId IS NOT NULL + AND GeneralResultFaultTreeIllustrationPointEntityId IS OLD.GeneralResultFaultTreeIllustrationPointEntityId; END; ; @@ -2160,15 +2159,15 @@ CREATE INDEX 'IXFK_ClosingStructuresOutputEntity_ClosingStructuresCalculationEntity' ON 'ClosingStructuresOutputEntity' ('ClosingStructuresCalculationEntityId' ASC) ; -CREATE TRIGGER [TR_AfterDeleteClosingStructuresOutputEntity_RemoveGeneralResultFaultTreeIllustrationPointEntity] - AFTER DELETE - ON ClosingStructuresOutputEntity - FOR EACH ROW -BEGIN - DELETE - FROM GeneralResultFaultTreeIllustrationPointEntity - WHERE OLD.GeneralResultFaultTreeIllustrationPointEntityId IS NOT NULL - AND GeneralResultFaultTreeIllustrationPointEntityId IS OLD.GeneralResultFaultTreeIllustrationPointEntityId; +CREATE TRIGGER [TR_AfterDeleteClosingStructuresOutputEntity_RemoveGeneralResultFaultTreeIllustrationPointEntity] + AFTER DELETE + ON ClosingStructuresOutputEntity + FOR EACH ROW +BEGIN + DELETE + FROM GeneralResultFaultTreeIllustrationPointEntity + WHERE OLD.GeneralResultFaultTreeIllustrationPointEntityId IS NOT NULL + AND GeneralResultFaultTreeIllustrationPointEntityId IS OLD.GeneralResultFaultTreeIllustrationPointEntityId; END; ; @@ -2179,15 +2178,15 @@ CREATE INDEX 'IXFK_StabilityPointStructuresOutputEntity_StabilityPointStructuresCalculationEntity' ON 'StabilityPointStructuresOutputEntity' ('StabilityPointStructuresCalculationEntityId' ASC) ; -CREATE TRIGGER [TR_AfterDeleteStabilityPointStructuresOutputEntity_RemoveGeneralResultFaultTreeIllustrationPointEntity] - AFTER DELETE - ON StabilityPointStructuresOutputEntity - FOR EACH ROW -BEGIN - DELETE - FROM GeneralResultFaultTreeIllustrationPointEntity - WHERE OLD.GeneralResultFaultTreeIllustrationPointEntityId IS NOT NULL - AND GeneralResultFaultTreeIllustrationPointEntityId IS OLD.GeneralResultFaultTreeIllustrationPointEntityId; +CREATE TRIGGER [TR_AfterDeleteStabilityPointStructuresOutputEntity_RemoveGeneralResultFaultTreeIllustrationPointEntity] + AFTER DELETE + ON StabilityPointStructuresOutputEntity + FOR EACH ROW +BEGIN + DELETE + FROM GeneralResultFaultTreeIllustrationPointEntity + WHERE OLD.GeneralResultFaultTreeIllustrationPointEntityId IS NOT NULL + AND GeneralResultFaultTreeIllustrationPointEntityId IS OLD.GeneralResultFaultTreeIllustrationPointEntityId; END; ; @@ -2198,15 +2197,15 @@ CREATE INDEX 'IXFK_HydraulicLocationOutputEntity_HydraulicLocationEntity' ON 'HydraulicLocationOutputEntity' ('HydraulicLocationEntityId' ASC) ; -CREATE TRIGGER [TR_AfterDeleteHydraulicLocationOutputEntity_RemoveGeneralResultSubMechanismIllustrationPointEntity] - AFTER DELETE - ON HydraulicLocationOutputEntity - FOR EACH ROW -BEGIN - DELETE - FROM GeneralResultSubMechanismIllustrationPointEntity - WHERE OLD.GeneralResultSubMechanismIllustrationPointEntityId IS NOT NULL - AND GeneralResultSubMechanismIllustrationPointEntityId IS OLD.GeneralResultSubMechanismIllustrationPointEntityId; +CREATE TRIGGER [TR_AfterDeleteHydraulicLocationOutputEntity_RemoveGeneralResultSubMechanismIllustrationPointEntity] + AFTER DELETE + ON HydraulicLocationOutputEntity + FOR EACH ROW +BEGIN + DELETE + FROM GeneralResultSubMechanismIllustrationPointEntity + WHERE OLD.GeneralResultSubMechanismIllustrationPointEntityId IS NOT NULL + AND GeneralResultSubMechanismIllustrationPointEntityId IS OLD.GeneralResultSubMechanismIllustrationPointEntityId; END; ; @@ -2217,15 +2216,15 @@ CREATE INDEX 'IXFK_GrassCoverErosionOutwardsHydraulicLocationOutputEntity_GrassCoverErosionOutwardsHydraulicLocationEntity' ON 'GrassCoverErosionOutwardsHydraulicLocationOutputEntity' ('GrassCoverErosionOutwardsHydraulicLocationEntityId' ASC) ; -CREATE TRIGGER [TR_AfterDeleteGrassCoverErosionOutwardsHydraulicLocationOutputEntity_RemoveGeneralResultSubMechanismIllustrationPointEntity] - AFTER DELETE - ON GrassCoverErosionOutwardsHydraulicLocationOutputEntity - FOR EACH ROW -BEGIN - DELETE - FROM GeneralResultSubMechanismIllustrationPointEntity - WHERE OLD.GeneralResultSubMechanismIllustrationPointEntityId IS NOT NULL - AND GeneralResultSubMechanismIllustrationPointEntityId IS OLD.GeneralResultSubMechanismIllustrationPointEntityId; +CREATE TRIGGER [TR_AfterDeleteGrassCoverErosionOutwardsHydraulicLocationOutputEntity_RemoveGeneralResultSubMechanismIllustrationPointEntity] + AFTER DELETE + ON GrassCoverErosionOutwardsHydraulicLocationOutputEntity + FOR EACH ROW +BEGIN + DELETE + FROM GeneralResultSubMechanismIllustrationPointEntity + WHERE OLD.GeneralResultSubMechanismIllustrationPointEntityId IS NOT NULL + AND GeneralResultSubMechanismIllustrationPointEntityId IS OLD.GeneralResultSubMechanismIllustrationPointEntityId; END; ; @@ -2252,15 +2251,15 @@ CREATE INDEX 'IXFK_GrassCoverErosionInwardsOvertoppingRateOutputEntity_GrassCoverErosionInwardsOutputEntity' ON 'GrassCoverErosionInwardsOvertoppingRateOutputEntity' ('GrassCoverErosionInwardsOutputEntityId' ASC) ; -CREATE TRIGGER [TR_AfterDeleteGrassCoverErosionInwardsOvertoppingRateOutputEntity_RemoveGeneralResultFaultTreeIllustrationPointEntity] - AFTER DELETE - ON GrassCoverErosionInwardsOvertoppingRateOutputEntity - FOR EACH ROW -BEGIN - DELETE - FROM GeneralResultFaultTreeIllustrationPointEntity - WHERE OLD.GeneralResultFaultTreeIllustrationPointEntityId IS NOT NULL - AND GeneralResultFaultTreeIllustrationPointEntityId IS OLD.GeneralResultFaultTreeIllustrationPointEntityId; +CREATE TRIGGER [TR_AfterDeleteGrassCoverErosionInwardsOvertoppingRateOutputEntity_RemoveGeneralResultFaultTreeIllustrationPointEntity] + AFTER DELETE + ON GrassCoverErosionInwardsOvertoppingRateOutputEntity + FOR EACH ROW +BEGIN + DELETE + FROM GeneralResultFaultTreeIllustrationPointEntity + WHERE OLD.GeneralResultFaultTreeIllustrationPointEntityId IS NOT NULL + AND GeneralResultFaultTreeIllustrationPointEntityId IS OLD.GeneralResultFaultTreeIllustrationPointEntityId; END; ; @@ -2275,15 +2274,15 @@ CREATE INDEX 'IXFK_GeneralResultSubMechanismIllustrationPointStochastEntity_StochastEntity' ON 'GeneralResultSubMechanismIllustrationPointStochastEntity' ('StochastEntityId' ASC) ; -CREATE TRIGGER [TR_AfterDeleteGeneralResultSubMechanismIllustrationPointStochastEntity_RemoveStochastEntity] - AFTER DELETE - ON GeneralResultSubMechanismIllustrationPointStochastEntity - FOR EACH ROW -BEGIN - DELETE - FROM StochastEntity - WHERE OLD.StochastEntityId IS NOT NULL - AND StochastEntityId IS OLD.StochastEntityId; +CREATE TRIGGER [TR_AfterDeleteGeneralResultSubMechanismIllustrationPointStochastEntity_RemoveStochastEntity] + AFTER DELETE + ON GeneralResultSubMechanismIllustrationPointStochastEntity + FOR EACH ROW +BEGIN + DELETE + FROM StochastEntity + WHERE OLD.StochastEntityId IS NOT NULL + AND StochastEntityId IS OLD.StochastEntityId; END; ; @@ -2298,15 +2297,15 @@ CREATE INDEX 'IXFK_FaultTreeIllustrationPointStochastEntity_StochastEntity' ON 'FaultTreeIllustrationPointStochastEntity' ('StochastEntityId' ASC) ; -CREATE TRIGGER [TR_AfterDeleteFaultTreeIllustrationPointStochastEntity_RemoveStochastEntity] - AFTER DELETE - ON FaultTreeIllustrationPointStochastEntity - FOR EACH ROW -BEGIN - DELETE - FROM StochastEntity - WHERE OLD.StochastEntityId IS NOT NULL - AND StochastEntityId IS OLD.StochastEntityId; +CREATE TRIGGER [TR_AfterDeleteFaultTreeIllustrationPointStochastEntity_RemoveStochastEntity] + AFTER DELETE + ON FaultTreeIllustrationPointStochastEntity + FOR EACH ROW +BEGIN + DELETE + FROM StochastEntity + WHERE OLD.StochastEntityId IS NOT NULL + AND StochastEntityId IS OLD.StochastEntityId; END; ; @@ -2317,15 +2316,15 @@ CREATE INDEX 'IXFK_GeneralResultFaultTreeIllustrationPointStochastEntity_StochastEntity' ON 'GeneralResultFaultTreeIllustrationPointStochastEntity' ('StochastEntityId' ASC) ; -CREATE TRIGGER [TR_AfterDeleteGeneralResultFaultTreeIllustrationPointStochastEntity_RemoveStochastEntity] - AFTER DELETE - ON GeneralResultFaultTreeIllustrationPointStochastEntity - FOR EACH ROW -BEGIN - DELETE - FROM StochastEntity - WHERE OLD.StochastEntityId IS NOT NULL - AND StochastEntityId IS OLD.StochastEntityId; +CREATE TRIGGER [TR_AfterDeleteGeneralResultFaultTreeIllustrationPointStochastEntity_RemoveStochastEntity] + AFTER DELETE + ON GeneralResultFaultTreeIllustrationPointStochastEntity + FOR EACH ROW +BEGIN + DELETE + FROM StochastEntity + WHERE OLD.StochastEntityId IS NOT NULL + AND StochastEntityId IS OLD.StochastEntityId; END; ; @@ -2336,15 +2335,15 @@ CREATE INDEX 'IXFK_TopLevelSubMechanismIllustrationPointEntity_SubMechanismIllustrationPointEntity' ON 'TopLevelSubMechanismIllustrationPointEntity' ('SubMechanismIllustrationPointEntityId' ASC) ; -CREATE TRIGGER [TR_AfterDeleteTopLevelSubMechanismIllustrationPointEntity_RemoveSubMechanismIllustrationPointEntity] - AFTER DELETE - ON TopLevelSubMechanismIllustrationPointEntity - FOR EACH ROW -BEGIN - DELETE - FROM SubMechanismIllustrationPointEntity - WHERE OLD.SubMechanismIllustrationPointEntityId IS NOT NULL - AND SubMechanismIllustrationPointEntityId IS OLD.SubMechanismIllustrationPointEntityId; +CREATE TRIGGER [TR_AfterDeleteTopLevelSubMechanismIllustrationPointEntity_RemoveSubMechanismIllustrationPointEntity] + AFTER DELETE + ON TopLevelSubMechanismIllustrationPointEntity + FOR EACH ROW +BEGIN + DELETE + FROM SubMechanismIllustrationPointEntity + WHERE OLD.SubMechanismIllustrationPointEntityId IS NOT NULL + AND SubMechanismIllustrationPointEntityId IS OLD.SubMechanismIllustrationPointEntityId; END; ; @@ -2355,15 +2354,15 @@ CREATE INDEX 'IXFK_TopLevelFaultTreeIllustrationPointEntity_GeneralResultFaultTreeIllustrationPointEntity' ON 'TopLevelFaultTreeIllustrationPointEntity' ('GeneralResultFaultTreeIllustrationPointEntityId' ASC) ; -CREATE TRIGGER [TR_AfterDeleteTopLevelFaultTreeIllustrationPointEntity_RemoveFaultTreeIllustrationPointEntity] - AFTER DELETE - ON TopLevelFaultTreeIllustrationPointEntity - FOR EACH ROW -BEGIN - DELETE - FROM FaultTreeIllustrationPointEntity - WHERE OLD.FaultTreeIllustrationPointEntityId IS NOT NULL - AND FaultTreeIllustrationPointEntityId IS OLD.FaultTreeIllustrationPointEntityId; +CREATE TRIGGER [TR_AfterDeleteTopLevelFaultTreeIllustrationPointEntity_RemoveFaultTreeIllustrationPointEntity] + AFTER DELETE + ON TopLevelFaultTreeIllustrationPointEntity + FOR EACH ROW +BEGIN + DELETE + FROM FaultTreeIllustrationPointEntity + WHERE OLD.FaultTreeIllustrationPointEntityId IS NOT NULL + AND FaultTreeIllustrationPointEntityId IS OLD.FaultTreeIllustrationPointEntityId; END; ; @@ -2378,15 +2377,15 @@ CREATE INDEX 'IXFK_FaultTreeIllustrationPointEntity_SubMechanismIllustrationPointEntity' ON 'FaultTreeSubmechanismIllustrationPointEntity' ('SubMechanismIllustrationPointEntityId' ASC) ; -CREATE TRIGGER [TR_AfterDeleteFaultTreeSubmechanismIllustrationPointEntity_RemoveSubmechanismIllustrationPointEntity] - AFTER DELETE - ON FaultTreeSubmechanismIllustrationPointEntity - FOR EACH ROW -BEGIN - DELETE - FROM SubmechanismIllustrationPointEntity - WHERE OLD.SubmechanismIllustrationPointEntityId IS NOT NULL - AND SubmechanismIllustrationPointEntityId IS OLD.SubmechanismIllustrationPointEntityId; +CREATE TRIGGER [TR_AfterDeleteFaultTreeSubmechanismIllustrationPointEntity_RemoveSubmechanismIllustrationPointEntity] + AFTER DELETE + ON FaultTreeSubmechanismIllustrationPointEntity + FOR EACH ROW +BEGIN + DELETE + FROM SubmechanismIllustrationPointEntity + WHERE OLD.SubmechanismIllustrationPointEntityId IS NOT NULL + AND SubmechanismIllustrationPointEntityId IS OLD.SubmechanismIllustrationPointEntityId; END; ; @@ -2405,34 +2404,34 @@ CREATE INDEX 'IXFK_MacroStabilityInwardsStochasticSoilProfileEntity_StochasticSoilModelEntity' ON 'MacroStabilityInwardsStochasticSoilProfileEntity' ('StochasticSoilModelEntityId' ASC) ; -CREATE TRIGGER [TR_BeforeInsertMacroStabilityInwardsStochasticSoilProfileEntity_MustHaveOneDOrTwoD] - BEFORE INSERT - ON MacroStabilityInwardsStochasticSoilProfileEntity - FOR EACH ROW -BEGIN - SELECT - CASE - WHEN NEW.MacroStabilityInwardsSoilProfileOneDEntityId IS NULL - AND NEW.MacroStabilityInwardsSoilProfileTwoDEntityId IS NULL - OR NEW.MacroStabilityInwardsSoilProfileOneDEntityId IS NOT NULL - AND NEW.MacroStabilityInwardsSoilProfileTwoDEntityId IS NOT NULL - THEN RAISE(FAIL, 'Either SoilProfile1D or SoilProfile2D must be set.') - END; +CREATE TRIGGER [TR_BeforeInsertMacroStabilityInwardsStochasticSoilProfileEntity_MustHaveOneDOrTwoD] + BEFORE INSERT + ON MacroStabilityInwardsStochasticSoilProfileEntity + FOR EACH ROW +BEGIN + SELECT + CASE + WHEN NEW.MacroStabilityInwardsSoilProfileOneDEntityId IS NULL + AND NEW.MacroStabilityInwardsSoilProfileTwoDEntityId IS NULL + OR NEW.MacroStabilityInwardsSoilProfileOneDEntityId IS NOT NULL + AND NEW.MacroStabilityInwardsSoilProfileTwoDEntityId IS NOT NULL + THEN RAISE(FAIL, 'Either SoilProfile1D or SoilProfile2D must be set.') + END; END; ; -CREATE TRIGGER [TR_BeforeUpdateMacroStabilityInwardsStochasticSoilProfileEntity_MustHaveOneDOrTwoD] - BEFORE UPDATE - ON MacroStabilityInwardsStochasticSoilProfileEntity - FOR EACH ROW -BEGIN - SELECT - CASE - WHEN NEW.MacroStabilityInwardsSoilProfileOneDEntityId IS NULL - AND NEW.MacroStabilityInwardsSoilProfileTwoDEntityId IS NULL - OR NEW.MacroStabilityInwardsSoilProfileOneDEntityId IS NOT NULL - AND NEW.MacroStabilityInwardsSoilProfileTwoDEntityId IS NOT NULL - THEN RAISE(FAIL, 'Either SoilProfile1D or SoilProfile2D must be set.') - END; +CREATE TRIGGER [TR_BeforeUpdateMacroStabilityInwardsStochasticSoilProfileEntity_MustHaveOneDOrTwoD] + BEFORE UPDATE + ON MacroStabilityInwardsStochasticSoilProfileEntity + FOR EACH ROW +BEGIN + SELECT + CASE + WHEN NEW.MacroStabilityInwardsSoilProfileOneDEntityId IS NULL + AND NEW.MacroStabilityInwardsSoilProfileTwoDEntityId IS NULL + OR NEW.MacroStabilityInwardsSoilProfileOneDEntityId IS NOT NULL + AND NEW.MacroStabilityInwardsSoilProfileTwoDEntityId IS NOT NULL + THEN RAISE(FAIL, 'Either SoilProfile1D or SoilProfile2D must be set.') + END; END; ; Index: Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_17.1_17.2.sql =================================================================== diff -u -r33392b49fa6c046098d11c8e7abee1c329ee9680 -r186010477a4482fc75d29ceef78f61840a98680e --- Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_17.1_17.2.sql (.../Migration_17.1_17.2.sql) (revision 33392b49fa6c046098d11c8e7abee1c329ee9680) +++ Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_17.1_17.2.sql (.../Migration_17.1_17.2.sql) (revision 186010477a4482fc75d29ceef78f61840a98680e) @@ -1575,11 +1575,9 @@ */ INSERT INTO MacroStabilityInwardsFailureMechanismMetaEntity ( [FailureMechanismEntityId], - [A], - [B]) + [A]) SELECT FailureMechanismEntityId, - 0.033, - 50.0 + 0.033 FROM FailureMechanismEntity WHERE FailureMechanismType = 2; /* Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/MacroStabilityInwardsFailureMechanismMetaEntity.cs =================================================================== diff -u -rbd21fbd130d32ac7d8f5acc37e20dc2e7fb3b6d4 -r186010477a4482fc75d29ceef78f61840a98680e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/MacroStabilityInwardsFailureMechanismMetaEntity.cs (.../MacroStabilityInwardsFailureMechanismMetaEntity.cs) (revision bd21fbd130d32ac7d8f5acc37e20dc2e7fb3b6d4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/MacroStabilityInwardsFailureMechanismMetaEntity.cs (.../MacroStabilityInwardsFailureMechanismMetaEntity.cs) (revision 186010477a4482fc75d29ceef78f61840a98680e) @@ -35,7 +35,6 @@ public long MacroStabilityInwardsFailureMechanismMetaEntityId { get; set; } public long FailureMechanismEntityId { get; set; } public double A { get; set; } - public double B { get; set; } public double? SectionLength { get; set; } public string StochasticSoilModelCollectionSourcePath { get; set; } public string SurfaceLineCollectionSourcePath { get; set; } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx =================================================================== diff -u -rd5d457c61d546522500542ac8fe3967882e0157e -r186010477a4482fc75d29ceef78f61840a98680e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision d5d457c61d546522500542ac8fe3967882e0157e) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 186010477a4482fc75d29ceef78f61840a98680e) @@ -683,7 +683,6 @@ - @@ -4832,7 +4831,6 @@ - @@ -7701,7 +7699,6 @@ - Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram =================================================================== diff -u -rd5d457c61d546522500542ac8fe3967882e0157e -r186010477a4482fc75d29ceef78f61840a98680e --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision d5d457c61d546522500542ac8fe3967882e0157e) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision 186010477a4482fc75d29ceef78f61840a98680e) @@ -5,94 +5,94 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - + + + + + Index: build/DatabaseStructure.sql =================================================================== diff -u -rd5d457c61d546522500542ac8fe3967882e0157e -r186010477a4482fc75d29ceef78f61840a98680e --- build/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision d5d457c61d546522500542ac8fe3967882e0157e) +++ build/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 186010477a4482fc75d29ceef78f61840a98680e) @@ -1,6 +1,6 @@ /* ---------------------------------------------------- */ /* Generated by Enterprise Architect Version 12.0 */ -/* Created On : 13-Sep-2017 2:15:44 PM */ +/* Created On : 14-Sep-2017 12:42:30 PM */ /* DBMS : SQLite */ /* ---------------------------------------------------- */ @@ -322,7 +322,6 @@ 'MacroStabilityInwardsFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, 'FailureMechanismEntityId' INTEGER NOT NULL, 'A' REAL NOT NULL, - 'B' REAL NOT NULL, 'SectionLength' REAL, 'StochasticSoilModelCollectionSourcePath' TEXT, 'SurfaceLineCollectionSourcePath' TEXT, Index: design/DatabaseDesign.eap =================================================================== diff -u -rd5d457c61d546522500542ac8fe3967882e0157e -r186010477a4482fc75d29ceef78f61840a98680e Binary files differ