Index: Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/DatabaseStructure20.1.sql =================================================================== diff -u -rba7ff84332ea79528bc4d520e0356ce7aa5d8ce4 -rbef2bb5f1a8096d0b3a42d6b2d3bf4de35cf48c0 --- Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/DatabaseStructure20.1.sql (.../DatabaseStructure20.1.sql) (revision ba7ff84332ea79528bc4d520e0356ce7aa5d8ce4) +++ Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/DatabaseStructure20.1.sql (.../DatabaseStructure20.1.sql) (revision bef2bb5f1a8096d0b3a42d6b2d3bf4de35cf48c0) @@ -1,6 +1,6 @@ /* ---------------------------------------------------- */ /* Generated by Enterprise Architect Version 14.1 */ -/* Created On : 13-mei-2020 08:33:49 */ +/* Created On : 13-mei-2020 11:52:00 */ /* 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 No Action ON UPDATE No Action + CONSTRAINT 'FK_HydraulicLocationEntity_HydraulicBoundaryDatabaseEntity' FOREIGN KEY ('HydraulicBoundaryDatabaseEntityId') REFERENCES 'HydraulicBoundaryDatabaseEntity' ('HydraulicBoundaryDatabaseEntity') ON DELETE Cascade ON UPDATE Cascade ) ; @@ -840,7 +840,7 @@ ( 'DuneLocationEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, 'FailureMechanismEntityId' INTEGER NOT NULL, - 'LocationId' INTEGER NOT NULL, + 'HydraulicLocationEntityId' INTEGER NOT NULL, 'Name' VARCHAR (260) NOT NULL, 'LocationX' REAL NULL, 'LocationY' REAL NULL, @@ -849,7 +849,8 @@ 'Orientation' REAL NULL, 'D50' REAL NULL, 'Order' INT (4) NOT NULL, - CONSTRAINT 'FK_DuneLocationEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade + CONSTRAINT 'FK_DuneLocationEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade, + CONSTRAINT 'FK_DuneLocationEntity_HydraulicLocationEntity' FOREIGN KEY ('HydraulicLocationEntityId') REFERENCES 'HydraulicLocationEntity' ('HydraulicLocationEntityId') ON DELETE Cascade ON UPDATE Cascade ) ; @@ -2334,6 +2335,10 @@ ON 'DuneLocationEntity' ('FailureMechanismEntityId' ASC) ; +CREATE INDEX 'IXFK_DuneLocationEntity_HydraulicLocationEntity' + ON 'DuneLocationEntity' ('HydraulicLocationEntityId' ASC) +; + CREATE INDEX 'IXFK_FaultTreeIllustrationPoint_FaultTreeIllustrationPoint' ON 'FaultTreeIllustrationPointEntity' ('ParentFaultTreeIllustrationPointEntityId' ASC) ; Index: Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/Migration_19.1_20.1.sql =================================================================== diff -u -rba7ff84332ea79528bc4d520e0356ce7aa5d8ce4 -rbef2bb5f1a8096d0b3a42d6b2d3bf4de35cf48c0 --- Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/Migration_19.1_20.1.sql (.../Migration_19.1_20.1.sql) (revision ba7ff84332ea79528bc4d520e0356ce7aa5d8ce4) +++ Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/Migration_19.1_20.1.sql (.../Migration_19.1_20.1.sql) (revision bef2bb5f1a8096d0b3a42d6b2d3bf4de35cf48c0) @@ -23,7 +23,33 @@ INSERT INTO DuneLocationCalculationCollectionEntity SELECT * FROM [SOURCEPROJECT].DuneLocationCalculationCollectionEntity; INSERT INTO DuneLocationCalculationEntity SELECT * FROM [SOURCEPROJECT].DuneLocationCalculationEntity; INSERT INTO DuneLocationCalculationOutputEntity SELECT * FROM [SOURCEPROJECT].DuneLocationCalculationOutputEntity; -INSERT INTO DuneLocationEntity SELECT * FROM [SOURCEPROJECT].DuneLocationEntity; +INSERT INTO DuneLocationEntity ( + [DuneLocationEntityId], + [FailureMechanismEntityId], + [HydraulicLocationEntityId], + [Name], + [LocationX], + [LocationY], + [CoastalAreaId], + [Offset], + [Orientation], + [D50], + [Order]) +SELECT + [DuneLocationEntityId], + [FailureMechanismEntityId], + HLE.HydraulicLocationEntityId, + DLE.Name, + DLE.LocationX, + DLE.LocationY, + [CoastalAreaId], + [Offset], + [Orientation], + [D50], + DLE."Order" +FROM [SOURCEPROJECT].DuneLocationEntity DLE +JOIN [SOURCEPROJECT].HydraulicLocationEntity HLE +USING(locationId); INSERT INTO FailureMechanismEntity SELECT * FROM [SOURCEPROJECT].FailureMechanismEntity; INSERT INTO FailureMechanismSectionEntity SELECT * FROM [SOURCEPROJECT].FailureMechanismSectionEntity; INSERT INTO FaultTreeIllustrationPointEntity SELECT * FROM [SOURCEPROJECT].FaultTreeIllustrationPointEntity; Index: Riskeer/Migration/test/Riskeer.Migration.Core.Test/test-data/MigrationTestProject191.risk =================================================================== diff -u -rba7ff84332ea79528bc4d520e0356ce7aa5d8ce4 -rbef2bb5f1a8096d0b3a42d6b2d3bf4de35cf48c0 Binary files differ Index: Riskeer/Migration/test/Riskeer.Migration.Core.Test/test-data/MigrationTestProject201.risk =================================================================== diff -u -ra47a7d17dbc02b075847a5ce1997e19511bbd95c -rbef2bb5f1a8096d0b3a42d6b2d3bf4de35cf48c0 Binary files differ