BulkMatch

phongnguyend · phongnguyend · commit bca61eb0be42 · 2025-10-26T13:10:06.000+07:00
diff --git a/src/EntityFrameworkCore.SqlServer.SimpleBulks.DbContextExtensionsTests/Database/Contact.cs b/src/EntityFrameworkCore.SqlServer.SimpleBulks.DbContextExtensionsTests/Database/Contact.cs
@@ -12,6 +12,10 @@ public class Contact
 
     public int Index { get; set; }
 
+    public Season? Season { get; set; }
+
+    public Season? SeasonAsString { get; set; }
+
     public Guid CustomerId { get; set; }
 
     public Customer Customer { get; set; }
diff --git a/src/EntityFrameworkCore.SqlServer.SimpleBulks.DbContextExtensionsTests/Database/Customer.cs b/src/EntityFrameworkCore.SqlServer.SimpleBulks.DbContextExtensionsTests/Database/Customer.cs
@@ -12,5 +12,9 @@ public class Customer
 
     public int Index { get; set; }
 
+    public Season? Season { get; set; }
+
+    public Season? SeasonAsString { get; set; }
+
     public ICollection<Contact> Contacts { get; set; }
 }
diff --git a/src/EntityFrameworkCore.SqlServer.SimpleBulks.DbContextExtensionsTests/Database/TestDbContext.cs b/src/EntityFrameworkCore.SqlServer.SimpleBulks.DbContextExtensionsTests/Database/TestDbContext.cs
@@ -46,8 +46,10 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
         modelBuilder.Entity<ConfigurationEntry>().Property(x => x.Key).HasColumnName("Key1");
 
         modelBuilder.Entity<Customer>().Property(x => x.Id).HasDefaultValueSql("newsequentialid()");
+        modelBuilder.Entity<Customer>().Property(x => x.SeasonAsString).HasConversion(v => v.ToString(), v => (Season)Enum.Parse(typeof(Season), v));
 
         modelBuilder.Entity<Contact>().Property(x => x.Id).HasDefaultValueSql("newsequentialid()");
+        modelBuilder.Entity<Contact>().Property(x => x.SeasonAsString).HasConversion(v => v.ToString(), v => (Season)Enum.Parse(typeof(Season), v));
 
         base.OnModelCreating(modelBuilder);
     }
diff --git a/src/EntityFrameworkCore.SqlServer.SimpleBulks.DbContextExtensionsTests/DbContextExtensions/BulkMatchAsyncTests.cs b/src/EntityFrameworkCore.SqlServer.SimpleBulks.DbContextExtensionsTests/DbContextExtensions/BulkMatchAsyncTests.cs
@@ -27,7 +27,9 @@ public BulkMatchAsyncTests(ITestOutputHelper output, SqlServerFixture fixture) :
                 FirstName = "FirstName " + i,
                 LastName = "LastName " + i,
                 Index = i,
-                CurrentCountryIsoCode = isoCodes[random.Next(isoCodes.Length)]
+                CurrentCountryIsoCode = isoCodes[random.Next(isoCodes.Length)],
+                Season = Season.Spring,
+                SeasonAsString = Season.Spring
             };
 
             customer.Contacts = new List<Contact>();
@@ -39,6 +41,8 @@ public BulkMatchAsyncTests(ITestOutputHelper output, SqlServerFixture fixture) :
                     EmailAddress = $"EmailAddress {i} - {j}",
                     PhoneNumber = $"PhoneNumber {i} - {j}",
                     CountryIsoCode = isoCodes[random.Next(isoCodes.Length)],
+                    Season = Season.Spring,
+                    SeasonAsString = Season.Spring,
                     Index = j,
                 });
             }
@@ -87,6 +91,8 @@ public async Task Bulk_Match_GetCustomersByIds_ReturnAllColumns()
             Assert.Equal(customers[i].FirstName, customersFromDb[i].FirstName);
             Assert.Equal(customers[i].LastName, customersFromDb[i].LastName);
             Assert.Equal(customers[i].Index, customersFromDb[i].Index);
+            Assert.Equal(customers[i].Season, customersFromDb[i].Season);
+            Assert.Equal(customers[i].SeasonAsString, customersFromDb[i].SeasonAsString);
         }
     }
 
@@ -147,6 +153,8 @@ public async Task Bulk_Match_GetContactsByCustomerIds_ReturnAllColumns()
             Assert.Equal(contactsInMemory[i].CountryIsoCode, contactsFromDb[i].CountryIsoCode);
             Assert.Equal(contactsInMemory[i].Index, contactsFromDb[i].Index);
             Assert.Equal(contactsInMemory[i].CustomerId, contactsFromDb[i].CustomerId);
+            Assert.Equal(contactsInMemory[i].Season, contactsFromDb[i].Season);
+            Assert.Equal(contactsInMemory[i].SeasonAsString, contactsFromDb[i].SeasonAsString);
         }
     }
 
@@ -210,6 +218,8 @@ public async Task Bulk_Match_GetDefaultContactsByCustomerIds_ReturnAllColumns()
             Assert.Equal(contactsInMemory[i].CountryIsoCode, contactsFromDb[i].CountryIsoCode);
             Assert.Equal(contactsInMemory[i].Index, contactsFromDb[i].Index);
             Assert.Equal(contactsInMemory[i].CustomerId, contactsFromDb[i].CustomerId);
+            Assert.Equal(contactsInMemory[i].Season, contactsFromDb[i].Season);
+            Assert.Equal(contactsInMemory[i].SeasonAsString, contactsFromDb[i].SeasonAsString);
         }
     }
 
diff --git a/src/EntityFrameworkCore.SqlServer.SimpleBulks.DbContextExtensionsTests/DbContextExtensions/BulkMatchTests.cs b/src/EntityFrameworkCore.SqlServer.SimpleBulks.DbContextExtensionsTests/DbContextExtensions/BulkMatchTests.cs
@@ -27,7 +27,9 @@ public BulkMatchTests(ITestOutputHelper output, SqlServerFixture fixture) : base
                 FirstName = "FirstName " + i,
                 LastName = "LastName " + i,
                 Index = i,
-                CurrentCountryIsoCode = isoCodes[random.Next(isoCodes.Length)]
+                CurrentCountryIsoCode = isoCodes[random.Next(isoCodes.Length)],
+                Season = Season.Spring,
+                SeasonAsString = Season.Spring
             };
 
             customer.Contacts = new List<Contact>();
@@ -39,6 +41,8 @@ public BulkMatchTests(ITestOutputHelper output, SqlServerFixture fixture) : base
                     EmailAddress = $"EmailAddress {i} - {j}",
                     PhoneNumber = $"PhoneNumber {i} - {j}",
                     CountryIsoCode = isoCodes[random.Next(isoCodes.Length)],
+                    Season = Season.Spring,
+                    SeasonAsString = Season.Spring,
                     Index = j,
                 });
             }
@@ -87,6 +91,8 @@ public void Bulk_Match_GetCustomersByIds_ReturnAllColumns()
             Assert.Equal(customers[i].FirstName, customersFromDb[i].FirstName);
             Assert.Equal(customers[i].LastName, customersFromDb[i].LastName);
             Assert.Equal(customers[i].Index, customersFromDb[i].Index);
+            Assert.Equal(customers[i].Season, customersFromDb[i].Season);
+            Assert.Equal(customers[i].SeasonAsString, customersFromDb[i].SeasonAsString);
         }
     }
 
@@ -147,6 +153,8 @@ public void Bulk_Match_GetContactsByCustomerIds_ReturnAllColumns()
             Assert.Equal(contactsInMemory[i].CountryIsoCode, contactsFromDb[i].CountryIsoCode);
             Assert.Equal(contactsInMemory[i].Index, contactsFromDb[i].Index);
             Assert.Equal(contactsInMemory[i].CustomerId, contactsFromDb[i].CustomerId);
+            Assert.Equal(contactsInMemory[i].Season, contactsFromDb[i].Season);
+            Assert.Equal(contactsInMemory[i].SeasonAsString, contactsFromDb[i].SeasonAsString);
         }
     }
 
@@ -210,6 +218,8 @@ public void Bulk_Match_GetDefaultContactsByCustomerIds_ReturnAllColumns()
             Assert.Equal(contactsInMemory[i].CountryIsoCode, contactsFromDb[i].CountryIsoCode);
             Assert.Equal(contactsInMemory[i].Index, contactsFromDb[i].Index);
             Assert.Equal(contactsInMemory[i].CustomerId, contactsFromDb[i].CustomerId);
+            Assert.Equal(contactsInMemory[i].Season, contactsFromDb[i].Season);
+            Assert.Equal(contactsInMemory[i].SeasonAsString, contactsFromDb[i].SeasonAsString);
         }
     }
 
diff --git a/src/EntityFrameworkCore.SqlServer.SimpleBulks/BulkMatch/BulkMatchBuilder.cs b/src/EntityFrameworkCore.SqlServer.SimpleBulks/BulkMatch/BulkMatchBuilder.cs
@@ -6,6 +6,7 @@
 using System.Data;
 using System.Linq;
 using System.Linq.Expressions;
+using System.Reflection;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -164,7 +165,7 @@ public List<T> Execute(IEnumerable<T> machedValues)
             {
                 if (!Equals(reader[prop.Name], DBNull.Value))
                 {
-                    prop.SetValue(obj, reader[prop.Name], null);
+                    prop.SetValue(obj, GetValue(prop, reader, _valueConverters), null);
                 }
             }
 
@@ -239,7 +240,7 @@ public async Task<List<T>> ExecuteAsync(IEnumerable<T> machedValues, Cancellatio
             {
                 if (!Equals(reader[prop.Name], DBNull.Value))
                 {
-                    prop.SetValue(obj, reader[prop.Name], null);
+                    prop.SetValue(obj, GetValue(prop, reader, _valueConverters), null);
                 }
             }
 
@@ -250,4 +251,19 @@ public async Task<List<T>> ExecuteAsync(IEnumerable<T> machedValues, Cancellatio
 
         return results;
     }
+
+    private static object GetValue(PropertyInfo property, SqlDataReader reader, IReadOnlyDictionary<string, ValueConverter> valueConverters)
+    {
+        if (valueConverters != null && valueConverters.TryGetValue(property.Name, out var converter))
+        {
+            return converter.ConvertFromProvider(reader[property.Name]);
+        }
+
+        var type = Nullable.GetUnderlyingType(property.PropertyType) ?? property.PropertyType;
+
+        var tempValue = reader[property.Name];
+        var value = type.IsEnum && tempValue != null ? Enum.Parse(type, tempValue.ToString()) : tempValue;
+
+        return value;
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -12,5 +12,9 @@ public class Customer`
`12`	`12`
`13`	`13`	`public int Index { get; set; }`
`14`	`14`
	`15`	`+ public Season? Season { get; set; }`
	`16`	`+`
	`17`	`+ public Season? SeasonAsString { get; set; }`
	`18`	`+`
`15`	`19`	`public ICollection<Contact> Contacts { get; set; }`
`16`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,8 +46,10 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)`
`46`	`46`	`modelBuilder.Entity<ConfigurationEntry>().Property(x => x.Key).HasColumnName("Key1");`
`47`	`47`
`48`	`48`	`modelBuilder.Entity<Customer>().Property(x => x.Id).HasDefaultValueSql("newsequentialid()");`
	`49`	`+ modelBuilder.Entity<Customer>().Property(x => x.SeasonAsString).HasConversion(v => v.ToString(), v => (Season)Enum.Parse(typeof(Season), v));`
`49`	`50`
`50`	`51`	`modelBuilder.Entity<Contact>().Property(x => x.Id).HasDefaultValueSql("newsequentialid()");`
	`52`	`+ modelBuilder.Entity<Contact>().Property(x => x.SeasonAsString).HasConversion(v => v.ToString(), v => (Season)Enum.Parse(typeof(Season), v));`
`51`	`53`
`52`	`54`	`base.OnModelCreating(modelBuilder);`
`53`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,9 @@ public BulkMatchAsyncTests(ITestOutputHelper output, SqlServerFixture fixture) :`
`27`	`27`	`FirstName = "FirstName " + i,`
`28`	`28`	`LastName = "LastName " + i,`
`29`	`29`	`Index = i,`
`30`		`- CurrentCountryIsoCode = isoCodes[random.Next(isoCodes.Length)]`
	`30`	`+ CurrentCountryIsoCode = isoCodes[random.Next(isoCodes.Length)],`
	`31`	`+ Season = Season.Spring,`
	`32`	`+ SeasonAsString = Season.Spring`
`31`	`33`	`};`
`32`	`34`
`33`	`35`	`customer.Contacts = new List<Contact>();`
`@@ -39,6 +41,8 @@ public BulkMatchAsyncTests(ITestOutputHelper output, SqlServerFixture fixture) :`
`39`	`41`	`EmailAddress = $"EmailAddress {i} - {j}",`
`40`	`42`	`PhoneNumber = $"PhoneNumber {i} - {j}",`
`41`	`43`	`CountryIsoCode = isoCodes[random.Next(isoCodes.Length)],`
	`44`	`+ Season = Season.Spring,`
	`45`	`+ SeasonAsString = Season.Spring,`
`42`	`46`	`Index = j,`
`43`	`47`	`});`
`44`	`48`	`}`
`@@ -87,6 +91,8 @@ public async Task Bulk_Match_GetCustomersByIds_ReturnAllColumns()`
`87`	`91`	`Assert.Equal(customers[i].FirstName, customersFromDb[i].FirstName);`
`88`	`92`	`Assert.Equal(customers[i].LastName, customersFromDb[i].LastName);`
`89`	`93`	`Assert.Equal(customers[i].Index, customersFromDb[i].Index);`
	`94`	`+ Assert.Equal(customers[i].Season, customersFromDb[i].Season);`
	`95`	`+ Assert.Equal(customers[i].SeasonAsString, customersFromDb[i].SeasonAsString);`
`90`	`96`	`}`
`91`	`97`	`}`
`92`	`98`
`@@ -147,6 +153,8 @@ public async Task Bulk_Match_GetContactsByCustomerIds_ReturnAllColumns()`
`147`	`153`	`Assert.Equal(contactsInMemory[i].CountryIsoCode, contactsFromDb[i].CountryIsoCode);`
`148`	`154`	`Assert.Equal(contactsInMemory[i].Index, contactsFromDb[i].Index);`
`149`	`155`	`Assert.Equal(contactsInMemory[i].CustomerId, contactsFromDb[i].CustomerId);`
	`156`	`+ Assert.Equal(contactsInMemory[i].Season, contactsFromDb[i].Season);`
	`157`	`+ Assert.Equal(contactsInMemory[i].SeasonAsString, contactsFromDb[i].SeasonAsString);`
`150`	`158`	`}`
`151`	`159`	`}`
`152`	`160`
`@@ -210,6 +218,8 @@ public async Task Bulk_Match_GetDefaultContactsByCustomerIds_ReturnAllColumns()`
`210`	`218`	`Assert.Equal(contactsInMemory[i].CountryIsoCode, contactsFromDb[i].CountryIsoCode);`
`211`	`219`	`Assert.Equal(contactsInMemory[i].Index, contactsFromDb[i].Index);`
`212`	`220`	`Assert.Equal(contactsInMemory[i].CustomerId, contactsFromDb[i].CustomerId);`
	`221`	`+ Assert.Equal(contactsInMemory[i].Season, contactsFromDb[i].Season);`
	`222`	`+ Assert.Equal(contactsInMemory[i].SeasonAsString, contactsFromDb[i].SeasonAsString);`
`213`	`223`	`}`
`214`	`224`	`}`
`215`	`225`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,9 @@ public BulkMatchTests(ITestOutputHelper output, SqlServerFixture fixture) : base`
`27`	`27`	`FirstName = "FirstName " + i,`
`28`	`28`	`LastName = "LastName " + i,`
`29`	`29`	`Index = i,`
`30`		`- CurrentCountryIsoCode = isoCodes[random.Next(isoCodes.Length)]`
	`30`	`+ CurrentCountryIsoCode = isoCodes[random.Next(isoCodes.Length)],`
	`31`	`+ Season = Season.Spring,`
	`32`	`+ SeasonAsString = Season.Spring`
`31`	`33`	`};`
`32`	`34`
`33`	`35`	`customer.Contacts = new List<Contact>();`
`@@ -39,6 +41,8 @@ public BulkMatchTests(ITestOutputHelper output, SqlServerFixture fixture) : base`
`39`	`41`	`EmailAddress = $"EmailAddress {i} - {j}",`
`40`	`42`	`PhoneNumber = $"PhoneNumber {i} - {j}",`
`41`	`43`	`CountryIsoCode = isoCodes[random.Next(isoCodes.Length)],`
	`44`	`+ Season = Season.Spring,`
	`45`	`+ SeasonAsString = Season.Spring,`
`42`	`46`	`Index = j,`
`43`	`47`	`});`
`44`	`48`	`}`
`@@ -87,6 +91,8 @@ public void Bulk_Match_GetCustomersByIds_ReturnAllColumns()`
`87`	`91`	`Assert.Equal(customers[i].FirstName, customersFromDb[i].FirstName);`
`88`	`92`	`Assert.Equal(customers[i].LastName, customersFromDb[i].LastName);`
`89`	`93`	`Assert.Equal(customers[i].Index, customersFromDb[i].Index);`
	`94`	`+ Assert.Equal(customers[i].Season, customersFromDb[i].Season);`
	`95`	`+ Assert.Equal(customers[i].SeasonAsString, customersFromDb[i].SeasonAsString);`
`90`	`96`	`}`
`91`	`97`	`}`
`92`	`98`
`@@ -147,6 +153,8 @@ public void Bulk_Match_GetContactsByCustomerIds_ReturnAllColumns()`
`147`	`153`	`Assert.Equal(contactsInMemory[i].CountryIsoCode, contactsFromDb[i].CountryIsoCode);`
`148`	`154`	`Assert.Equal(contactsInMemory[i].Index, contactsFromDb[i].Index);`
`149`	`155`	`Assert.Equal(contactsInMemory[i].CustomerId, contactsFromDb[i].CustomerId);`
	`156`	`+ Assert.Equal(contactsInMemory[i].Season, contactsFromDb[i].Season);`
	`157`	`+ Assert.Equal(contactsInMemory[i].SeasonAsString, contactsFromDb[i].SeasonAsString);`
`150`	`158`	`}`
`151`	`159`	`}`
`152`	`160`
`@@ -210,6 +218,8 @@ public void Bulk_Match_GetDefaultContactsByCustomerIds_ReturnAllColumns()`
`210`	`218`	`Assert.Equal(contactsInMemory[i].CountryIsoCode, contactsFromDb[i].CountryIsoCode);`
`211`	`219`	`Assert.Equal(contactsInMemory[i].Index, contactsFromDb[i].Index);`
`212`	`220`	`Assert.Equal(contactsInMemory[i].CustomerId, contactsFromDb[i].CustomerId);`
	`221`	`+ Assert.Equal(contactsInMemory[i].Season, contactsFromDb[i].Season);`
	`222`	`+ Assert.Equal(contactsInMemory[i].SeasonAsString, contactsFromDb[i].SeasonAsString);`
`213`	`223`	`}`
`214`	`224`	`}`
`215`	`225`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`using System.Data;`
`7`	`7`	`using System.Linq;`
`8`	`8`	`using System.Linq.Expressions;`
	`9`	`+using System.Reflection;`
`9`	`10`	`using System.Text;`
`10`	`11`	`using System.Threading;`
`11`	`12`	`using System.Threading.Tasks;`
`@@ -164,7 +165,7 @@ public List<T> Execute(IEnumerable<T> machedValues)`
`164`	`165`	`{`
`165`	`166`	`if (!Equals(reader[prop.Name], DBNull.Value))`
`166`	`167`	`{`
`167`		`- prop.SetValue(obj, reader[prop.Name], null);`
	`168`	`+ prop.SetValue(obj, GetValue(prop, reader, _valueConverters), null);`
`168`	`169`	`}`
`169`	`170`	`}`
`170`	`171`
`@@ -239,7 +240,7 @@ public async Task<List<T>> ExecuteAsync(IEnumerable<T> machedValues, Cancellatio`
`239`	`240`	`{`
`240`	`241`	`if (!Equals(reader[prop.Name], DBNull.Value))`
`241`	`242`	`{`
`242`		`- prop.SetValue(obj, reader[prop.Name], null);`
	`243`	`+ prop.SetValue(obj, GetValue(prop, reader, _valueConverters), null);`
`243`	`244`	`}`
`244`	`245`	`}`
`245`	`246`
`@@ -250,4 +251,19 @@ public async Task<List<T>> ExecuteAsync(IEnumerable<T> machedValues, Cancellatio`
`250`	`251`
`251`	`252`	`return results;`
`252`	`253`	`}`
	`254`	`+`
	`255`	`+ private static object GetValue(PropertyInfo property, SqlDataReader reader, IReadOnlyDictionary<string, ValueConverter> valueConverters)`
	`256`	`+ {`
	`257`	`+ if (valueConverters != null && valueConverters.TryGetValue(property.Name, out var converter))`
	`258`	`+ {`
	`259`	`+ return converter.ConvertFromProvider(reader[property.Name]);`
	`260`	`+ }`
	`261`	`+`
	`262`	`+ var type = Nullable.GetUnderlyingType(property.PropertyType) ?? property.PropertyType;`
	`263`	`+`
	`264`	`+ var tempValue = reader[property.Name];`
	`265`	`+ var value = type.IsEnum && tempValue != null ? Enum.Parse(type, tempValue.ToString()) : tempValue;`
	`266`	`+`
	`267`	`+ return value;`
	`268`	`+ }`
`253`	`269`	`}`