Index: Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/Migration_19.1_20.1.sql =================================================================== diff -u -rbd1d7eb233cb8f3d16e6e2821e2904d590df274b -r974f29c4203cea08ee57be247e18f9eba0b9bd6e --- Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/Migration_19.1_20.1.sql (.../Migration_19.1_20.1.sql) (revision bd1d7eb233cb8f3d16e6e2821e2904d590df274b) +++ Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/Migration_19.1_20.1.sql (.../Migration_19.1_20.1.sql) (revision 974f29c4203cea08ee57be247e18f9eba0b9bd6e) @@ -464,7 +464,12 @@ [SellmeijerCreepCoefficient], [SellmeijerCriticalFall], [SellmeijerReducedFall] -FROM [SOURCEPROJECT].PipingCalculationOutputEntity; +FROM [SOURCEPROJECT].PipingCalculationOutputEntity +WHERE PipingCalculationEntityId IN ( + SELECT PipingCalculationEntityId + FROM [SOURCEPROJECT].PipingCalculationEntity + WHERE UseAssessmentLevelManualInput IS 1 + ); INSERT INTO PipingCharacteristicPointEntity SELECT * FROM [SOURCEPROJECT].PipingCharacteristicPointEntity; INSERT INTO PipingFailureMechanismMetaEntity SELECT * FROM [SOURCEPROJECT].PipingFailureMechanismMetaEntity; INSERT INTO PipingSectionResultEntity SELECT * FROM [SOURCEPROJECT].PipingSectionResultEntity; @@ -738,7 +743,7 @@ SELECT COUNT() FROM [SOURCEPROJECT].PipingCalculationOutputEntity JOIN [SOURCEPROJECT].PipingCalculationEntity USING(PipingCalculationEntityId) -WHERE UseAssessmentLevelManualInput = 1; +WHERE UseAssessmentLevelManualInput = 0; INSERT INTO [LOGDATABASE].MigrationLogEntity ( [FromVersion], @@ -747,7 +752,7 @@ SELECT "19.1", "20.1", - "* Alle berekende resultaten van het toetsspoor 'Piping' waarbij de waterstand handmatig is ingevuld zijn verwijderd." + "* Alle berekende resultaten van het toetsspoor 'Piping' zijn verwijderd, behalve die waarbij de waterstand handmatig is ingevuld." FROM TempLogOutputDeleted WHERE [NrDeleted] > 0 LIMIT 1; Index: Riskeer/Migration/test/Riskeer.Migration.Core.Test/test-data/MigrationTestProject191.risk =================================================================== diff -u -rab70956b184642e2345539dc2cb996dabc81be19 -r974f29c4203cea08ee57be247e18f9eba0b9bd6e Binary files differ Index: Riskeer/Migration/test/Riskeer.Migration.Integration.Test/MigrationTo201IntegrationTest.cs =================================================================== diff -u -rbd1d7eb233cb8f3d16e6e2821e2904d590df274b -r974f29c4203cea08ee57be247e18f9eba0b9bd6e --- Riskeer/Migration/test/Riskeer.Migration.Integration.Test/MigrationTo201IntegrationTest.cs (.../MigrationTo201IntegrationTest.cs) (revision bd1d7eb233cb8f3d16e6e2821e2904d590df274b) +++ Riskeer/Migration/test/Riskeer.Migration.Integration.Test/MigrationTo201IntegrationTest.cs (.../MigrationTo201IntegrationTest.cs) (revision 974f29c4203cea08ee57be247e18f9eba0b9bd6e) @@ -673,7 +673,8 @@ "SELECT COUNT() = " + "(" + "SELECT COUNT() " + - "FROM SOURCEPROJECT.PipingCalculationOutputEntity" + + "FROM SOURCEPROJECT.PipingCalculationOutputEntity " + + "WHERE PipingCalculationEntityId IN (SELECT PipingCalculationEntityId FROM SOURCEPROJECT.PipingCalculationEntity WHERE UseAssessmentLevelManualInput IS 1) " + ") " + "FROM SemiProbabilisticPipingCalculationOutputEntity NEW " + "JOIN SOURCEPROJECT.PipingCalculationOutputEntity OLD " + @@ -873,7 +874,7 @@ new MigrationLogMessage("19.1", newVersion, "* Alle berekende resultaten van het toetsspoor 'Macrostabiliteit binnenwaarts' zijn verwijderd."), messages[i++]); MigrationLogTestHelper.AssertMigrationLogMessageEqual( - new MigrationLogMessage("19.1", newVersion, "* Alle berekende resultaten van het toetsspoor 'Piping' waarbij de waterstand handmatig is ingevuld zijn verwijderd."), + new MigrationLogMessage("19.1", newVersion, "* Alle berekende resultaten van het toetsspoor 'Piping' zijn verwijderd, behalve die waarbij de waterstand handmatig is ingevuld."), messages[i]); } }