Merge pull request #339 from VTJDailey/Issue_324

Allow timeout on data table Update commands

Author: vasily-kirichenko

src/SqlClient/DataTable.fs

@@ -39,7 +39,7 @@ type DataTable<'T when 'T :> DataRow>(selectCommand: SqlCommand, ?connectionStri
 
     member private this.IsDirectTable = this.TableName <> null
 
-    member this.Update(?connection, ?transaction, ?batchSize, ?continueUpdateOnError) = 
+    member this.Update(?connection, ?transaction, ?batchSize, ?continueUpdateOnError, ?timeout: TimeSpan) = 
         // not supported on all DataTable instances
         match selectCommand with
         | null -> failwith "This command wasn't constructed from SqlProgrammabilityProvider, call to Update is not supported."
@@ -56,6 +56,8 @@ type DataTable<'T when 'T :> DataRow>(selectCommand: SqlCommand, ?connectionStri
         use dataAdapter = new SqlDataAdapter(selectCommand)
         use commandBuilder = new SqlCommandBuilder(dataAdapter) 
         use __ = dataAdapter.RowUpdating.Subscribe(fun args ->
+            timeout |> Option.iter (fun x -> args.Command.CommandTimeout <- int x.TotalSeconds)
+
             if  args.Errors = null && args.StatementType = StatementType.Insert
                 && defaultArg batchSize dataAdapter.UpdateBatchSize = 1
             then 

tests/SqlClient.Tests/DataTablesTests.fs

@@ -216,6 +216,7 @@ type DataTablesTests() =
         let rowsInserted = t.Update(conn, tran)
         Assert.Equal(1, rowsInserted)
 
+
     [<Fact>]
     member __.SqlCommandTableUpdate() = 
         use cmd = 
@@ -229,6 +230,43 @@ type DataTablesTests() =
         row.ModifiedDate <- DateTime.Now.Date
         let rowsAffected = t.Update(conn, tran)
         Assert.Equal(1, rowsAffected)
+    
+    [<Fact(Skip = "Don't execute for usual runs. Too slow.")>]
+    member __.SqlCommandTable_RespectsTimeout() = 
+        let tbl = new AdventureWorksDataTables.Production.Tables.Location()
+
+        use conn = new SqlConnection(connectionString = adventureWorks)
+        conn.Open()
+        use tran = conn.BeginTransaction()
+    
+        tbl.AddRow("test", Some 12.12M, Some 23.23M, Some System.DateTime.UtcNow)
+        let rowcount = tbl.Update(connection = conn, transaction = tran, timeout = TimeSpan.FromSeconds(5.0))
+
+        let row = tbl.Rows |> Seq.head
+
+        row.Name <- "Slow Trigger"
+
+        let sw = new System.Diagnostics.Stopwatch()
+        sw.Start()
+
+        let mutable completed = false
+        try
+            let rowcount = tbl.Update(connection = conn, transaction = tran, timeout = TimeSpan.FromSeconds(5.0))
+            completed <- true
+        with
+        | ex ->
+            ()
+
+        sw.Stop()
+
+        if completed then
+            failwith "Update should not have completed.  Operation should have taken 15 seconds and timeout was set to 5 seconds."
+        else if sw.Elapsed.TotalSeconds > 6.0 then
+            failwith "Timeout was set to 5 seconds.  Operation should have failed earlier than this"
+        else if sw.Elapsed.TotalSeconds < 4.0 then
+            failwith "Timeout was set to 5 seconds.  Operation should have lasted longer than this.  The test may be set up incorrectly"
+
+
 
     [<Fact>]
     member __.NewRowAndBulkCopyWithTrsansactionScope() = 

tests/SqlClient.Tests/extensions.sql

@@ -72,6 +72,11 @@ IF OBJECT_ID(N'Sales.UnitedKingdomOrders') IS NOT NULL
 	DROP TABLE Sales.UnitedKingdomOrders
 GO
 
+--TRIGGERS
+IF OBJECT_ID(N'Production.tr_Location_Slow') IS NOT NULL
+	DROP TRIGGER Production.tr_Location_Slow
+GO
+
 -- SYNONYMs
 
 IF OBJECT_ID(N'HumanResources.GetContactInformation') IS NOT NULL
@@ -324,6 +329,18 @@ GO
 
 
 GO 
+
+--TRIGGERS
+CREATE TRIGGER Production.tr_Location_Slow ON Production.Location FOR UPDATE, DELETE
+AS
+	DECLARE @count int = (SELECT COUNT(*) FROM inserted WHERE Name = 'Slow Trigger')
+
+	IF @count > 0
+	BEGIN
+		WAITFOR DELAY '00:00:15'
+	END
+GO
+
 --SYNONYMS
 
 CREATE SYNONYM HumanResources.GetContactInformation FOR dbo.ufnGetContactInformation;