BulkMergeAsync Not Adding Default Value On Insert Or Updating Computed Column

N.EntityFrameworkCore.Extensions.Test/Data/Order.cs

@@ -13,6 +13,7 @@ public class Order
         public DateTime AddedDateTime { get; set; }
         public DateTime? ModifiedDateTime { get; set; }
         public DateTime DbAddedDateTime { get; set; }
+        public DateTime DbModifiedDateTime { get; set; }
         public bool? Trigger { get; set; }
         public bool Active { get; set; }
         public Order()

N.EntityFrameworkCore.Extensions.Test/Data/TestDbContext.cs

@@ -32,6 +32,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             modelBuilder.Entity<ProductWithComplexKey>().Property<Guid>("Key2").HasDefaultValueSql("newsequentialid()");
             modelBuilder.Entity<ProductWithComplexKey>().Property<Guid>("Key3").HasDefaultValueSql("newsequentialid()");
             modelBuilder.Entity<Order>().Property<DateTime>("DbAddedDateTime").HasDefaultValueSql("getdate()");
+            modelBuilder.Entity<Order>().Property<DateTime>("DbModifiedDateTime").HasComputedColumnSql("getdate()");
             modelBuilder.Entity<TpcPerson>().UseTpcMappingStrategy();
             modelBuilder.Entity<TpcCustomer>().ToTable("TpcCustomer");
             modelBuilder.Entity<TpcVendor>().ToTable("TpcVendor");

N.EntityFrameworkCore.Extensions.Test/DbContextExtensions/BulkInsert.cs

@@ -28,23 +28,6 @@ public void With_Complex_Key()
             Assert.IsTrue(newTotal - oldTotal == rowsInserted, "The new count minus the old count should match the number of rows inserted.");
         }
         [TestMethod]
-        public void With_Database_Generated_Column()
-        {
-            var dbContext = SetupDbContext(false);
-            var dbAddedDateTime = DateTime.Now;
-            var orders = new List<Order>();
-            for (int i = 0; i < 20000; i++)
-            {
-                orders.Add(new Order { Id = i, Price = 1.57M });
-            }
-            int oldTotal = dbContext.Orders.Where(o => o.Price <= 10).Count();
-            int rowsInserted = dbContext.BulkInsert(orders);
-            int newTotal = dbContext.Orders.Where(o => o.Price <= 10 && o.DbAddedDateTime > dbAddedDateTime).Count();
-
-            Assert.IsTrue(rowsInserted == orders.Count, "The number of rows inserted must match the count of order list");
-            Assert.IsTrue(newTotal - oldTotal == rowsInserted, "The new count minus the old count should match the number of rows inserted.");
-        }
-        [TestMethod]
         public void With_Default_Options()
         {
             var dbContext = SetupDbContext(false);
@@ -338,5 +321,39 @@ public void With_Options_InsertIfNotExists()
             Assert.IsTrue(rowsInserted == expectedRowsInserted, "The number of rows inserted must match the count of order list");
             Assert.IsTrue(newTotal - oldTotal == expectedRowsInserted, "The new count minus the old count should match the number of rows inserted.");
         }
+        [TestMethod]
+        public void With_ValueGenerated_Default()
+        {
+            var dbContext = SetupDbContext(false);
+            var nowDateTime = DateTime.Now;
+            var orders = new List<Order>();
+            for (int i = 0; i < 20000; i++)
+            {
+                orders.Add(new Order { Id = i, Price = 1.57M });
+            }
+            int oldTotal = dbContext.Orders.Where(o => o.Price <= 10).Count();
+            int rowsInserted = dbContext.BulkInsert(orders);
+            int newTotal = dbContext.Orders.Where(o => o.Price <= 10 && o.DbAddedDateTime > nowDateTime).Count();
+
+            Assert.IsTrue(rowsInserted == orders.Count, "The number of rows inserted must match the count of order list");
+            Assert.IsTrue(newTotal - oldTotal == rowsInserted, "The new count minus the old count should match the number of rows inserted.");
+        }
+        [TestMethod]
+        public void With_ValueGenerated_Computed()
+        {
+            var dbContext = SetupDbContext(false);
+            var nowDateTime = DateTime.Now;
+            var orders = new List<Order>();
+            for (int i = 0; i < 20000; i++)
+            {
+                orders.Add(new Order { Id = i, Price = 1.57M, DbModifiedDateTime = nowDateTime });
+            }
+            int oldTotal = dbContext.Orders.Where(o => o.Price <= 10).Count();
+            int rowsInserted = dbContext.BulkInsert(orders);
+            int newTotal = dbContext.Orders.Where(o => o.Price <= 10 && o.DbModifiedDateTime > nowDateTime).Count();
+
+            Assert.IsTrue(rowsInserted == orders.Count, "The number of rows inserted must match the count of order list");
+            Assert.IsTrue(newTotal - oldTotal == rowsInserted, "The new count minus the old count should match the number of rows inserted.");
+        }
     }
 }

N.EntityFrameworkCore.Extensions.Test/DbContextExtensions/BulkInsertAsync.cs

@@ -285,5 +285,39 @@ public async Task With_Options_InsertIfNotExists()
             Assert.IsTrue(rowsInserted == expectedRowsInserted, "The number of rows inserted must match the count of order list");
             Assert.IsTrue(newTotal - oldTotal == expectedRowsInserted, "The new count minus the old count should match the number of rows inserted.");
         }
+        [TestMethod]
+        public async Task With_ValueGenerated_Default()
+        {
+            var dbContext = SetupDbContext(false);
+            var nowDateTime = DateTime.Now;
+            var orders = new List<Order>();
+            for (int i = 0; i < 20000; i++)
+            {
+                orders.Add(new Order { Id = i, Price = 1.57M });
+            }
+            int oldTotal = dbContext.Orders.Where(o => o.Price <= 10).Count();
+            int rowsInserted = await dbContext.BulkInsertAsync(orders);
+            int newTotal = dbContext.Orders.Where(o => o.Price <= 10 && o.DbAddedDateTime > nowDateTime).Count();
+
+            Assert.IsTrue(rowsInserted == orders.Count, "The number of rows inserted must match the count of order list");
+            Assert.IsTrue(newTotal - oldTotal == rowsInserted, "The new count minus the old count should match the number of rows inserted.");
+        }
+        [TestMethod]
+        public async Task With_ValueGenerated_Computed()
+        {
+            var dbContext = SetupDbContext(false);
+            var nowDateTime = DateTime.Now;
+            var orders = new List<Order>();
+            for (int i = 0; i < 20000; i++)
+            {
+                orders.Add(new Order { Id = i, Price = 1.57M, DbModifiedDateTime = nowDateTime });
+            }
+            int oldTotal = dbContext.Orders.Where(o => o.Price <= 10).Count();
+            int rowsInserted = await dbContext.BulkInsertAsync(orders);
+            int newTotal = dbContext.Orders.Where(o => o.Price <= 10 && o.DbModifiedDateTime > nowDateTime).Count();
+
+            Assert.IsTrue(rowsInserted == orders.Count(), "The number of rows inserted must match the count of order list");
+            Assert.IsTrue(newTotal - oldTotal == rowsInserted, "The new count minus the old count should match the number of rows inserted.");
+        }
     }
 }

N.EntityFrameworkCore.Extensions.Test/DbContextExtensions/BulkMerge.cs

@@ -259,5 +259,40 @@ public void With_Transaction()
             Assert.IsTrue(ordersAdded == 0, "The number of rows added must equal 0 since transaction was rollbacked");
             Assert.IsTrue(ordersUpdated == 0, "The number of rows updated must equal 0 since transaction was rollbacked");
         }
+        [TestMethod]
+        public void With_ValueGenerated_Default()
+        {
+            var dbContext = SetupDbContext(false);
+            var nowDateTime = DateTime.Now;
+            var orders = new List<Order>();
+            for (int i = 0; i < 1000; i++)
+            {
+                orders.Add(new Order { Id = i, Price = 1.57M });
+            }
+            int oldTotal = dbContext.Orders.Where(o => o.DbAddedDateTime > nowDateTime).Count();
+            var mergeResult = dbContext.BulkMerge(orders);
+            int newTotal = dbContext.Orders.Where(o => o.Price <= 1.57M 
+                && o.DbAddedDateTime > nowDateTime).Count();
+
+            Assert.IsTrue(mergeResult.RowsInserted == orders.Count, "The number of rows inserted must match the count of order list");
+            Assert.IsTrue(newTotal - oldTotal == mergeResult.RowsInserted, "The new count minus the old count should match the number of rows inserted.");
+        }
+        [TestMethod]
+        public void With_ValueGenerated_Computed()
+        {
+            var dbContext = SetupDbContext(false);
+            var nowDateTime = DateTime.Now;
+            var orders = new List<Order>();
+            for (int i = 0; i < 20000; i++)
+            {
+                orders.Add(new Order { Id = i, Price = 1.57M, DbModifiedDateTime = nowDateTime });
+            }
+            int oldTotal = dbContext.Orders.Where(o => o.Price <= 10).Count();
+            var result = dbContext.BulkMerge(orders);
+            int newTotal = dbContext.Orders.Where(o => o.Price <= 10 && o.DbModifiedDateTime > nowDateTime).Count();
+
+            Assert.IsTrue(result.RowsInserted == orders.Count(), "The number of rows inserted must match the count of order list");
+            Assert.IsTrue(newTotal - oldTotal == result.RowsInserted, "The new count minus the old count should match the number of rows inserted.");
+        }
     }
 }

N.EntityFrameworkCore.Extensions.Test/DbContextExtensions/BulkMergeAsync.cs

@@ -260,5 +260,40 @@ public async Task With_Transaction()
             Assert.IsTrue(ordersAdded == 0, "The number of rows added must equal 0 since transaction was rollbacked");
             Assert.IsTrue(ordersUpdated == 0, "The number of rows updated must equal 0 since transaction was rollbacked");
         }
+        [TestMethod]
+        public async Task With_ValueGenerated_Default()
+        {
+            var dbContext = SetupDbContext(false);
+            var nowDateTime = DateTime.Now;
+            var orders = new List<Order>();
+            for (int i = 0; i < 1000; i++)
+            {
+                orders.Add(new Order { Id = i, Price = 1.57M });
+            }
+            int oldTotal = dbContext.Orders.Where(o => o.DbAddedDateTime > nowDateTime).Count();
+            var mergeResult = await dbContext.BulkMergeAsync(orders);
+            int newTotal = dbContext.Orders.Where(o => o.Price <= 1.57M
+                && o.DbAddedDateTime > nowDateTime).Count();
+
+            Assert.IsTrue(mergeResult.RowsInserted == orders.Count, "The number of rows inserted must match the count of order list");
+            Assert.IsTrue(newTotal - oldTotal == mergeResult.RowsInserted, "The new count minus the old count should match the number of rows inserted.");
+        }
+        [TestMethod]
+        public async Task With_ValueGenerated_Computed()
+        {
+            var dbContext = SetupDbContext(false);
+            var nowDateTime = DateTime.Now;
+            var orders = new List<Order>();
+            for (int i = 0; i < 20000; i++)
+            {
+                orders.Add(new Order { Id = i, Price = 1.57M, DbModifiedDateTime = nowDateTime });
+            }
+            int oldTotal = dbContext.Orders.Where(o => o.Price <= 10).Count();
+            var result = await dbContext.BulkMergeAsync(orders);
+            int newTotal = dbContext.Orders.Where(o => o.Price <= 10 && o.DbModifiedDateTime > nowDateTime).Count();
+
+            Assert.IsTrue(result.RowsInserted == orders.Count(), "The number of rows inserted must match the count of order list");
+            Assert.IsTrue(newTotal - oldTotal == result.RowsInserted, "The new count minus the old count should match the number of rows inserted.");
+        }
     }
-}
+}

N.EntityFrameworkCore.Extensions/Data/DbContextExtensions.cs

@@ -121,7 +121,7 @@
 
                     dbTransactionContext.Commit();
                 }
                 catch (Exception ex)
                 {
                     dbTransactionContext.Rollback();
                     throw;
@@ -324,22 +324,22 @@
         internal static void SetStoreGeneratedValues<T>(this DbContext context, T entity, List<IProperty> properties, object[] values)
         {
             int index = 0;
             var updateEntry = entity as InternalEntityEntry;
             if(updateEntry == null)
             {
                 var entry = context.Entry(entity);
                 updateEntry = entry.GetInfrastructure();
             }
 
             if(updateEntry != null)
             {
                 foreach(var property in properties)
                 {
                     updateEntry.SetStoreGeneratedValue(property, values[index]);
                     index++;
                 }
                 if(updateEntry.EntityState == EntityState.Detached)
                     updateEntry.AcceptChanges();
             }
             else
             {
@@ -408,10 +408,10 @@
         public static int BulkSaveChanges(this DbContext dbContext, bool acceptAllChangesOnSuccess=true)
         {
             int rowsAffected = 0;
             var stateManager = dbContext.ChangeTracker.GetPrivateFieldValue("StateManager") as StateManager;
 
             dbContext.ChangeTracker.DetectChanges();
             var entries = stateManager.GetEntriesToSave(true);
 
             foreach (var saveEntryGroup in entries.GroupBy(o => new { o.EntityType, o.EntityState }))
             {
@@ -466,16 +466,17 @@
                 {
                     string stagingTableName = CommonUtil.GetStagingTableName(tableMapping, options.UsePermanentTable, dbConnection);
                     string destinationTableName = string.Format("[{0}].[{1}]", tableMapping.Schema, tableMapping.TableName);
-                    string[] columnNames = tableMapping.GetColumns().ToArray();
+                    string[] stagingColumnNames = tableMapping.GetColumns(true).ToArray();
                     string[] primaryKeyColumnNames = tableMapping.GetPrimaryKeyColumns().ToArray();
                     IEnumerable<string> autoGeneratedColumnNames = options.AutoMapOutput ? tableMapping.GetAutoGeneratedColumns() : new string[] { };
 
                     if (primaryKeyColumnNames.Length == 0 && options.MergeOnCondition == null)
                         throw new InvalidDataException("BulkMerge requires that the entity have a primary key or the Options.MergeOnCondition must be set.");
 
-                    context.Database.CloneTable(destinationTableName, stagingTableName, null, Common.Constants.InternalId_ColumnName);
-                    var bulkInsertResult = BulkInsert(entities, options, tableMapping, dbConnection, transaction, stagingTableName, null, SqlBulkCopyOptions.KeepIdentity, true);
+                    context.Database.CloneTable(destinationTableName, stagingTableName, stagingColumnNames, Common.Constants.InternalId_ColumnName);
+                    var bulkInsertResult = BulkInsert(entities, options, tableMapping, dbConnection, transaction, stagingTableName, stagingColumnNames, SqlBulkCopyOptions.KeepIdentity, true);
 
+                    string[] columnNames = tableMapping.GetColumns().ToArray();
                     IEnumerable<string> columnsToInsert = CommonUtil.FormatColumns(columnNames.Where(o => !options.GetIgnoreColumnsOnInsert().Contains(o)));
                     IEnumerable<string> columnstoUpdate = CommonUtil.FormatColumns(columnNames.Where(o => !options.GetIgnoreColumnsOnUpdate().Contains(o))).Select(o => string.Format("t.{0}=s.{0}", o));
                     List<string> columnsToOutput = new List<string> { "$Action", string.Format("{0}.{1}", "s", Constants.InternalId_ColumnName) };

N.EntityFrameworkCore.Extensions/Data/DbContextExtensionsAsync.cs

@@ -262,10 +262,10 @@
         public async static Task<int> BulkSaveChangesAsync(this DbContext dbContext, bool acceptAllChangesOnSuccess = true)
         {
             int rowsAffected = 0;
             var stateManager = dbContext.ChangeTracker.GetPrivateFieldValue("StateManager") as StateManager;
 
             dbContext.ChangeTracker.DetectChanges();
             var entries = stateManager.GetEntriesToSave(true);
 
             foreach (var saveEntryGroup in entries.GroupBy(o => new { o.EntityType, o.EntityState }))
             {
@@ -320,16 +320,17 @@
                 {
                     string stagingTableName = CommonUtil.GetStagingTableName(tableMapping, options.UsePermanentTable, dbConnection);
                     string destinationTableName = string.Format("[{0}].[{1}]", tableMapping.Schema, tableMapping.TableName);
-                    string[] columnNames = tableMapping.GetColumns().ToArray();
+                    string[] stagingColumnNames = tableMapping.GetColumns(true).ToArray();
                     string[] primaryKeyColumnNames = tableMapping.GetPrimaryKeyColumns().ToArray();
                     IEnumerable<string> autoGeneratedColumnNames = options.AutoMapOutput ? tableMapping.GetAutoGeneratedColumns() : new string[] { };
 
                     if (primaryKeyColumnNames.Length == 0 && options.MergeOnCondition == null)
                         throw new InvalidDataException("BulkMerge requires that the entity have a primary key or the Options.MergeOnCondition must be set.");
 
-                    await context.Database.CloneTableAsync(destinationTableName, stagingTableName, null, Common.Constants.InternalId_ColumnName, cancellationToken);
-                    var bulkInsertResult = await BulkInsertAsync(entities, options, tableMapping, dbConnection, transaction, stagingTableName, null, SqlBulkCopyOptions.KeepIdentity, true, cancellationToken);
+                    await context.Database.CloneTableAsync(destinationTableName, stagingTableName, stagingColumnNames, Common.Constants.InternalId_ColumnName, cancellationToken);
+                    var bulkInsertResult = await BulkInsertAsync(entities, options, tableMapping, dbConnection, transaction, stagingTableName, stagingColumnNames, SqlBulkCopyOptions.KeepIdentity, true, cancellationToken);
 
+                    string[] columnNames = tableMapping.GetColumns().ToArray();
                     IEnumerable<string> columnsToInsert = CommonUtil.FormatColumns(columnNames.Where(o => !options.GetIgnoreColumnsOnInsert().Contains(o)));
                     IEnumerable<string> columnstoUpdate = CommonUtil.FormatColumns(columnNames.Where(o => !options.GetIgnoreColumnsOnUpdate().Contains(o))).Select(o => string.Format("t.{0}=s.{0}", o));
                     List<string> columnsToOutput = new List<string> { "$Action", string.Format("{0}.{1}", "s", Constants.InternalId_ColumnName) };

N.EntityFrameworkCore.Extensions/N.EntityFrameworkCore.Extensions.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <Version>7.0.13.0</Version>
+    <Version>7.0.13.2</Version>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageProjectUrl>https://github.com/NorthernLight1/N.EntityFrameworkCore.Extensions/</PackageProjectUrl>
     <Authors>Northern25</Authors>