From e152d3379f7cf86c36f17f6c90ad457aef04b4e2 Mon Sep 17 00:00:00 2001 From: Shay Rojansky Date: Sun, 18 Oct 2026 15:13:44 +0200 Subject: [PATCH 1/2] [10.0] Fix repeated seed-data updates for list properties Use the collection value comparer for key comparisons and adapt it to the collection CLR type. Add regression coverage for unchanged and modified lists and arrays. (cherry picked from commit 8fd65104ace6dd71a0659ff44229a40a38664f65) Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 8de9a5bf-c00a-4826-a1c5-3e046d378b1e --- .../Mapping/NpgsqlArrayTypeMapping.cs | 3 +- .../NpgsqlMigrationsModelDifferTest.cs | 51 +++++++++++++++++++ 2 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 test/EFCore.PG.Tests/Migrations/NpgsqlMigrationsModelDifferTest.cs diff --git a/src/EFCore.PG/Storage/Internal/Mapping/NpgsqlArrayTypeMapping.cs b/src/EFCore.PG/Storage/Internal/Mapping/NpgsqlArrayTypeMapping.cs index 275a24827..664355098 100644 --- a/src/EFCore.PG/Storage/Internal/Mapping/NpgsqlArrayTypeMapping.cs +++ b/src/EFCore.PG/Storage/Internal/Mapping/NpgsqlArrayTypeMapping.cs @@ -145,6 +145,7 @@ private static RelationalTypeMappingParameters CreateParameters(string storeType elementType.UnwrapNullableType() == typeof(object) ? elementMapping.Comparer.ComposeConversion(elementType)! : elementMapping.Comparer.ToNullableComparer(elementType)!); + comparer = comparer.ComposeConversion(typeof(TCollection)); #pragma warning restore EF1001 var elementJsonReaderWriter = elementMapping.JsonValueReaderWriter; @@ -184,7 +185,7 @@ private static RelationalTypeMappingParameters CreateParameters(string storeType return new RelationalTypeMappingParameters( new CoreTypeMappingParameters( - typeof(TCollection), converter, comparer, elementMapping: elementMapping, + typeof(TCollection), converter, comparer, keyComparer: comparer, elementMapping: elementMapping, jsonValueReaderWriter: collectionJsonReaderWriter), storeType); } diff --git a/test/EFCore.PG.Tests/Migrations/NpgsqlMigrationsModelDifferTest.cs b/test/EFCore.PG.Tests/Migrations/NpgsqlMigrationsModelDifferTest.cs new file mode 100644 index 000000000..97d7b9bd2 --- /dev/null +++ b/test/EFCore.PG.Tests/Migrations/NpgsqlMigrationsModelDifferTest.cs @@ -0,0 +1,51 @@ +namespace Npgsql.EntityFrameworkCore.PostgreSQL.Migrations; + +public class NpgsqlMigrationsModelDifferTest +{ + [Theory] + [InlineData(false, false)] + [InlineData(false, true)] + [InlineData(true, false)] + [InlineData(true, true)] + public void Seed_data_with_collection(bool array, bool changed) + { + using var source = new SeedContext(array, changed: false); + using var target = new SeedContext(array, changed); + var operations = target.GetService().GetDifferences( + source.GetService().Model.GetRelationalModel(), + target.GetService().Model.GetRelationalModel()); + + if (changed) + { + var operation = Assert.IsType(Assert.Single(operations)); + Assert.Equal("MyEntity", operation.Table); + Assert.Equal(["Id"], operation.KeyColumns); + Assert.Equal(1, operation.KeyValues[0, 0]); + Assert.Equal(["Tags"], operation.Columns); + Assert.Equal(["A", "B", "D"], Assert.IsAssignableFrom>(operation.Values[0, 0])); + } + else + { + Assert.Empty(operations); + } + } + + private class SeedContext(bool array, bool changed) : DbContext + { + protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder) + => optionsBuilder.UseNpgsql().EnableServiceProviderCaching(false); + + protected override void OnModelCreating(ModelBuilder modelBuilder) + { + string[] tags = ["A", "B", changed ? "D" : "C"]; + + modelBuilder.Entity( + "MyEntity", b => + { + b.Property("Id"); + b.Property(array ? typeof(string[]) : typeof(List), "Tags"); + b.HasData(new { Id = 1, Tags = array ? (object)tags : tags.ToList() }); + }); + } + } +} From 5275831ab7fa2d42905da5151dcb788a01066d63 Mon Sep 17 00:00:00 2001 From: Shay Rojansky Date: Sun, 18 Oct 2026 15:15:34 +0200 Subject: [PATCH 2/2] [10.0] Preserve structural element hashing for collection keys Construct collection key comparers from element key comparers rather than value comparers. Cover equal hashes for independently allocated binary arrays and lists. (cherry picked from commit cd7d820f8efb20f7e14a469cb393f776afc51a4b) Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 8de9a5bf-c00a-4826-a1c5-3e046d378b1e --- .../Mapping/NpgsqlArrayTypeMapping.cs | 38 +++++++++++-------- .../Storage/NpgsqlTypeMappingTest.cs | 18 +++++++++ 2 files changed, 40 insertions(+), 16 deletions(-) diff --git a/src/EFCore.PG/Storage/Internal/Mapping/NpgsqlArrayTypeMapping.cs b/src/EFCore.PG/Storage/Internal/Mapping/NpgsqlArrayTypeMapping.cs index 664355098..b5e965441 100644 --- a/src/EFCore.PG/Storage/Internal/Mapping/NpgsqlArrayTypeMapping.cs +++ b/src/EFCore.PG/Storage/Internal/Mapping/NpgsqlArrayTypeMapping.cs @@ -131,21 +131,27 @@ private static RelationalTypeMappingParameters CreateParameters(string storeType } #pragma warning disable EF1001 - var comparer = typeof(TCollection).IsArray && typeof(TCollection).GetArrayRank() > 1 - ? null // TODO: Value comparer for multidimensional arrays - : (ValueComparer?)Activator.CreateInstance( - elementType.IsNullableValueType() - || (elementType.IsValueType && elementMapping.Comparer.Type.IsNullableValueType()) - ? typeof(ListOfNullableValueTypesComparer<,>) - .MakeGenericType(typeof(TConcreteCollection), elementType.UnwrapNullableType()) - : elementType.IsValueType - ? typeof(ListOfValueTypesComparer<,>).MakeGenericType(typeof(TConcreteCollection), elementType) - : typeof(ListOfReferenceTypesComparer<,>).MakeGenericType(typeof(TConcreteCollection), elementType), - // ComposeConversion adapts a value comparer to object. Typed elements keep ToNullableComparer. - elementType.UnwrapNullableType() == typeof(object) - ? elementMapping.Comparer.ComposeConversion(elementType)! - : elementMapping.Comparer.ToNullableComparer(elementType)!); - comparer = comparer.ComposeConversion(typeof(TCollection)); + var comparer = CreateComparer(elementMapping.Comparer); + var keyComparer = CreateComparer(elementMapping.KeyComparer); + + ValueComparer? CreateComparer(ValueComparer elementComparer) + { + var collectionComparer = typeof(TCollection).IsArray && typeof(TCollection).GetArrayRank() > 1 + ? null // TODO: Value comparer for multidimensional arrays + : (ValueComparer?)Activator.CreateInstance( + elementType.IsNullableValueType() + || (elementType.IsValueType && elementComparer.Type.IsNullableValueType()) + ? typeof(ListOfNullableValueTypesComparer<,>) + .MakeGenericType(typeof(TConcreteCollection), elementType.UnwrapNullableType()) + : elementType.IsValueType + ? typeof(ListOfValueTypesComparer<,>).MakeGenericType(typeof(TConcreteCollection), elementType) + : typeof(ListOfReferenceTypesComparer<,>).MakeGenericType(typeof(TConcreteCollection), elementType), + // ComposeConversion adapts a value comparer to object. Typed elements keep ToNullableComparer. + elementType.UnwrapNullableType() == typeof(object) + ? elementComparer.ComposeConversion(elementType)! + : elementComparer.ToNullableComparer(elementType)!); + return collectionComparer.ComposeConversion(typeof(TCollection)); + } #pragma warning restore EF1001 var elementJsonReaderWriter = elementMapping.JsonValueReaderWriter; @@ -185,7 +191,7 @@ private static RelationalTypeMappingParameters CreateParameters(string storeType return new RelationalTypeMappingParameters( new CoreTypeMappingParameters( - typeof(TCollection), converter, comparer, keyComparer: comparer, elementMapping: elementMapping, + typeof(TCollection), converter, comparer, keyComparer: keyComparer, elementMapping: elementMapping, jsonValueReaderWriter: collectionJsonReaderWriter), storeType); } diff --git a/test/EFCore.PG.Tests/Storage/NpgsqlTypeMappingTest.cs b/test/EFCore.PG.Tests/Storage/NpgsqlTypeMappingTest.cs index 3c29ffc28..944148f5f 100644 --- a/test/EFCore.PG.Tests/Storage/NpgsqlTypeMappingTest.cs +++ b/test/EFCore.PG.Tests/Storage/NpgsqlTypeMappingTest.cs @@ -585,6 +585,24 @@ public void GenerateSqlLiteral_returns_array_literal() public void GenerateSqlLiteral_returns_array_empty_literal() => Assert.Equal("ARRAY[]::smallint[]", GetMapping(typeof(short[])).GenerateSqlLiteral(Array.Empty())); + [Theory] + [InlineData(false)] + [InlineData(true)] + public void KeyComparer_binary_array(bool array) + { + byte[][] sourceArray = [[1, 2], [3, 4]]; + byte[][] equalArray = [[1, 2], [3, 4]]; + IList source = array ? sourceArray : sourceArray.ToList(); + IList equal = array ? equalArray : equalArray.ToList(); + var comparer = GetMapping(source.GetType()).KeyComparer; + + Assert.True(comparer.Equals(source, equal)); + Assert.Equal(comparer.GetHashCode(source), comparer.GetHashCode(equal)); + + equal[0][0] = 5; + Assert.False(comparer.Equals(source, equal)); + } + [Fact(Skip = "https://github.com/dotnet/efcore/pull/30939")] public void ValueComparer_int_array() {