Ctor-Overload for SqlServerBulkInsertOrUpdateOptions to specify whether HoldLock is desired or not.

Author: PawelGerr

Directory.Build.props

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Copyright>(c) $([System.DateTime]::Now.Year), Pawel Gerr. All rights reserved.</Copyright>
-    <VersionPrefix>7.0.0</VersionPrefix>
+    <VersionPrefix>7.1.0</VersionPrefix>
     <Authors>Pawel Gerr</Authors>    
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageProjectUrl>https://dev.azure.com/pawelgerr/Thinktecture.EntityFrameworkCore</PackageProjectUrl>

src/Thinktecture.EntityFrameworkCore.SqlServer/EntityFrameworkCore/BulkOperations/SqlServerBulkInsertOrUpdateOptions.cs

@@ -22,11 +22,27 @@ public sealed class SqlServerBulkInsertOrUpdateOptions : ISqlServerMergeOperatio
    /// <inheritdoc />
    public SqlServerBulkOperationTempTableOptions TempTableOptions { get; }
 
+   /// <summary>
+   /// Initializes new instance of <see cref="SqlServerBulkUpdateOptions"/>.
+   /// </summary>
+   /// <param name="holdLockDuringMerge">Indication, whether the table hint <see cref="SqlServerTableHintLimited.HoldLock"/> should be used with 'MERGE' or not.</param>
+   public SqlServerBulkInsertOrUpdateOptions(bool holdLockDuringMerge)
+      : this(null, holdLockDuringMerge)
+   {
+   }
+
    /// <summary>
    /// Initializes new instance of <see cref="SqlServerBulkUpdateOptions"/>.
    /// </summary>
    /// <param name="optionsToInitializeFrom">Options to initialize from.</param>
    public SqlServerBulkInsertOrUpdateOptions(IBulkInsertOrUpdateOptions? optionsToInitializeFrom = null)
+      : this(optionsToInitializeFrom, optionsToInitializeFrom is null)
+   {
+   }
+
+   private SqlServerBulkInsertOrUpdateOptions(
+      IBulkInsertOrUpdateOptions? optionsToInitializeFrom,
+      bool holdLockDuringMerge)
    {
       if (optionsToInitializeFrom is not null)
       {
@@ -39,14 +55,20 @@ public SqlServerBulkInsertOrUpdateOptions(IBulkInsertOrUpdateOptions? optionsToI
       {
          TempTableOptions = new SqlServerBulkOperationTempTableOptions(mergeOptions.TempTableOptions);
          MergeTableHints = mergeOptions.MergeTableHints.ToList();
+
+         if (holdLockDuringMerge && !MergeTableHints.Contains(SqlServerTableHintLimited.HoldLock))
+            MergeTableHints.Add(SqlServerTableHintLimited.HoldLock);
       }
       else
       {
          TempTableOptions = new SqlServerBulkOperationTempTableOptions
                             {
                                SqlBulkCopyOptions = SqlBulkCopyOptions.KeepIdentity
                             };
-         MergeTableHints = new List<SqlServerTableHintLimited> { SqlServerTableHintLimited.HoldLock };
+         MergeTableHints = new List<SqlServerTableHintLimited>();
+
+         if (holdLockDuringMerge)
+            MergeTableHints.Add(SqlServerTableHintLimited.HoldLock);
       }
    }