Index: Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_17.1_17.2.sql
===================================================================
diff -u -r8a0dd3cd494c23f4801327565ddf5d774949e077 -r822454c220663c9f42d1293365eb8825ec197540
--- Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_17.1_17.2.sql	(.../Migration_17.1_17.2.sql)	(revision 8a0dd3cd494c23f4801327565ddf5d774949e077)
+++ Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_17.1_17.2.sql	(.../Migration_17.1_17.2.sql)	(revision 822454c220663c9f42d1293365eb8825ec197540)
@@ -78,7 +78,7 @@
 	[IdenticalApertures],
 	[FailureProbabilityReparation],
 	[InflowModelType]
-	FROM (SELECT *, MaxLength - LENGTH([Id]) AS SuffixPreLength, (SELECT count(*)
+	FROM (SELECT *, MaxLength - LENGTH([Id]) AS SuffixPreLength, (SELECT CS.rowid
                      FROM [SOURCEPROJECT].ClosingStructureEntity
                      WHERE CS.[ClosingStructureEntityId] > [ClosingStructureEntityId]
                      AND CS.[Id] IS [Id]
@@ -139,7 +139,7 @@
 	[Y],
 	[X0],
 	[Order]
-	FROM (SELECT *, MaxLength - LENGTH(NAME) as SuffixPreLength, (SELECT count(*)
+	FROM (SELECT *, MaxLength - LENGTH(NAME) as SuffixPreLength, (SELECT FS.rowid
                      FROM [SOURCEPROJECT].ForeshoreProfileEntity
                      WHERE FS.ForeshoreProfileEntityId > ForeshoreProfileEntityId
                      AND FS.Name IS Name
@@ -218,7 +218,7 @@
 	[StorageStructureAreaCoefficientOfVariation],
 	[AllowedLevelIncreaseStorageMean],
 	[AllowedLevelIncreaseStorageStandardDeviation]
-	FROM (SELECT *, MaxLength - LENGTH([Id]) AS SuffixPreLength, (SELECT count(*)
+	FROM (SELECT *, MaxLength - LENGTH([Id]) AS SuffixPreLength, (SELECT HS.rowid
                      FROM [SOURCEPROJECT].HeightStructureEntity
                      WHERE HS.[HeightStructureEntityId] > [HeightStructureEntityId]
                      AND HS.[Id] IS [Id]
@@ -390,7 +390,7 @@
 	[AreaFlowAperturesMean],
 	[AreaFlowAperturesStandardDeviation],
 	[InflowModelType]
-	FROM (SELECT *, MaxLength - LENGTH([Id]) AS SuffixPreLength, (SELECT count(*)
+	FROM (SELECT *, MaxLength - LENGTH([Id]) AS SuffixPreLength, (SELECT SPS.rowid
                      FROM [SOURCEPROJECT].StabilityPointStructureEntity
                      WHERE SPS.[StabilityPointStructureEntityId] > [StabilityPointStructureEntityId]
                      AND SPS.[Id] IS [Id]
Index: Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_5_17.1.sql
===================================================================
diff -u -rc6885703355a779ce8e72ecc99d75ac48836bf40 -r822454c220663c9f42d1293365eb8825ec197540
--- Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_5_17.1.sql	(.../Migration_5_17.1.sql)	(revision c6885703355a779ce8e72ecc99d75ac48836bf40)
+++ Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_5_17.1.sql	(.../Migration_5_17.1.sql)	(revision 822454c220663c9f42d1293365eb8825ec197540)
@@ -46,7 +46,7 @@
 	[Y],
 	[X0],
 	[Order]
-	FROM (SELECT *, MaxLength - LENGTH(NAME) as SuffixPreLength, (SELECT count(*)
+	FROM (SELECT *, MaxLength - LENGTH(NAME) as SuffixPreLength, (SELECT DP.rowid
                      FROM [SOURCEPROJECT].DikeProfileEntity
                      WHERE DP.DikeProfileEntityId > DikeProfileEntityId
                      AND DP.Name IS Name
Index: Application/Ringtoets/test/Application.Ringtoets.Migration.Core.Test/test-data/FullTestProject164.rtd
===================================================================
diff -u -rc6885703355a779ce8e72ecc99d75ac48836bf40 -r822454c220663c9f42d1293365eb8825ec197540
Binary files differ
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo171IntegrationTest.cs
===================================================================
diff -u -r46b7338e13e21b6517bc3a471d2fe41cff0b0935 -r822454c220663c9f42d1293365eb8825ec197540
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo171IntegrationTest.cs	(.../MigrationTo171IntegrationTest.cs)	(revision 46b7338e13e21b6517bc3a471d2fe41cff0b0935)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo171IntegrationTest.cs	(.../MigrationTo171IntegrationTest.cs)	(revision 822454c220663c9f42d1293365eb8825ec197540)
@@ -21,9 +21,7 @@
 
 using System.Collections.ObjectModel;
 using System.Data;
-using System.Data.SQLite;
 using Application.Ringtoets.Migration.Core;
-using Core.Common.Base.IO;
 using Core.Common.IO.Readers;
 using Core.Common.TestUtil;
 using NUnit.Framework;
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo172IntegrationTest.cs
===================================================================
diff -u -r46b7338e13e21b6517bc3a471d2fe41cff0b0935 -r822454c220663c9f42d1293365eb8825ec197540
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo172IntegrationTest.cs	(.../MigrationTo172IntegrationTest.cs)	(revision 46b7338e13e21b6517bc3a471d2fe41cff0b0935)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo172IntegrationTest.cs	(.../MigrationTo172IntegrationTest.cs)	(revision 822454c220663c9f42d1293365eb8825ec197540)
@@ -21,9 +21,7 @@
 
 using System.Collections.ObjectModel;
 using System.Data;
-using System.Data.SQLite;
 using Application.Ringtoets.Migration.Core;
-using Core.Common.Base.IO;
 using Core.Common.IO.Readers;
 using Core.Common.TestUtil;
 using NUnit.Framework;