Merge branch 'releases/4.x.x'

Author: PawelGerr

src/Thinktecture.EntityFrameworkCore.BulkOperations/EntityFrameworkCore/BulkOperations/ExcludingEntityPropertiesProvider.cs

@@ -20,13 +20,14 @@ public IReadOnlyList<IProperty> GetPropertiesForTempTable(IEntityType entityType
 
    private IReadOnlyList<PropertyWithNavigations> Filter(IReadOnlyList<PropertyWithNavigations> properties)
    {
-      return properties.Where(p => _members.All(m => m != p.Property.PropertyInfo && m != p.Property.FieldInfo))
+      return properties.Where(p => _members.All(m => !m.IsEqualTo(p.Property.PropertyInfo)
+                                                     && !m.IsEqualTo(p.Property.FieldInfo)))
                        .ToList();
    }
 
    private IReadOnlyList<IProperty> Filter(IReadOnlyList<IProperty> properties)
    {
-      return properties.Where(p => _members.All(m => m != p.PropertyInfo && m != p.FieldInfo))
+      return properties.Where(p => _members.All(m => !m.IsEqualTo(p.PropertyInfo) && !m.IsEqualTo(p.FieldInfo)))
                        .ToList();
    }
 

src/Thinktecture.EntityFrameworkCore.BulkOperations/Extensions/BulkOperationsCollectionExtensions.cs

@@ -72,8 +72,8 @@ internal static IReadOnlyList<PropertyWithNavigations> ConvertToEntityProperties
 
    private static IProperty? FindProperty(IEntityType entityType, MemberInfo memberInfo)
    {
-      return entityType.GetProperties().FirstOrDefault(property => property.PropertyInfo?.MetadataToken == memberInfo.MetadataToken
-                                                                   || property.FieldInfo?.MetadataToken == memberInfo.MetadataToken);
+      return entityType.GetProperties().FirstOrDefault(property => memberInfo.IsEqualTo(property.PropertyInfo)
+                                                                   || memberInfo.IsEqualTo(property.FieldInfo));
    }
 
    private static INavigation? FindOwnedProperty(
@@ -82,7 +82,7 @@ internal static IReadOnlyList<PropertyWithNavigations> ConvertToEntityProperties
    {
       foreach (var ownedTypeNavi in entityType.GetOwnedTypesProperties(null)) // search for all owned properties, i.e., don't use "inlinedOwnTypes" from the caller
       {
-         if (ownedTypeNavi.PropertyInfo == memberInfo || ownedTypeNavi.FieldInfo == memberInfo)
+         if (memberInfo.IsEqualTo(ownedTypeNavi.PropertyInfo) || memberInfo.IsEqualTo(ownedTypeNavi.FieldInfo))
          {
             if (ownedTypeNavi.IsInlined())
                return ownedTypeNavi;

src/Thinktecture.EntityFrameworkCore.BulkOperations/Extensions/MemberInfoExtensions.cs

@@ -0,0 +1,15 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+namespace Thinktecture;
+
+internal static class MemberInfoExtensions
+{
+   [MethodImpl(MethodImplOptions.AggressiveInlining)]
+   public static bool IsEqualTo(this MemberInfo member, MemberInfo? other)
+   {
+      return other is not null
+             && member.MetadataToken == other.MetadataToken
+             && ReferenceEquals(member.Module, other.Module);
+   }
+}

tests/Thinktecture.EntityFrameworkCore.BulkOperations.Tests/EntityFrameworkCore/BulkOperations/PropertiesProviderTests/Exclude.cs

@@ -57,6 +57,21 @@ public void Should_extract_all_properties_besides_the_ones_specified_by_expressi
       properties.Should().NotContain(countProperty);
    }
 
+   [Fact]
+   public void Should_handle_properties_from_base_classes()
+   {
+      var entityType = GetEntityType<TestEntityWithBaseClass>();
+      var idProperty = entityType.FindProperty(nameof(TestEntityWithBaseClass.Id)) ?? throw new Exception("Property must no be null");
+      var baseProperty = entityType.FindProperty(nameof(TestEntityWithBaseClass.Base_A)) ?? throw new Exception("Property must no be null");
+
+      var propertiesProvider = IEntityPropertiesProvider.Exclude<TestEntityWithBaseClass>(entity => new { entity.Id, entity.Base_A });
+
+      var properties = propertiesProvider.GetPropertiesForTempTable(entityType);
+      properties.Should().HaveCount(entityType.GetProperties().Count() - 2);
+      properties.Should().NotContain(idProperty);
+      properties.Should().NotContain(baseProperty);
+   }
+
    private static IEntityType GetEntityType<T>()
    {
       var options = new DbContextOptionsBuilder<TestDbContext>().UseSqlite("DataSource=:memory:").Options;

tests/Thinktecture.EntityFrameworkCore.BulkOperations.Tests/EntityFrameworkCore/BulkOperations/PropertiesProviderTests/Include.cs

@@ -55,6 +55,21 @@ public void Should_extract_properties()
       properties.Should().Contain(countProperty);
    }
 
+   [Fact]
+   public void Should_handle_properties_from_base_classes()
+   {
+      var entityType = GetEntityType<TestEntityWithBaseClass>();
+      var idProperty = entityType.FindProperty(nameof(TestEntityWithBaseClass.Id)) ?? throw new Exception("Property must no be null");
+      var baseProperty = entityType.FindProperty(nameof(TestEntityWithBaseClass.Base_A)) ?? throw new Exception("Property must no be null");
+
+      var propertiesProvider = IEntityPropertiesProvider.Include<TestEntityWithBaseClass>(entity => new { entity.Id, entity.Base_A });
+
+      var properties = propertiesProvider.GetPropertiesForTempTable(entityType);
+      properties.Should().HaveCount(2);
+      properties.Should().Contain(idProperty);
+      properties.Should().Contain(baseProperty);
+   }
+
    private static IEntityType GetEntityType<T>()
    {
       var options = new DbContextOptionsBuilder<TestDbContext>().UseSqlite("DataSource=:memory:").Options;

tests/Thinktecture.EntityFrameworkCore.BulkOperations.Tests/TestDatabaseContext/TestDbContext.cs

@@ -16,5 +16,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
 
       modelBuilder.Entity<TestEntity>().Property(e => e.ConvertibleClass)
                   .HasConversion(c => c!.Key, k => new ConvertibleClass(k));
+
+      TestEntityWithBaseClass.Configure(modelBuilder);
    }
-}
+}

tests/Thinktecture.EntityFrameworkCore.BulkOperations.Tests/TestDatabaseContext/TestEntityBaseClass.cs

@@ -0,0 +1,8 @@
+namespace Thinktecture.TestDatabaseContext;
+
+#pragma warning disable 8618
+public class TestEntityBaseClass
+{
+   public string Base_A { get; set; }
+   public string Base_B { get; set; }
+}

tests/Thinktecture.EntityFrameworkCore.BulkOperations.Tests/TestDatabaseContext/TestEntityWithBaseClass.cs

@@ -0,0 +1,13 @@
+namespace Thinktecture.TestDatabaseContext;
+#pragma warning disable 8618
+
+public class TestEntityWithBaseClass : TestEntityBaseClass
+{
+   public Guid Id { get; set; }
+   public Guid Description { get; set; }
+
+   public static void Configure(ModelBuilder modelBuilder)
+   {
+      modelBuilder.Entity<TestEntityWithBaseClass>();
+   }
+}