Index: Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql =================================================================== diff -u -rf8d9feb1ef04c6ac0e066961f9cf5f63e2817a35 -r1ddc72e4a81ee005dc74dff30431913c20a85c94 --- Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql (.../DatabaseStructure18.1.sql) (revision f8d9feb1ef04c6ac0e066961f9cf5f63e2817a35) +++ Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql (.../DatabaseStructure18.1.sql) (revision 1ddc72e4a81ee005dc74dff30431913c20a85c94) @@ -1,6 +1,6 @@ /* ---------------------------------------------------- */ /* Generated by Enterprise Architect Version 12.0 */ -/* Created On : 04-Apr-2018 13:01:32 */ +/* Created On : 04-Apr-2018 15:56:50 */ /* DBMS : SQLite */ /* ---------------------------------------------------- */ @@ -813,8 +813,12 @@ 'HeightStructuresSectionResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, 'FailureMechanismSectionEntityId' INTEGER NOT NULL, 'HeightStructuresCalculationEntityId' INTEGER, - 'LayerOne' TINYINT (1) NOT NULL, -- Enum: 1 = NotAssessed, 2 = Sufficient, 3 = NoVerdict - 'LayerThree' REAL, + 'SimpleAssessmentResult' TINYINT (1) NOT NULL, -- Enum: 1 = None, 2 = NotApplicable, 3 = ProbabilityNegligible 4 = AssessFurther + 'DetailedAssessmentResult' TINYINT (1) NOT NULL, -- Enum: 1 = Probability 2 = NotAssessed + 'TailorMadeAssessmentResult' TINYINT (1) NOT NULL, -- Enum: 1 = None 2 = ProbabilityNegligible 3 = Probability 4 = NotAssessed + 'TailorMadeAssessmentProbability' REAL, + 'UseManualAssemblyProbability' TINYINT (1) NOT NULL, -- true or false + 'ManualAssemblyProbability' REAL, CONSTRAINT 'FK_HeightStructuresSectionResultEntity_FailureMechanismSectionEntity' FOREIGN KEY ('FailureMechanismSectionEntityId') REFERENCES 'FailureMechanismSectionEntity' ('FailureMechanismSectionEntityId') ON DELETE Cascade ON UPDATE Cascade, CONSTRAINT 'FK_HeightStructuresSectionResultEntity_HeightStructuresCalculationEntity' FOREIGN KEY ('HeightStructuresCalculationEntityId') REFERENCES 'HeightStructuresCalculationEntity' ('HeightStructuresCalculationEntityId') ON DELETE Set Null ON UPDATE Cascade ) Index: Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_17.3_18.1.sql =================================================================== diff -u -rfb71567a02e1ae551acf4279792e9a1d9dc317c5 -r1ddc72e4a81ee005dc74dff30431913c20a85c94 --- Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_17.3_18.1.sql (.../Migration_17.3_18.1.sql) (revision fb71567a02e1ae551acf4279792e9a1d9dc317c5) +++ Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_17.3_18.1.sql (.../Migration_17.3_18.1.sql) (revision 1ddc72e4a81ee005dc74dff30431913c20a85c94) @@ -81,7 +81,27 @@ [GeneralResultFaultTreeIllustrationPointEntityId], [Reliability] FROM [SOURCEPROJECT].HeightStructuresOutputEntity; -INSERT INTO HeightStructuresSectionResultEntity SELECT * FROM [SOURCEPROJECT].HeightStructuresSectionResultEntity; +INSERT INTO HeightStructuresSectionResultEntity ( + [HeightStructuresSectionResultEntityId], + [FailureMechanismSectionEntityId], + [HeightStructuresCalculationEntityId], + [SimpleAssessmentResult], + [DetailedAssessmentResult], + [TailorMadeAssessmentResult], + [TailorMadeAssessmentProbability], + [UseManualAssemblyProbability], + [ManualAssemblyProbability]) +SELECT + [HeightStructuresSectionResultEntityId], + [FailureMechanismSectionEntityId], + [HeightStructuresCalculationEntityId], + 1, + 1, + 1, + NULL, + 0, + NULL +FROM [SOURCEPROJECT].HeightStructuresSectionResultEntity; INSERT INTO HydraRingPreprocessorEntity SELECT * FROM [SOURCEPROJECT].HydraRingPreprocessorEntity; INSERT INTO HydraulicLocationEntity ( [HydraulicLocationEntityId], Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Ringtoets.rtd =================================================================== diff -u -rf8d9feb1ef04c6ac0e066961f9cf5f63e2817a35 -r1ddc72e4a81ee005dc74dff30431913c20a85c94 Binary files differ Index: build/DatabaseStructure.sql =================================================================== diff -u -rf8d9feb1ef04c6ac0e066961f9cf5f63e2817a35 -r1ddc72e4a81ee005dc74dff30431913c20a85c94 --- build/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision f8d9feb1ef04c6ac0e066961f9cf5f63e2817a35) +++ build/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 1ddc72e4a81ee005dc74dff30431913c20a85c94) @@ -1,6 +1,6 @@ /* ---------------------------------------------------- */ /* Generated by Enterprise Architect Version 12.0 */ -/* Created On : 04-Apr-2018 13:01:32 */ +/* Created On : 04-Apr-2018 15:56:50 */ /* DBMS : SQLite */ /* ---------------------------------------------------- */ @@ -813,8 +813,12 @@ 'HeightStructuresSectionResultEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, 'FailureMechanismSectionEntityId' INTEGER NOT NULL, 'HeightStructuresCalculationEntityId' INTEGER, - 'LayerOne' TINYINT (1) NOT NULL, -- Enum: 1 = NotAssessed, 2 = Sufficient, 3 = NoVerdict - 'LayerThree' REAL, + 'SimpleAssessmentResult' TINYINT (1) NOT NULL, -- Enum: 1 = None, 2 = NotApplicable, 3 = ProbabilityNegligible 4 = AssessFurther + 'DetailedAssessmentResult' TINYINT (1) NOT NULL, -- Enum: 1 = Probability 2 = NotAssessed + 'TailorMadeAssessmentResult' TINYINT (1) NOT NULL, -- Enum: 1 = None 2 = ProbabilityNegligible 3 = Probability 4 = NotAssessed + 'TailorMadeAssessmentProbability' REAL, + 'UseManualAssemblyProbability' TINYINT (1) NOT NULL, -- true or false + 'ManualAssemblyProbability' REAL, CONSTRAINT 'FK_HeightStructuresSectionResultEntity_FailureMechanismSectionEntity' FOREIGN KEY ('FailureMechanismSectionEntityId') REFERENCES 'FailureMechanismSectionEntity' ('FailureMechanismSectionEntityId') ON DELETE Cascade ON UPDATE Cascade, CONSTRAINT 'FK_HeightStructuresSectionResultEntity_HeightStructuresCalculationEntity' FOREIGN KEY ('HeightStructuresCalculationEntityId') REFERENCES 'HeightStructuresCalculationEntity' ('HeightStructuresCalculationEntityId') ON DELETE Set Null ON UPDATE Cascade ) Index: design/DatabaseDesign.eap =================================================================== diff -u -rf8d9feb1ef04c6ac0e066961f9cf5f63e2817a35 -r1ddc72e4a81ee005dc74dff30431913c20a85c94 Binary files differ