Index: Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_17.1_17.2.sql =================================================================== diff -u -rc001c83924455e2040eda334a044058f64d0f800 -r3f43829cbe42bb1b252bcd8bddd65ca18fd6663e --- Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_17.1_17.2.sql (.../Migration_17.1_17.2.sql) (revision c001c83924455e2040eda334a044058f64d0f800) +++ Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_17.1_17.2.sql (.../Migration_17.1_17.2.sql) (revision 3f43829cbe42bb1b252bcd8bddd65ca18fd6663e) @@ -130,7 +130,7 @@ CASE WHEN Suffix THEN [Id] || SUBSTR(QUOTE(ZEROBLOB((SuffixPreLength + 1) / 2)), 3, SuffixPreLength) || Suffix ELSE [Id] END as [Id], - CASE WHEN Suffix THEN [Name] || '(' || Suffix || ')' ELSE [Name] END as [Name], + [Name], [Orientation], [BreakWaterType], [BreakWaterHeight], Index: Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_5_17.1.sql =================================================================== diff -u -r7a06f1ab0de1530807326298377072709f29a119 -r3f43829cbe42bb1b252bcd8bddd65ca18fd6663e --- Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_5_17.1.sql (.../Migration_5_17.1.sql) (revision 7a06f1ab0de1530807326298377072709f29a119) +++ Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_5_17.1.sql (.../Migration_5_17.1.sql) (revision 3f43829cbe42bb1b252bcd8bddd65ca18fd6663e) @@ -35,7 +35,7 @@ CASE WHEN Suffix THEN [Name] || SUBSTR(QUOTE(ZEROBLOB((SuffixPreLength + 1) / 2)), 3, SuffixPreLength) || Suffix ELSE [Name] END as [Id], - CASE WHEN Suffix THEN [Name] || '(' || Suffix || ')' ELSE [Name] END as [Name], + [Name], [Orientation], [BreakWaterType], [BreakWaterHeight], Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo171IntegrationTest.cs =================================================================== diff -u -r8ca3c7d528f90cf86971b25d37f133d365d288d7 -r3f43829cbe42bb1b252bcd8bddd65ca18fd6663e --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo171IntegrationTest.cs (.../MigrationTo171IntegrationTest.cs) (revision 8ca3c7d528f90cf86971b25d37f133d365d288d7) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo171IntegrationTest.cs (.../MigrationTo171IntegrationTest.cs) (revision 3f43829cbe42bb1b252bcd8bddd65ca18fd6663e) @@ -157,8 +157,8 @@ private static void AssertDikeProfiles(MigratedDatabaseReader reader) { const string validateDikeProfiles = - "SELECT COUNT(DISTINCT(Name)) = COUNT() " + - "AND COUNT(DISTINCT(Id)) = COUNT() FROM DikeProfileEntity " + + "SELECT COUNT(DISTINCT(Id)) = COUNT() " + + "FROM DikeProfileEntity " + "GROUP BY [FailureMechanismEntityId]"; reader.AssertReturnedDataIsValid(validateDikeProfiles); } Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo172IntegrationTest.cs =================================================================== diff -u -r638081278e33e132e3ffedd52fff0d6c00ab4728 -r3f43829cbe42bb1b252bcd8bddd65ca18fd6663e --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo172IntegrationTest.cs (.../MigrationTo172IntegrationTest.cs) (revision 638081278e33e132e3ffedd52fff0d6c00ab4728) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo172IntegrationTest.cs (.../MigrationTo172IntegrationTest.cs) (revision 3f43829cbe42bb1b252bcd8bddd65ca18fd6663e) @@ -286,15 +286,9 @@ private static void AssertForeshoreProfiles(MigratedDatabaseReader reader) { const string validateForeshoreProfiles = - "SELECT SUM([IsNotUnique]) = 0 " + - "FROM(" + - "SELECT " + - "CASE WHEN COUNT(DISTINCT([Name])) IS COUNT() " + - "AND " + - "COUNT(DISTINCT([Id])) IS COUNT() " + - "THEN 0 ELSE 1 END AS [IsNotUnique] " + + "SELECT COUNT(DISTINCT([Id])) IS COUNT() " + "FROM ForeshoreProfileEntity " + - "GROUP BY [FailureMechanismEntityId])"; + "GROUP BY [FailureMechanismEntityId]"; reader.AssertReturnedDataIsValid(validateForeshoreProfiles); }