Index: Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/Migration_22.1_23.1.sql =================================================================== diff -u -r9a179b5d2acd05b28a14e24a8417600f82d88fcd -r522e6cd3146d85f218e3a2b059f16da593127d48 --- Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/Migration_22.1_23.1.sql (.../Migration_22.1_23.1.sql) (revision 9a179b5d2acd05b28a14e24a8417600f82d88fcd) +++ Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/Migration_22.1_23.1.sql (.../Migration_22.1_23.1.sql) (revision 522e6cd3146d85f218e3a2b059f16da593127d48) @@ -38,7 +38,6 @@ INSERT INTO DuneErosionFailureMechanismMetaEntity SELECT * FROM [SOURCEPROJECT].DuneErosionFailureMechanismMetaEntity; INSERT INTO DuneLocationCalculationEntity SELECT * FROM [SOURCEPROJECT].DuneLocationCalculationEntity; INSERT INTO DuneLocationCalculationForTargetProbabilityCollectionEntity SELECT * FROM [SOURCEPROJECT].DuneLocationCalculationForTargetProbabilityCollectionEntity; -INSERT INTO DuneLocationCalculationOutputEntity SELECT * FROM [SOURCEPROJECT].DuneLocationCalculationOutputEntity; INSERT INTO DuneLocationEntity ( [DuneLocationEntityId], [HydraulicLocationEntityId], @@ -222,9 +221,72 @@ [LogMessage]) VALUES ("22.1", "23.1", "Gevolgen van de migratie van versie 22.1 naar versie 23.1:"); +CREATE TEMP TABLE TempLogOutputDeleted +( + 'NrDeleted' INTEGER NOT NULL +); + +INSERT INTO TempLogOutputDeleted SELECT COUNT() FROM [SOURCEPROJECT].HydraulicLocationOutputEntity; +INSERT INTO TempLogOutputDeleted SELECT COUNT() FROM [SOURCEPROJECT].ClosingStructuresOutputEntity; +INSERT INTO TempLogOutputDeleted SELECT COUNT() FROM [SOURCEPROJECT].DuneLocationCalculationOutputEntity; +INSERT INTO TempLogOutputDeleted SELECT COUNT() FROM [SOURCEPROJECT].GrassCoverErosionInwardsDikeHeightOutputEntity; +INSERT INTO TempLogOutputDeleted SELECT COUNT() FROM [SOURCEPROJECT].GrassCoverErosionInwardsOutputEntity; +INSERT INTO TempLogOutputDeleted SELECT COUNT() FROM [SOURCEPROJECT].GrassCoverErosionInwardsOvertoppingRateOutputEntity; +INSERT INTO TempLogOutputDeleted SELECT COUNT() FROM [SOURCEPROJECT].GrassCoverErosionOutwardsWaveConditionsOutputEntity; +INSERT INTO TempLogOutputDeleted SELECT COUNT() FROM [SOURCEPROJECT].HeightStructuresOutputEntity; +INSERT INTO TempLogOutputDeleted SELECT COUNT() FROM [SOURCEPROJECT].StabilityPointStructuresOutputEntity; +INSERT INTO TempLogOutputDeleted SELECT COUNT() FROM [SOURCEPROJECT].StabilityStoneCoverWaveConditionsOutputEntity; +INSERT INTO TempLogOutputDeleted SELECT COUNT() FROM [SOURCEPROJECT].WaveImpactAsphaltCoverWaveConditionsOutputEntity; +INSERT INTO TempLogOutputDeleted SELECT COUNT() FROM [SOURCEPROJECT].ProbabilisticPipingCalculationOutputEntity; +INSERT INTO TempLogOutputDeleted +SELECT COUNT() +FROM [SOURCEPROJECT].SemiProbabilisticPipingCalculationOutputEntity +JOIN [SOURCEPROJECT].SemiProbabilisticPipingCalculationEntity USING(SemiProbabilisticPipingCalculationEntityId) +WHERE UseAssessmentLevelManualInput = 0; +INSERT INTO TempLogOutputDeleted +SELECT COUNT() +FROM [SOURCEPROJECT].MacroStabilityInwardsCalculationOutputEntity +JOIN [SOURCEPROJECT].MacroStabilityInwardsCalculationEntity USING(MacroStabilityInwardsCalculationEntityId) +WHERE UseAssessmentLevelManualInput = 0; + +CREATE TEMP TABLE TempLogOutputRemaining +( + 'NrRemaining' INTEGER NOT NULL +); +INSERT INTO TempLogOutputRemaining +SELECT COUNT() +FROM [SOURCEPROJECT].SemiProbabilisticPipingCalculationOutputEntity +JOIN [SOURCEPROJECT].SemiProbabilisticPipingCalculationEntity USING(SemiProbabilisticPipingCalculationEntityId) +WHERE UseAssessmentLevelManualInput = 1; +INSERT INTO TempLogOutputRemaining +SELECT COUNT() +FROM [SOURCEPROJECT].MacroStabilityInwardsCalculationOutputEntity +JOIN [SOURCEPROJECT].MacroStabilityInwardsCalculationEntity USING(MacroStabilityInwardsCalculationEntityId) +WHERE UseAssessmentLevelManualInput = 1; + INSERT INTO [LOGDATABASE].MigrationLogEntity ( [FromVersion], [ToVersion], +[LogMessage]) +SELECT + "22.1", + "23.1", + CASE + WHEN [NrRemaining] > 0 + THEN "* Alle berekende resultaten zijn verwijderd, behalve die van het faalmechanisme 'Piping' en 'Macrostabiliteit Binnenwaards' waarbij de waterstand handmatig is ingevuld." + ELSE "* Alle berekende resultaten zijn verwijderd." + END +FROM TempLogOutputDeleted + LEFT JOIN TempLogOutputRemaining +WHERE [NrDeleted] > 0 + LIMIT 1; + +DROP TABLE TempLogOutputDeleted; +DROP TABLE TempLogOutputRemaining; + +INSERT INTO [LOGDATABASE].MigrationLogEntity ( + [FromVersion], + [ToVersion], [LogMessage]) SELECT "22.1", "23.1", Index: Riskeer/Migration/test/Riskeer.Migration.Core.Test/test-data/MigrationTestProject221DunesWithOutput.risk =================================================================== diff -u Binary files differ Index: Riskeer/Migration/test/Riskeer.Migration.Integration.Test/MigrationTo231IntegrationTest.cs =================================================================== diff -u -rc46f56b6d9c77e4390385790a9de62f058ec40d4 -r522e6cd3146d85f218e3a2b059f16da593127d48 --- Riskeer/Migration/test/Riskeer.Migration.Integration.Test/MigrationTo231IntegrationTest.cs (.../MigrationTo231IntegrationTest.cs) (revision c46f56b6d9c77e4390385790a9de62f058ec40d4) +++ Riskeer/Migration/test/Riskeer.Migration.Integration.Test/MigrationTo231IntegrationTest.cs (.../MigrationTo231IntegrationTest.cs) (revision 522e6cd3146d85f218e3a2b059f16da593127d48) @@ -97,6 +97,11 @@ { "Geen aanpassingen." }); + + yield return new TestCaseData("MigrationTestProject221DunesWithOutput.risk", new[] + { + "Alle berekende resultaten zijn verwijderd." + }); } private static void AssertDuneLocation(MigratedDatabaseReader reader, string sourceFilePath) @@ -471,7 +476,6 @@ "DuneErosionFailureMechanismMetaEntity", "DuneLocationCalculationEntity", "DuneLocationCalculationForTargetProbabilityCollectionEntity", - "DuneLocationCalculationOutputEntity", "FailureMechanismFailureMechanismSectionEntity", "FaultTreeIllustrationPointEntity", "FaultTreeIllustrationPointStochastEntity",