Handle SmartEnum properties (#76)

* Update dependencies

* Handle converters returning value types (like with SmartEnum) - Fixes #74

Author: PhenX

src/PhenX.EntityFrameworkCore.BulkInsert/Metadata/PropertyAccessor.cs

@@ -64,7 +64,8 @@ internal static class PropertyAccessor
             // instance => converter(body)
             var invokeConverter = Expression.Invoke(converter, converterInput);
 
-            if (body.Type.IsClass)
+            // If the property is a reference type, we need to check for null before calling the converter
+            if (body.Type.IsClass && !invokeConverter.Type.IsValueType)
             {
                 // instance => body == null ? null : converter(body)
                 var nullCondition = Expression.Equal(body, Expression.Constant(null, body.Type));

tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/DbContext/TestDbContext.cs

@@ -1,6 +1,8 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
+using SmartEnum.EFCore;
+
 namespace PhenX.EntityFrameworkCore.BulkInsert.Tests.DbContext;
 
 public class TestDbContext : TestDbContextBase
@@ -11,13 +13,16 @@ public class TestDbContext : TestDbContextBase
     public DbSet<TestEntityWithGuidId> TestEntitiesWithGuidId { get; set; } = null!;
     public DbSet<TestEntityWithConverters> TestEntitiesWithConverter { get; set; } = null!;
     public DbSet<TestEntityWithComplexType> TestEntitiesWithComplexType { get; set; } = null!;
+    public DbSet<TestEntityWithSmartEnum> TestEntitiesWithSmartEnum { get; set; } = null!;
     public DbSet<Student> Students { get; set; } = null!;
     public DbSet<Course> Courses { get; set; } = null!;
 
     protected override void OnModelCreating(ModelBuilder modelBuilder)
     {
         base.OnModelCreating(modelBuilder);
 
+        modelBuilder.ConfigureSmartEnum();
+
         modelBuilder.Entity<TestEntityWithConverters>(builder =>
         {
             builder.Property(e => e.CreatedAt)

tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/DbContext/TestEntityWithSmartEnum.cs

@@ -0,0 +1,11 @@
+using Microsoft.EntityFrameworkCore;
+
+namespace PhenX.EntityFrameworkCore.BulkInsert.Tests.DbContext;
+
+[PrimaryKey(nameof(Id))]
+public class TestEntityWithSmartEnum : TestEntityBase
+{
+    public int Id { get; set; }
+
+    public TestSmartEnum Enum { get; set; } = null!;
+}

tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/DbContext/TestSmartEnum.cs

@@ -0,0 +1,12 @@
+using Ardalis.SmartEnum;
+
+namespace PhenX.EntityFrameworkCore.BulkInsert.Tests.DbContext;
+
+public class TestSmartEnum : SmartEnum<TestSmartEnum>
+{
+    private TestSmartEnum(string name, int value) : base(name, value)
+    {
+    }
+
+    public static readonly TestSmartEnum Value = new TestSmartEnum("test", 1);
+}

tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/PhenX.EntityFrameworkCore.BulkInsert.Tests.csproj

@@ -44,6 +44,10 @@
       <PackageReference Include="Pomelo.EntityFrameworkCore.MySql.NetTopologySuite" Version="9.0.0" />
     </ItemGroup>
 
+    <ItemGroup Label="Specific dependencies">
+      <PackageReference Include="Ardalis.SmartEnum.EFCore" Version="8.2.0" />
+    </ItemGroup>
+
     <ItemGroup>
       <ProjectReference Include="..\..\src\PhenX.EntityFrameworkCore.BulkInsert.MySql\PhenX.EntityFrameworkCore.BulkInsert.MySql.csproj" />
       <ProjectReference Include="..\..\src\PhenX.EntityFrameworkCore.BulkInsert.Oracle\PhenX.EntityFrameworkCore.BulkInsert.Oracle.csproj" />

tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/Tests/Various/VariousTestsBase.cs

@@ -0,0 +1,45 @@
+using FluentAssertions;
+
+using PhenX.EntityFrameworkCore.BulkInsert.Tests.DbContainer;
+using PhenX.EntityFrameworkCore.BulkInsert.Tests.DbContext;
+
+using Xunit;
+
+namespace PhenX.EntityFrameworkCore.BulkInsert.Tests.Tests.Various;
+
+public abstract class VariousTestsBase<TDbContext>(TestDbContainer dbContainer) : IAsyncLifetime
+    where TDbContext : TestDbContext, new()
+{
+    private readonly Guid _run = Guid.NewGuid();
+    private TDbContext _context = null!;
+
+    public async Task InitializeAsync()
+    {
+        _context = await dbContainer.CreateContextAsync<TDbContext>("various");
+    }
+
+    public Task DisposeAsync()
+    {
+        _context.Dispose();
+        return Task.CompletedTask;
+    }
+
+    [SkippableTheory]
+    [CombinatorialData]
+    public async Task InsertSmartEnumEntities(InsertStrategy strategy)
+    {
+        // Arrange
+        var entities = new List<TestEntityWithSmartEnum>
+        {
+            new TestEntityWithSmartEnum { TestRun = _run, Enum = TestSmartEnum.Value},
+            new TestEntityWithSmartEnum { TestRun = _run, Enum = TestSmartEnum.Value}
+        };
+
+        // Act
+        var insertedEntities = await _context.InsertWithStrategyAsync(strategy, entities);
+
+        // Assert
+        insertedEntities.Should().BeEquivalentTo(entities,
+            o => o.RespectingRuntimeTypes().Excluding(e => e.Id));
+    }
+}

tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/Tests/Various/VariousTestsMySql.cs

@@ -0,0 +1,12 @@
+using PhenX.EntityFrameworkCore.BulkInsert.Tests.DbContainer;
+using PhenX.EntityFrameworkCore.BulkInsert.Tests.DbContext;
+
+using Xunit;
+
+namespace PhenX.EntityFrameworkCore.BulkInsert.Tests.Tests.Various;
+
+[Trait("Category", "MySql")]
+[Collection(TestDbContainerMySqlCollection.Name)]
+public class VariousTestsMySql(TestDbContainerMySql dbContainer) : VariousTestsBase<TestDbContextMySql>(dbContainer)
+{
+}

tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/Tests/Various/VariousTestsOracle.cs

@@ -0,0 +1,12 @@
+using PhenX.EntityFrameworkCore.BulkInsert.Tests.DbContainer;
+using PhenX.EntityFrameworkCore.BulkInsert.Tests.DbContext;
+
+using Xunit;
+
+namespace PhenX.EntityFrameworkCore.BulkInsert.Tests.Tests.Various;
+
+[Trait("Category", "Oracle")]
+[Collection(TestDbContainerOracleCollection.Name)]
+public class VariousTestsOracle(TestDbContainerOracle dbContainer) : VariousTestsBase<TestDbContextOracle>(dbContainer)
+{
+}

tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/Tests/Various/VariousTestsPostgreSql.cs

@@ -0,0 +1,12 @@
+using PhenX.EntityFrameworkCore.BulkInsert.Tests.DbContainer;
+using PhenX.EntityFrameworkCore.BulkInsert.Tests.DbContext;
+
+using Xunit;
+
+namespace PhenX.EntityFrameworkCore.BulkInsert.Tests.Tests.Various;
+
+[Trait("Category", "PostgreSql")]
+[Collection(TestDbContainerPostgreSqlCollection.Name)]
+public class VariousTestsPostgreSql(TestDbContainerPostgreSql dbContainer) : VariousTestsBase<TestDbContextPostgreSql>(dbContainer)
+{
+}

tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/Tests/Various/VariousTestsSqlServer.cs

@@ -0,0 +1,12 @@
+using PhenX.EntityFrameworkCore.BulkInsert.Tests.DbContainer;
+using PhenX.EntityFrameworkCore.BulkInsert.Tests.DbContext;
+
+using Xunit;
+
+namespace PhenX.EntityFrameworkCore.BulkInsert.Tests.Tests.Various;
+
+[Trait("Category", "SqlServer")]
+[Collection(TestDbContainerSqlServerCollection.Name)]
+public class VariousTestsSqlServer(TestDbContainerSqlServer dbContainer) : VariousTestsBase<TestDbContextSqlServer>(dbContainer)
+{
+}