From ddc11b62a536163fff8daa0b964d52bd31d210e6 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 24 Nov 2022 11:24:26 +0100 Subject: [PATCH] Database: Small stuff --- Database/Adapters/MSSQLServer.vb | 2 +- Database/Adapters/Oracle.vb | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Database/Adapters/MSSQLServer.vb b/Database/Adapters/MSSQLServer.vb index 8931c3ae..15af6912 100644 --- a/Database/Adapters/MSSQLServer.vb +++ b/Database/Adapters/MSSQLServer.vb @@ -437,7 +437,7 @@ Public Class MSSQLServer Return True Catch ex As Exception Logger.Error(ex) - Logger.Warn("ExecuteNonQueryWithConnectionObject: Error in ExecuteNonQueryWithConnectionObject while executing command: [{0}]-[{1}]", SqlCommand, SqlConnection.ConnectionString) + Logger.Warn("ExecuteNonQueryWithConnectionObject: Error in ExecuteNonQueryWithConnectionObject while executing command: [{0}]", pSqlCommandObject) Return False Finally MaybeCommitTransaction(oTransaction, pTransactionMode) diff --git a/Database/Adapters/Oracle.vb b/Database/Adapters/Oracle.vb index c87a62e6..7a442e37 100644 --- a/Database/Adapters/Oracle.vb +++ b/Database/Adapters/Oracle.vb @@ -127,7 +127,7 @@ Public Class Oracle End Try End Function - Public Function GetDatatable(pSQLCommand As String, pTimeout As Integer) As DataTable Implements IDatabase.GetDatatable + Public Function GetDatatable(pSQLCommand As String, Optional pTimeout As Integer = Constants.DEFAULT_TIMEOUT) As DataTable Implements IDatabase.GetDatatable Try Using oConnection = GetConnection(CurrentConnectionString) Dim oSQLCommand As OracleCommand @@ -151,8 +151,8 @@ Public Class Oracle End Try End Function - Private Function GetDatatable(pSQLCommand As String) As DataTable Implements IDatabase.GetDatatable - Return GetDatatable(pSQLCommand, _Timeout) + Public Function GetDatatable(SqlCommand As SqlClient.SqlCommand, Optional Timeout As Integer = 120) As DataTable Implements IDatabase.GetDatatable + Throw New NotImplementedException() End Function Public Function ExecuteNonQuery(pSQLCommand As String, pTimeout As Integer) As Boolean Implements IDatabase.ExecuteNonQuery @@ -250,4 +250,6 @@ Public Class Oracle Return "Invalid ConnectionString" End Try End Function + + End Class