Index: Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/DatabaseStructure20.1.sql =================================================================== diff -u -rbef2bb5f1a8096d0b3a42d6b2d3bf4de35cf48c0 -r52ed50fd70cfb78f356cba52e46eda9c03d26ec4 --- Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/DatabaseStructure20.1.sql (.../DatabaseStructure20.1.sql) (revision bef2bb5f1a8096d0b3a42d6b2d3bf4de35cf48c0) +++ Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/DatabaseStructure20.1.sql (.../DatabaseStructure20.1.sql) (revision 52ed50fd70cfb78f356cba52e46eda9c03d26ec4) @@ -1,6 +1,6 @@ /* ---------------------------------------------------- */ /* Generated by Enterprise Architect Version 14.1 */ -/* Created On : 13-mei-2020 11:52:00 */ +/* Created On : 13-mei-2020 14:49:44 */ /* DBMS : SQLite */ /* ---------------------------------------------------- */ @@ -419,7 +419,7 @@ 'LocationX' REAL NULL, 'LocationY' REAL NULL, 'Order' INT (4) NOT NULL, - CONSTRAINT 'FK_HydraulicLocationEntity_HydraulicBoundaryDatabaseEntity' FOREIGN KEY ('HydraulicBoundaryDatabaseEntityId') REFERENCES 'HydraulicBoundaryDatabaseEntity' ('HydraulicBoundaryDatabaseEntity') ON DELETE Cascade ON UPDATE Cascade + CONSTRAINT 'FK_HydraulicLocationEntity_HydraulicBoundaryDatabaseEntity' FOREIGN KEY ('HydraulicBoundaryDatabaseEntityId') REFERENCES 'HydraulicBoundaryDatabaseEntity' ('HydraulicBoundaryDatabaseEntityId') ON DELETE Cascade ON UPDATE Cascade ) ; @@ -1204,7 +1204,7 @@ CREATE TABLE 'HydraulicBoundaryDatabaseEntity' ( - 'HydraulicBoundaryDatabaseEntity' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + 'HydraulicBoundaryDatabaseEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, 'AssessmentSectionEntityId' INTEGER NOT NULL, 'Version' TEXT NOT NULL, 'FilePath' TEXT NOT NULL, Index: Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/Migration_19.1_20.1.sql =================================================================== diff -u -rbef2bb5f1a8096d0b3a42d6b2d3bf4de35cf48c0 -r52ed50fd70cfb78f356cba52e46eda9c03d26ec4 --- Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/Migration_19.1_20.1.sql (.../Migration_19.1_20.1.sql) (revision bef2bb5f1a8096d0b3a42d6b2d3bf4de35cf48c0) +++ Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/Migration_19.1_20.1.sql (.../Migration_19.1_20.1.sql) (revision 52ed50fd70cfb78f356cba52e46eda9c03d26ec4) @@ -77,7 +77,39 @@ INSERT INTO HeightStructuresFailureMechanismMetaEntity SELECT * FROM [SOURCEPROJECT].HeightStructuresFailureMechanismMetaEntity; INSERT INTO HeightStructuresOutputEntity SELECT * FROM [SOURCEPROJECT].HeightStructuresOutputEntity; INSERT INTO HeightStructuresSectionResultEntity SELECT * FROM [SOURCEPROJECT].HeightStructuresSectionResultEntity; -INSERT INTO HydraulicBoundaryDatabaseEntity SELECT * FROM [SOURCEPROJECT].HydraulicBoundaryDatabaseEntity; +INSERT INTO HydraulicBoundaryDatabaseEntity ( + [HydraulicBoundaryDatabaseEntityId], + [AssessmentSectionEntityId], + [Version], + [FilePath], + [HydraulicLocationConfigurationSettingsFilePath], + [HydraulicLocationConfigurationSettingsScenarioName], + [HydraulicLocationConfigurationSettingsYear], + [HydraulicLocationConfigurationSettingsScope], + [HydraulicLocationConfigurationSettingsUsePreprocessorClosure], + [HydraulicLocationConfigurationSettingsSeaLevel], + [HydraulicLocationConfigurationSettingsRiverDischarge], + [HydraulicLocationConfigurationSettingsLakeLevel], + [HydraulicLocationConfigurationSettingsWindDirection], + [HydraulicLocationConfigurationSettingsWindSpeed], + [HydraulicLocationConfigurationSettingsComment]) +SELECT + [HydraulicBoundaryDatabaseEntity], + [AssessmentSectionEntityId], + [Version], + [FilePath], + [HydraulicLocationConfigurationSettingsFilePath], + [HydraulicLocationConfigurationSettingsScenarioName], + [HydraulicLocationConfigurationSettingsYear], + [HydraulicLocationConfigurationSettingsScope], + [HydraulicLocationConfigurationSettingsUsePreprocessorClosure], + [HydraulicLocationConfigurationSettingsSeaLevel], + [HydraulicLocationConfigurationSettingsRiverDischarge], + [HydraulicLocationConfigurationSettingsLakeLevel], + [HydraulicLocationConfigurationSettingsWindDirection], + [HydraulicLocationConfigurationSettingsWindSpeed], + [HydraulicLocationConfigurationSettingsComment] +FROM [SOURCEPROJECT].HydraulicBoundaryDatabaseEntity; INSERT INTO HydraulicLocationCalculationCollectionEntity SELECT * FROM [SOURCEPROJECT].HydraulicLocationCalculationCollectionEntity; INSERT INTO HydraulicLocationCalculationEntity SELECT * FROM [SOURCEPROJECT].HydraulicLocationCalculationEntity; INSERT INTO HydraulicLocationEntity ( Index: Riskeer/Migration/test/Riskeer.Migration.Core.Test/test-data/MigrationTestProject201.risk =================================================================== diff -u -rbef2bb5f1a8096d0b3a42d6b2d3bf4de35cf48c0 -r52ed50fd70cfb78f356cba52e46eda9c03d26ec4 Binary files differ