Update DataMerge.cs

loresoft · Dec 6, 2022 · 4266442 · 4266442
1 parent 6aa819b
commit 4266442
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/src/FluentCommand.SqlServer/Merge/DataMerge.cs b/src/FluentCommand.SqlServer/Merge/DataMerge.cs
@@ -537,20 +537,23 @@ await bulkCopy
             }
 
             // run merge statement
-            using (var mergeCommand = _dataSession.Connection.CreateCommand())
-            {
-                mergeCommand.CommandText = mergeSql;
-                mergeCommand.CommandType = CommandType.Text;
-                mergeCommand.Transaction = sqlTransaction;
+            using var mergeCommand = _dataSession.Connection.CreateCommand();
 
-                // run merge with factory
-                await executeFactory(mergeCommand, cancellationToken)
-                    .ConfigureAwait(false);
-            }
+            mergeCommand.CommandText = mergeSql;
+            mergeCommand.CommandType = CommandType.Text;
+            mergeCommand.Transaction = sqlTransaction;
+
+            // run merge with factory
+            await executeFactory(mergeCommand, cancellationToken)
+                .ConfigureAwait(false);
         }
         finally
         {
+#if NETSTANDARD2_0
+            _dataSession.ReleaseConnection();
+#else
             await _dataSession.ReleaseConnectionAsync();
+#endif
         }
     }