diff --git a/Database/Adapters/MSSQLServer.vb b/Database/Adapters/MSSQLServer.vb
index c6695542..d3e4d02f 100644
--- a/Database/Adapters/MSSQLServer.vb
+++ b/Database/Adapters/MSSQLServer.vb
@@ -340,7 +340,7 @@ Public Class MSSQLServer
pSqlCommandObject.CommandTimeout = pTimeout
Using oAdapter As New SqlDataAdapter(pSqlCommandObject)
- Logger.Debug("GetDatatableWithConnectionObject: Running Query [{0}]", pSqlCommandObject.CommandText)
+ Logger.Debug("GetDatatableWithConnectionObject: Running Query [{0}] and Parameters [{1}]", pSqlCommandObject.CommandText, GetParameterListAsString(pSqlCommandObject))
oAdapter.Fill(oTable)
End Using
@@ -427,7 +427,7 @@ Public Class MSSQLServer
Dim oTransaction As SqlTransaction = MaybeGetTransaction(pSqlConnection, pTransactionMode, pTransaction)
Try
- Logger.Debug("ExecuteNonQueryWithConnectionObject: Running Command [{0}]", pSqlCommandObject.CommandText)
+ Logger.Debug("ExecuteNonQueryWithConnectionObject: Running Command [{0}] and Parameters [{1}]", pSqlCommandObject.CommandText, GetParameterListAsString(pSqlCommandObject))
pSqlCommandObject.Connection = pSqlConnection
pSqlCommandObject.Transaction = oTransaction
@@ -517,6 +517,9 @@ Public Class MSSQLServer
Dim oResult As Object = Nothing
Try
+
+ Logger.Debug("GetScalarValueWithConnectionObject: Running Query [{0}] with Parameters [{1}]", pSqlCommandObject, GetParameterListAsString(pSqlCommandObject))
+
pSqlCommandObject.Connection = pSqlConnection
pSqlCommandObject.CommandTimeout = pTimeout
pSqlCommandObject.Transaction = oTransaction
@@ -601,4 +604,13 @@ Public Class MSSQLServer
Dim res = command.EndExecuteNonQuery(result)
Logger.Info("Finished executing Async database operation: {0}", command.CommandText)
End Sub
+
+ Private Function GetParameterListAsString(pSQLCommand As SqlCommand) As String
+ Dim oList = pSQLCommand.Parameters.
+ Cast(Of SqlParameter).
+ Select(Function(p) $"({p.ParameterName}={p.Value})").
+ ToList()
+
+ Return String.Join(",", oList)
+ End Function
End Class
diff --git a/Database/Database.vbproj b/Database/Database.vbproj
index 74ade489..3327e3ea 100644
--- a/Database/Database.vbproj
+++ b/Database/Database.vbproj
@@ -99,7 +99,6 @@
-
diff --git a/Database/Helpers.vb b/Database/Helpers.vb
deleted file mode 100644
index 4d09d04b..00000000
--- a/Database/Helpers.vb
+++ /dev/null
@@ -1,10 +0,0 @@
-Public Class Helpers
-
- Public Shared Function MaybeEscapeSQLCommand(pSQLCommand As String) As String
-
-
-
- End Function
-
-
-End Class