Index: Ringtoets/Migration/src/Ringtoets.Migration.Core/EmbeddedResources/Migration_17.3_18.1.sql =================================================================== diff -u -r1b58b7f8bea0a6e73686b8030e6f765708df4aaf -ra07da8a3798f0133068d92fd697631c9ff8b2c0f --- Ringtoets/Migration/src/Ringtoets.Migration.Core/EmbeddedResources/Migration_17.3_18.1.sql (.../Migration_17.3_18.1.sql) (revision 1b58b7f8bea0a6e73686b8030e6f765708df4aaf) +++ Ringtoets/Migration/src/Ringtoets.Migration.Core/EmbeddedResources/Migration_17.3_18.1.sql (.../Migration_17.3_18.1.sql) (revision a07da8a3798f0133068d92fd697631c9ff8b2c0f) @@ -1949,6 +1949,81 @@ [LogMessage]) VALUES ("17.3", "18.1", "Gevolgen van de migratie van versie 17.3 naar versie 18.1:"); +CREATE TEMP TABLE TempLogOutputDeleted +( + 'NrDeleted' INTEGER NOT NULL +); + +INSERT INTO TempLogOutputDeleted SELECT COUNT() FROM [SOURCEPROJECT].ClosingStructuresOutputEntity; +INSERT INTO TempLogOutputDeleted SELECT COUNT() FROM [SOURCEPROJECT].DuneLocationOutputEntity; +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].GrassCoverErosionOutwardsHydraulicLocationOutputEntity; +INSERT INTO TempLogOutputDeleted SELECT COUNT() FROM [SOURCEPROJECT].GrassCoverErosionOutwardsWaveConditionsOutputEntity; +INSERT INTO TempLogOutputDeleted SELECT COUNT() FROM [SOURCEPROJECT].HeightStructuresOutputEntity; +INSERT INTO TempLogOutputDeleted SELECT COUNT() FROM [SOURCEPROJECT].HydraulicLocationOutputEntity; +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].MacroStabilityInwardsCalculationOutputEntity + WHERE MacroStabilityInwardsCalculationEntityId IN ( + SELECT MacroStabilityInwardsCalculationEntityId + FROM [SOURCEPROJECT].MacroStabilityInwardsCalculationEntity + WHERE UseAssessmentLevelManualInput IS 0 + ); +INSERT INTO TempLogOutputDeleted +SELECT COUNT() + FROM [SOURCEPROJECT].PipingCalculationOutputEntity + WHERE PipingCalculationEntityId IN ( + SELECT PipingCalculationEntityId + FROM [SOURCEPROJECT].PipingCalculationEntity + WHERE UseAssessmentLevelManualInput IS 0 + ); + +CREATE TEMP TABLE TempLogOutputRemaining +( + 'NrRemaining' INTEGER NOT NULL +); +INSERT INTO TempLogOutputRemaining +SELECT COUNT() + FROM [SOURCEPROJECT].MacroStabilityInwardsCalculationOutputEntity + WHERE MacroStabilityInwardsCalculationEntityId IN ( + SELECT MacroStabilityInwardsCalculationEntityId + FROM [SOURCEPROJECT].MacroStabilityInwardsCalculationEntity + WHERE UseAssessmentLevelManualInput IS 1 + ); +INSERT INTO TempLogOutputRemaining +SELECT COUNT() + FROM [SOURCEPROJECT].PipingCalculationOutputEntity + WHERE PipingCalculationEntityId IN ( + SELECT PipingCalculationEntityId + FROM [SOURCEPROJECT].PipingCalculationEntity + WHERE UseAssessmentLevelManualInput IS 1 + ); + +INSERT INTO [LOGDATABASE].MigrationLogEntity ( + [FromVersion], + [ToVersion], + [LogMessage]) +SELECT + "17.3", + "18.1", + CASE + WHEN [NrRemaining] > 0 + THEN "* Alle berekende resultaten zijn verwijderd, behalve die van het toetsspoor 'Piping' en 'Macrostabiliteit binnenwaarts' 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; + CREATE TEMP TABLE TempFailureMechanisms ( 'FailureMechanismType' INTEGER NOT NULL, Index: Ringtoets/Migration/test/Ringtoets.Migration.Core.Test/test-data/MigrationTestProject173.rtd =================================================================== diff -u -r5a740ab3ad2654ef7a892e85cc8f317ac9b3f986 -ra07da8a3798f0133068d92fd697631c9ff8b2c0f Binary files differ Index: Ringtoets/Migration/test/Ringtoets.Migration.Integration.Test/MigrationTo181IntegrationTest.cs =================================================================== diff -u -r1b58b7f8bea0a6e73686b8030e6f765708df4aaf -ra07da8a3798f0133068d92fd697631c9ff8b2c0f --- Ringtoets/Migration/test/Ringtoets.Migration.Integration.Test/MigrationTo181IntegrationTest.cs (.../MigrationTo181IntegrationTest.cs) (revision 1b58b7f8bea0a6e73686b8030e6f765708df4aaf) +++ Ringtoets/Migration/test/Ringtoets.Migration.Integration.Test/MigrationTo181IntegrationTest.cs (.../MigrationTo181IntegrationTest.cs) (revision a07da8a3798f0133068d92fd697631c9ff8b2c0f) @@ -489,13 +489,16 @@ { ReadOnlyCollection messages = reader.GetMigrationLogMessages(); - Assert.AreEqual(72, messages.Count); + Assert.AreEqual(73, messages.Count); var i = 0; MigrationLogTestHelper.AssertMigrationLogMessageEqual( new MigrationLogMessage("17.3", newVersion, "Gevolgen van de migratie van versie 17.3 naar versie 18.1:"), messages[i++]); - MigrationLogTestHelper.AssertMigrationLogMessageEqual( + new MigrationLogMessage("17.3", newVersion, "* Alle berekende resultaten zijn verwijderd, behalve die van het toetsspoor 'Piping' en 'Macrostabiliteit binnenwaarts' waarbij de waterstand handmatig is ingevuld."), + messages[i++]); + + MigrationLogTestHelper.AssertMigrationLogMessageEqual( new MigrationLogMessage("17.3", newVersion, "* Traject: 'assessmentSectionResults'"), messages[i++]); MigrationLogTestHelper.AssertMigrationLogMessageEqual(