From c6726c4f3e6fc18116d1320207ad427478d0b64d Mon Sep 17 00:00:00 2001
From: Jonathan Jenne <j.jenne@digitaldata.works>
Date: Wed, 5 May 2021 15:01:41 +0200
Subject: [PATCH] Database: Add timeout option to all functions

---
 Modules.Database/MSSQLServer.vb | 40 ++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/Modules.Database/MSSQLServer.vb b/Modules.Database/MSSQLServer.vb
index 93bf5a68..3e9f5407 100644
--- a/Modules.Database/MSSQLServer.vb
+++ b/Modules.Database/MSSQLServer.vb
@@ -231,19 +231,19 @@ Public Class MSSQLServer
         End Using
     End Function
 
-    Public Function GetDatatable(SqlCommand As String, Transaction As SqlTransaction) As DataTable
+    Public Function GetDatatable(SqlCommand As String, Transaction As SqlTransaction, Optional Timeout As Integer = 120) As DataTable
         Using oSqlConnection = GetSQLConnection()
-            Return GetDatatableWithConnectionObject(SqlCommand, oSqlConnection, TransactionMode.ExternalTransaction, Transaction)
+            Return GetDatatableWithConnectionObject(SqlCommand, oSqlConnection, TransactionMode.ExternalTransaction, Transaction, Timeout)
         End Using
     End Function
 
-    Public Async Function GetDatatableAsync(SqlCommand As String) As Task(Of DataTable)
-        Return Await Task.Run(Function() GetDatatable(SqlCommand, _Timeout))
+    Public Async Function GetDatatableAsync(SqlCommand As String, Optional Timeout As Integer = 120) As Task(Of DataTable)
+        Return Await Task.Run(Function() GetDatatable(SqlCommand, Timeout))
     End Function
 
-    Public Function GetDatatableWithConnection(SqlCommand As String, ConnectionString As String) As DataTable
+    Public Function GetDatatableWithConnection(SqlCommand As String, ConnectionString As String, Optional Timeout As Integer = 120) As DataTable
         Using oConnection = GetConnection(ConnectionString)
-            Return GetDatatableWithConnectionObject(SqlCommand, oConnection)
+            Return GetDatatableWithConnectionObject(SqlCommand, oConnection, Timeout:=Timeout)
         End Using
     End Function
 
@@ -278,30 +278,30 @@ Public Class MSSQLServer
 
     Public Function ExecuteNonQuery(SQLCommand As String) As Boolean Implements IDatabase.ExecuteNonQuery
         Using oConnection = GetSQLConnection()
-            Return ExecuteNonQueryWithConnectionObject(SQLCommand, oConnection, TransactionMode.WithTransaction, Nothing, TIMEOUT_DEFAULT)
+            Return ExecuteNonQueryWithConnectionObject(SQLCommand, oConnection, TransactionMode.WithTransaction, Nothing, _Timeout)
         End Using
     End Function
 
     Public Function ExecuteNonQuery(SQLCommand As String, Timeout As Integer) As Boolean Implements IDatabase.ExecuteNonQuery
         Using oConnection = GetSQLConnection()
-            Return ExecuteNonQueryWithConnectionObject(SQLCommand, oConnection, TransactionMode.WithTransaction, Nothing, TIMEOUT_DEFAULT)
+            Return ExecuteNonQueryWithConnectionObject(SQLCommand, oConnection, TransactionMode.WithTransaction, Nothing, Timeout)
         End Using
     End Function
 
 
-    Public Function ExecuteNonQuery(SQLCommand As String, Transaction As SqlTransaction) As Boolean
+    Public Function ExecuteNonQuery(SQLCommand As String, Transaction As SqlTransaction, Optional Timeout As Integer = 120) As Boolean
         Using oConnection = GetSQLConnection()
-            Return ExecuteNonQueryWithConnectionObject(SQLCommand, oConnection, TransactionMode.ExternalTransaction, Transaction, TIMEOUT_DEFAULT)
+            Return ExecuteNonQueryWithConnectionObject(SQLCommand, oConnection, TransactionMode.ExternalTransaction, Transaction, Timeout)
         End Using
     End Function
 
-    Public Async Function ExecuteNonQueryAsync(SQLCommand As String) As Task(Of Boolean)
-        Return Await Task.Run(Function() ExecuteNonQuery(SQLCommand))
+    Public Async Function ExecuteNonQueryAsync(SQLCommand As String, Optional Timeout As Integer = 120) As Task(Of Boolean)
+        Return Await Task.Run(Function() ExecuteNonQuery(SQLCommand, Timeout))
     End Function
 
-    Public Function ExecuteNonQueryWithConnection(pSQLCommand As String, ConnString As String) As Boolean
+    Public Function ExecuteNonQueryWithConnection(pSQLCommand As String, ConnString As String, Optional Timeout As Integer = 120) As Boolean
         Using oConnection = GetConnection(ConnString)
-            Return ExecuteNonQueryWithConnectionObject(pSQLCommand, oConnection)
+            Return ExecuteNonQueryWithConnectionObject(pSQLCommand, oConnection, TransactionMode.WithTransaction, Nothing, Timeout)
         End Using
     End Function
 
@@ -342,19 +342,19 @@ Public Class MSSQLServer
         End Using
     End Function
 
-    Public Function GetScalarValue(SQLCommand As String, Transaction As SqlTransaction) As Object
+    Public Function GetScalarValue(SQLCommand As String, Transaction As SqlTransaction, Optional Timeout As Integer = 120) As Object
         Using oConnection = GetSQLConnection()
-            Return GetScalarValueWithConnectionObject(SQLCommand, oConnection, TransactionMode.ExternalTransaction, Transaction)
+            Return GetScalarValueWithConnectionObject(SQLCommand, oConnection, TransactionMode.ExternalTransaction, Transaction, Timeout)
         End Using
     End Function
 
-    Public Async Function GetScalarValueAsync(SQLQuery As String) As Task(Of Object)
-        Return Await Task.Run(Function() GetScalarValue(SQLQuery, _Timeout))
+    Public Async Function GetScalarValueAsync(SQLQuery As String, Optional Timeout As Integer = 120) As Task(Of Object)
+        Return Await Task.Run(Function() GetScalarValue(SQLQuery, Timeout))
     End Function
 
-    Public Function GetScalarValueWithConnection(SQLCommand As String, ConnectionString As String) As Object
+    Public Function GetScalarValueWithConnection(SQLCommand As String, ConnectionString As String, Optional Timeout As Integer = 120) As Object
         Using oConnection = GetConnection(ConnectionString)
-            Return GetScalarValueWithConnectionObject(SQLCommand, oConnection)
+            Return GetScalarValueWithConnectionObject(SQLCommand, oConnection, TransactionMode.WithTransaction, Nothing, Timeout)
         End Using
     End Function