From 91127d0143df23c35f4b4016674c34decac9dd5b Mon Sep 17 00:00:00 2001
From: Paul Welter <pwelter@loresoft.com>
Date: Thu, 19 Sep 2024 16:58:17 -0500
Subject: [PATCH] minor data merge extension

---
 .../Merge/DataMerge.cs                        |  4 ++--
 .../Merge/DataMergeExtensions.cs              | 19 +++++++++++++++++++
 .../Merge/IDataMerge.cs                       |  4 ++--
 src/FluentCommand/DataCommand.cs              |  2 +-
 src/FluentCommand/IDataCommand.cs             |  4 ++--
 5 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/src/FluentCommand.SqlServer/Merge/DataMerge.cs b/src/FluentCommand.SqlServer/Merge/DataMerge.cs
index 1c4ae51e..254b3ece 100644
--- a/src/FluentCommand.SqlServer/Merge/DataMerge.cs
+++ b/src/FluentCommand.SqlServer/Merge/DataMerge.cs
@@ -140,9 +140,9 @@ public IDataMerge Mode(DataMergeMode mergeMode)
     }
 
     /// <summary>
-    /// Sets the wait time before terminating the attempt to execute a command and generating an error.
+    /// Sets the wait time (in seconds) before terminating the attempt to execute the command and generating an error.
     /// </summary>
-    /// <param name="timeout">TThe time in seconds to wait for the command to execute.</param>
+    /// <param name="timeout">The time in seconds to wait for the command to execute.</param>
     /// A fluent <see langword="interface" /> to a <see cref="DataMerge " /> operation.
     public IDataMerge CommandTimeout(int timeout)
     {
diff --git a/src/FluentCommand.SqlServer/Merge/DataMergeExtensions.cs b/src/FluentCommand.SqlServer/Merge/DataMergeExtensions.cs
index 79d140eb..da04054e 100644
--- a/src/FluentCommand.SqlServer/Merge/DataMergeExtensions.cs
+++ b/src/FluentCommand.SqlServer/Merge/DataMergeExtensions.cs
@@ -46,4 +46,23 @@ public static IDataMerge MergeData(this IDataSession session, DataMergeDefinitio
     {
         return new DataMerge(session, mergeDefinition);
     }
+
+
+    /// <summary>
+    /// Sets the wait time before terminating the attempt to execute a command and generating an error.
+    /// </summary>
+    /// <param name="dataMerge">The <see cref="IDataMerge"/> for this extension method.</param>
+    /// <param name="timeSpan">The <see cref="TimeSpan"/> to wait for the command to execute.</param>
+    /// <returns>
+    /// A fluent <see langword="interface" /> to the data command.
+    /// </returns>
+    public static IDataMerge CommandTimeout(
+        this IDataMerge dataMerge,
+        TimeSpan timeSpan)
+    {
+        var timeout = Convert.ToInt32(timeSpan.TotalSeconds);
+        dataMerge.CommandTimeout(timeout);
+        return dataMerge;
+    }
+
 }
diff --git a/src/FluentCommand.SqlServer/Merge/IDataMerge.cs b/src/FluentCommand.SqlServer/Merge/IDataMerge.cs
index b3f85867..a0caddfd 100644
--- a/src/FluentCommand.SqlServer/Merge/IDataMerge.cs
+++ b/src/FluentCommand.SqlServer/Merge/IDataMerge.cs
@@ -81,9 +81,9 @@ public interface IDataMerge
     IDataMerge Mode(DataMergeMode mergeMode);
 
     /// <summary>
-    /// Sets the wait time before terminating the attempt to execute a command and generating an error.
+    /// Sets the wait time (in seconds) before terminating the attempt to execute the command and generating an error.
     /// </summary>
-    /// <param name="timeout">TThe time in seconds to wait for the command to execute.</param>
+    /// <param name="timeout">The time in seconds to wait for the command to execute.</param>
     /// A fluent <see langword="interface" /> to a <see cref="DataMerge " /> operation.
     IDataMerge CommandTimeout(int timeout);
 
diff --git a/src/FluentCommand/DataCommand.cs b/src/FluentCommand/DataCommand.cs
index 1284a7cf..af147e15 100644
--- a/src/FluentCommand/DataCommand.cs
+++ b/src/FluentCommand/DataCommand.cs
@@ -70,7 +70,7 @@ public IDataCommand StoredProcedure(string storedProcedure)
 
 
     /// <summary>
-    /// Sets the wait time before terminating the attempt to execute a command and generating an error.
+    /// Sets the wait time (in seconds) before terminating the attempt to execute the command and generating an error.
     /// </summary>
     /// <param name="timeout">The time, in seconds, to wait for the command to execute.</param>
     /// <returns>
diff --git a/src/FluentCommand/IDataCommand.cs b/src/FluentCommand/IDataCommand.cs
index 68f77e61..d70fae47 100644
--- a/src/FluentCommand/IDataCommand.cs
+++ b/src/FluentCommand/IDataCommand.cs
@@ -34,9 +34,9 @@ public interface IDataCommand : IDataQuery, IDataQueryAsync
 
 
     /// <summary>
-    /// Sets the wait time before terminating the attempt to execute a command and generating an error.
+    /// Sets the wait time (in seconds) before terminating the attempt to execute the command and generating an error.
     /// </summary>
-    /// <param name="timeout">TThe time in seconds to wait for the command to execute.</param>
+    /// <param name="timeout">The time in seconds to wait for the command to execute.</param>
     /// <returns>A fluent <see langword="interface"/> to the data command.</returns>
     IDataCommand CommandTimeout(int timeout);