Database: WIP Dispatcher

2022-09-27 15:00:27 +02:00
parent 790715d0a2
commit 2144d7e771
6 changed files with 329 additions and 103 deletions
--- a/Modules.Database/Adapters/MSSQLServer.vb
+++ b/Modules.Database/Adapters/MSSQLServer.vb
@@ -3,18 +3,16 @@ Imports System.Data.Common
 Imports System.Data.SqlClient
 Imports DigitalData.Modules.Encryption
 Imports DigitalData.Modules.Logging
+Imports DigitalData.Modules.Base

 Public Class MSSQLServer
    Implements IDatabase

-    Public DBInitialized As Boolean = False
-    Public CurrentSQLConnectionString As String = ""
+    Public Property DBInitialized As Boolean = False Implements IDatabase.DBInitialized
+    Public Property ConnectionString As String = "" Implements IDatabase.ConnectionString

-    Public Const TIMEOUT_DEFAULT As Integer = 120
-    Public Const TABLE_DEFAULT As String = "DDRESULT"
-
-    Private ReadOnly _Timeout As Integer
-    Private ReadOnly _Logger As Logger
+    Private ReadOnly QueryTimeout As Integer
+    Private ReadOnly Logger As Logger

    Public Enum TransactionMode
        <Description("Use no transaction, neither internal nor external")>
@@ -25,31 +23,29 @@ Public Class MSSQLServer
        WithTransaction
    End Enum

-    Public Sub New(LogConfig As LogConfig, ConnectionString As String, Optional Timeout As Integer = 120)
-        _Logger = LogConfig.GetLogger()
-        _Timeout = Timeout
-
-        CurrentSQLConnectionString = ConnectionString
+    Public Sub New(pLogConfig As LogConfig, pConnectionString As String, Optional pTimeout As Integer = Constants.DEFAULT_TIMEOUT)
+        Logger = pLogConfig.GetLogger()
+        QueryTimeout = pTimeout

        Try
            DBInitialized = TestCanConnect()
+            ConnectionString = pConnectionString
        Catch ex As Exception
            DBInitialized = False
-            _Logger.Error(ex)
+            Logger.Error(ex)
        End Try
    End Sub

-    Public Sub New(LogConfig As LogConfig, Server As String, Database As String, UserId As String, Password As String, Optional Timeout As Integer = 120)
-        _Logger = LogConfig.GetLogger()
-        _Timeout = Timeout
-
-        CurrentSQLConnectionString = GetConnectionString(Server, Database, UserId, Password)
+    Public Sub New(pLogConfig As LogConfig, Server As String, Database As String, UserId As String, Password As String, Optional Timeout As Integer = Constants.DEFAULT_TIMEOUT)
+        Logger = pLogConfig.GetLogger()
+        QueryTimeout = Timeout

        Try
            DBInitialized = TestCanConnect()
+            ConnectionString = GetConnectionString(Server, Database, UserId, Password)
        Catch ex As Exception
            DBInitialized = False
-            _Logger.Error(ex)
+            Logger.Error(ex)
        End Try
    End Sub

@@ -88,7 +84,7 @@ Public Class MSSQLServer
        Dim oConnectionStringBuilder As New SqlConnectionStringBuilder() With {
            .DataSource = Server,
            .InitialCatalog = Database,
-            .UserId = UserId,
+            .UserID = UserId,
            .Password = Password
        }

@@ -101,7 +97,7 @@ Public Class MSSQLServer
            Dim oConnection = GetSQLConnection()
            Return oConnection
        Catch ex As Exception
-            _Logger.Error(ex)
+            Logger.Error(ex)
            Return Nothing
        End Try
    End Function
@@ -133,7 +129,7 @@ Public Class MSSQLServer
                    Transaction.Commit()
                    Return True
                Catch ex As Exception
-                    _Logger.Error(ex)
+                    Logger.Error(ex)
                    Return False
                End Try
            Case Else
@@ -148,10 +144,10 @@ Public Class MSSQLServer
    Public Function Get_ConnectionStringforID(pConnectionId As Integer) As String
        Dim oConnectionString As String = String.Empty

-        _Logger.Debug("Getting ConnectionString for ConnectionId [{0}]", pConnectionId)
+        Logger.Debug("Getting ConnectionString for ConnectionId [{0}]", pConnectionId)

        If pConnectionId = 0 Then
-            _Logger.Warn("ConnectionId was 0. Falling back to default connection.")
+            Logger.Warn("ConnectionId was 0. Falling back to default connection.")
            Return String.Empty
        End If

@@ -181,17 +177,17 @@ Public Class MSSQLServer
                        End If

                    Case Else
-                        _Logger.Warn("Provider [{0}] not supported!", oProvider)
+                        Logger.Warn("Provider [{0}] not supported!", oProvider)

                End Select

            Else
-                _Logger.Warn("No entry for Connection-ID: [{0}] ", pConnectionId.ToString)
+                Logger.Warn("No entry for Connection-ID: [{0}] ", pConnectionId.ToString)
            End If

        Catch ex As Exception
-            _Logger.Error(ex)
-            _Logger.Warn("Error in Get_ConnectionStringforID")
+            Logger.Error(ex)
+            Logger.Warn("Error in Get_ConnectionStringforID")
        End Try

        Return DecryptConnectionString(oConnectionString)
@@ -199,12 +195,12 @@ Public Class MSSQLServer

    <DebuggerStepThrough()>
    Private Function TestCanConnect() As Boolean
-        Return TestCanConnect(CurrentSQLConnectionString)
+        Return TestCanConnect(ConnectionString)
    End Function

    Private Function TestCanConnect(ConnectionString As String) As Boolean
        Try
-            _Logger.Debug("Testing connection to [{0}]", MaskConnectionString(ConnectionString))
+            Logger.Debug("Testing connection to [{0}]", MaskConnectionString(ConnectionString))

            Dim oDecryptedConnectionString = DecryptConnectionString(ConnectionString)
            Dim oConnection As New SqlConnection(oDecryptedConnectionString)
@@ -212,7 +208,7 @@ Public Class MSSQLServer
            oConnection.Close()
            Return True
        Catch ex As Exception
-            _Logger.Error(ex)
+            Logger.Error(ex)
            Return False
        End Try
    End Function
@@ -220,17 +216,17 @@ Public Class MSSQLServer
    Private Function TestCanConnect(Connection As SqlConnection) As Boolean
        Try
            If Connection Is Nothing Then
-                _Logger.Warn("TestCanConnect: Connection is nothing!")
+                Logger.Warn("TestCanConnect: Connection is nothing!")
                Return False
            End If

-            _Logger.Debug("Testing connection to [{0}]", MaskConnectionString(Connection.ConnectionString))
+            Logger.Debug("Testing connection to [{0}]", MaskConnectionString(Connection.ConnectionString))

            OpenSQLConnection(Connection)
            Connection.Close()
            Return True
        Catch ex As Exception
-            _Logger.Error(ex)
+            Logger.Error(ex)
            Return False
        End Try
    End Function
@@ -250,7 +246,7 @@ Public Class MSSQLServer

    <DebuggerStepThrough()>
    Private Function GetSQLConnection() As SqlConnection
-        Return GetConnection(CurrentSQLConnectionString)
+        Return GetConnection(ConnectionString)
    End Function

    Private Function GetConnection(ConnectionString As String) As SqlConnection
@@ -259,11 +255,11 @@ Public Class MSSQLServer
            oConnection = OpenSQLConnection(oConnection)

            Dim oMaskedConnectionString = MaskConnectionString(ConnectionString)
-            _Logger.Debug("The Following Connection is open: {0}", oMaskedConnectionString)
+            Logger.Debug("The Following Connection is open: {0}", oMaskedConnectionString)

            Return oConnection
        Catch ex As Exception
-            _Logger.Error(ex)
+            Logger.Error(ex)

            Return Nothing
        End Try
@@ -280,14 +276,14 @@ Public Class MSSQLServer
            Dim oConnectionString = ConnectionString.Replace(oBuilder.Password, "XXXXX")
            Return oConnectionString
        Catch ex As Exception
-            _Logger.Error(ex)
+            Logger.Error(ex)
            Return "Invalid ConnectionString"
        End Try
    End Function

    '<DebuggerStepThrough()>
    Public Function GetDatatable(SqlCommand As String) As DataTable Implements IDatabase.GetDatatable
-        Return GetDatatable(SqlCommand, _Timeout)
+        Return GetDatatable(SqlCommand, QueryTimeout)
    End Function

    ''' <summary>
@@ -302,19 +298,19 @@ Public Class MSSQLServer
    End Function

    '<DebuggerStepThrough()>
-    Public Function GetDatatable(SqlCommand As String, Transaction As SqlTransaction, Optional Timeout As Integer = 120) As DataTable
+    Public Function GetDatatable(SqlCommand As String, Transaction As SqlTransaction, Optional Timeout As Integer = Constants.DEFAULT_TIMEOUT) As DataTable
        Using oSqlConnection = GetSQLConnection()
            Return GetDatatableWithConnectionObject(SqlCommand, oSqlConnection, TransactionMode.ExternalTransaction, Transaction, Timeout)
        End Using
    End Function

    '<DebuggerStepThrough()>
-    Public Async Function GetDatatableAsync(SqlCommand As String, Optional Timeout As Integer = 120) As Task(Of DataTable)
+    Public Async Function GetDatatableAsync(SqlCommand As String, Optional Timeout As Integer = Constants.DEFAULT_TIMEOUT) As Task(Of DataTable)
        Return Await Task.Run(Function() GetDatatable(SqlCommand, Timeout))
    End Function

    '<DebuggerStepThrough()>
-    Public Function GetDatatableWithConnection(SqlCommand As String, ConnectionString As String, Optional Timeout As Integer = 120) As DataTable
+    Public Function GetDatatableWithConnection(SqlCommand As String, ConnectionString As String, Optional Timeout As Integer = Constants.DEFAULT_TIMEOUT) As DataTable
        Using oConnection = GetConnection(ConnectionString)
            Return GetDatatableWithConnectionObject(SqlCommand, oConnection, Timeout:=Timeout)
        End Using
@@ -323,9 +319,9 @@ Public Class MSSQLServer
    Public Function GetDatatableWithConnectionObject(SqlCommand As String, SqlConnection As SqlConnection,
                                                     Optional TransactionMode As TransactionMode = TransactionMode.WithTransaction,
                                                     Optional Transaction As SqlTransaction = Nothing,
-                                                     Optional Timeout As Integer = 120) As DataTable
+                                                     Optional Timeout As Integer = Constants.DEFAULT_TIMEOUT) As DataTable
        Dim oTransaction As SqlTransaction = MaybeGetTransaction(SqlConnection, TransactionMode, Transaction)
-        Dim oTable As New DataTable() With {.TableName = TABLE_DEFAULT}
+        Dim oTable As New DataTable() With {.TableName = Constants.DEFAULT_TABLE}

        Try
            Dim oAdapter As New SqlDataAdapter(New SqlCommand With {
@@ -335,12 +331,12 @@ Public Class MSSQLServer
                .CommandTimeout = Timeout
            })

-            _Logger.Debug("GetDatatableWithConnectionObject: Running Query [{0}]", SqlCommand)
+            Logger.Debug("GetDatatableWithConnectionObject: Running Query [{0}]", SqlCommand)

            oAdapter.Fill(oTable)
        Catch ex As Exception
-            _Logger.Error(ex)
-            _Logger.Warn("GetDatatableWithConnectionObject: Error in GetDatatableWithConnection while executing command: [{0}]", SqlCommand)
+            Logger.Error(ex)
+            Logger.Warn("GetDatatableWithConnectionObject: Error in GetDatatableWithConnection while executing command: [{0}]", SqlCommand)
            Throw ex
        Finally
            MaybeCommitTransaction(oTransaction, TransactionMode)
@@ -352,7 +348,7 @@ Public Class MSSQLServer
    '<DebuggerStepThrough()>
    Public Function ExecuteNonQuery(SQLCommand As String) As Boolean Implements IDatabase.ExecuteNonQuery
        Using oConnection = GetSQLConnection()
-            Return ExecuteNonQueryWithConnectionObject(SQLCommand, oConnection, TransactionMode.WithTransaction, Nothing, _Timeout)
+            Return ExecuteNonQueryWithConnectionObject(SQLCommand, oConnection, TransactionMode.WithTransaction, Nothing, QueryTimeout)
        End Using
    End Function

@@ -364,19 +360,19 @@ Public Class MSSQLServer
    End Function

    '<DebuggerStepThrough()>
-    Public Function ExecuteNonQuery(SQLCommand As String, Transaction As SqlTransaction, Optional Timeout As Integer = 120) As Boolean
+    Public Function ExecuteNonQuery(SQLCommand As String, Transaction As SqlTransaction, Optional Timeout As Integer = Constants.DEFAULT_TIMEOUT) As Boolean
        Using oConnection = GetSQLConnection()
            Return ExecuteNonQueryWithConnectionObject(SQLCommand, Transaction.Connection, TransactionMode.ExternalTransaction, Transaction, Timeout)
        End Using
    End Function

    '<DebuggerStepThrough()>
-    Public Async Function ExecuteNonQueryAsync(SQLCommand As String, Optional Timeout As Integer = 120) As Task(Of Boolean)
+    Public Async Function ExecuteNonQueryAsync(SQLCommand As String, Optional Timeout As Integer = Constants.DEFAULT_TIMEOUT) As Task(Of Boolean)
        Return Await Task.Run(Function() ExecuteNonQuery(SQLCommand, Timeout))
    End Function

    '<DebuggerStepThrough()>
-    Public Function ExecuteNonQueryWithConnection(pSQLCommand As String, ConnString As String, Optional Timeout As Integer = 120) As Boolean
+    Public Function ExecuteNonQueryWithConnection(pSQLCommand As String, ConnString As String, Optional Timeout As Integer = Constants.DEFAULT_TIMEOUT) As Boolean
        Using oConnection = GetConnection(ConnString)
            Return ExecuteNonQueryWithConnectionObject(pSQLCommand, oConnection, TransactionMode.WithTransaction, Nothing, Timeout)
        End Using
@@ -385,11 +381,11 @@ Public Class MSSQLServer
    Public Function ExecuteNonQueryWithConnectionObject(SqlCommand As String, SqlConnection As SqlConnection,
                                                        Optional TransactionMode As TransactionMode = TransactionMode.WithTransaction,
                                                        Optional Transaction As SqlTransaction = Nothing,
-                                                        Optional Timeout As Integer = 120) As Boolean
+                                                        Optional Timeout As Integer = Constants.DEFAULT_TIMEOUT) As Boolean
        Dim oTransaction As SqlTransaction = MaybeGetTransaction(SqlConnection, TransactionMode, Transaction)

        Try
-            _Logger.Debug("ExecuteNonQueryWithConnectionObject: Running Command [{0}]", SqlCommand)
+            Logger.Debug("ExecuteNonQueryWithConnectionObject: Running Command [{0}]", SqlCommand)

            Using oSQLCOmmand = SqlConnection.CreateCommand()
                oSQLCOmmand.CommandText = SqlCommand
@@ -400,8 +396,8 @@ 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.Error(ex)
+            Logger.Warn("ExecuteNonQueryWithConnectionObject: Error in ExecuteNonQueryWithConnectionObject while executing command: [{0}]-[{1}]", SqlCommand, SqlConnection.ConnectionString)
            Return False
        Finally
            MaybeCommitTransaction(oTransaction, TransactionMode)
@@ -423,19 +419,19 @@ Public Class MSSQLServer
    End Function

    '<DebuggerStepThrough()>
-    Public Function GetScalarValue(SQLCommand As String, Transaction As SqlTransaction, Optional Timeout As Integer = 120) As Object
+    Public Function GetScalarValue(SQLCommand As String, Transaction As SqlTransaction, Optional Timeout As Integer = Constants.DEFAULT_TIMEOUT) As Object
        Using oConnection = GetSQLConnection()
            Return GetScalarValueWithConnectionObject(SQLCommand, oConnection, TransactionMode.ExternalTransaction, Transaction, Timeout)
        End Using
    End Function

    '<DebuggerStepThrough()>
-    Public Async Function GetScalarValueAsync(SQLQuery As String, Optional Timeout As Integer = 120) As Task(Of Object)
+    Public Async Function GetScalarValueAsync(SQLQuery As String, Optional Timeout As Integer = Constants.DEFAULT_TIMEOUT) As Task(Of Object)
        Return Await Task.Run(Function() GetScalarValue(SQLQuery, Timeout))
    End Function

    '<DebuggerStepThrough()>
-    Public Function GetScalarValueWithConnection(SQLCommand As String, ConnectionString As String, Optional Timeout As Integer = 120) As Object
+    Public Function GetScalarValueWithConnection(SQLCommand As String, ConnectionString As String, Optional Timeout As Integer = Constants.DEFAULT_TIMEOUT) As Object
        Using oConnection = GetConnection(ConnectionString)
            Return GetScalarValueWithConnectionObject(SQLCommand, oConnection, TransactionMode.WithTransaction, Nothing, Timeout)
        End Using
@@ -444,7 +440,7 @@ Public Class MSSQLServer
    Public Function GetScalarValueWithConnectionObject(SqlCommand As String, SqlConnection As SqlConnection,
                                                       Optional TransactionMode As TransactionMode = TransactionMode.WithTransaction,
                                                       Optional Transaction As SqlTransaction = Nothing,
-                                                       Optional Timeout As Integer = 120) As Object
+                                                       Optional Timeout As Integer = Constants.DEFAULT_TIMEOUT) As Object

        Dim oTransaction As SqlTransaction = MaybeGetTransaction(SqlConnection, TransactionMode, Transaction)
        Dim oResult As Object = Nothing
@@ -458,8 +454,8 @@ Public Class MSSQLServer
                oResult = oSQLCOmmand.ExecuteScalar()
            End Using
        Catch ex As Exception
-            _Logger.Error(ex)
-            _Logger.Warn("GetDatatableWithConnectionObject: Error in GetDatatableWithConnection while executing command: [{0}]", SqlCommand)
+            Logger.Error(ex)
+            Logger.Warn("GetDatatableWithConnectionObject: Error in GetDatatableWithConnection while executing command: [{0}]", SqlCommand)
        Finally
            MaybeCommitTransaction(oTransaction, TransactionMode)
        End Try
@@ -473,7 +469,7 @@ Public Class MSSQLServer
                Return Nothing
            End If

-            _Logger.Debug("GetScalarValue: Running Query [{0}]", SQLCommand)
+            Logger.Debug("GetScalarValue: Running Query [{0}]", SQLCommand)

            If SQLCommand.CommandText.Contains(" ") Then
                SQLCommand.CommandType = CommandType.Text
@@ -492,8 +488,8 @@ Public Class MSSQLServer
                Return SQLCommand.Parameters(OutputParameter).Value
            End Using
        Catch ex As Exception
-            _Logger.Error(ex)
-            _Logger.Warn($"GetScalarValue failed SQLCommand [{SQLCommand}]")
+            Logger.Error(ex)
+            Logger.Warn($"GetScalarValue failed SQLCommand [{SQLCommand}]")

            Return Nothing
        End Try
@@ -501,7 +497,7 @@ Public Class MSSQLServer

    '<DebuggerStepThrough()>
    Public Function GetScalarValue(SQLCommand As SqlCommand, OutputParameter As String) As Object
-        Return GetScalarValue(SQLCommand, OutputParameter, _Timeout)
+        Return GetScalarValue(SQLCommand, OutputParameter, QueryTimeout)
    End Function

    ''' <summary>
@@ -510,8 +506,8 @@ Public Class MSSQLServer
    ''' <param name="SqlCommand">the sql statement</param>
    ''' <param name="commandtimeout">Optional Timeout</param>
    ''' <remarks></remarks>
-    Public Sub NewExecuteNonQueryAsync(SqlCommand As String, Optional commandtimeout As Integer = 120)
-        _Logger.Debug("NewExecuteNonQueryAsync: Running Query [{0}]", SqlCommand)
+    Public Sub NewExecuteNonQueryAsync(SqlCommand As String, Optional commandtimeout As Integer = Constants.DEFAULT_TIMEOUT)
+        Logger.Debug("NewExecuteNonQueryAsync: Running Query [{0}]", SqlCommand)

        Try
            Dim oCallback As New AsyncCallback(AddressOf NewExecuteNonQueryAsync_Callback)
@@ -524,8 +520,8 @@ Public Class MSSQLServer
                End Using
            End Using
        Catch ex As Exception
-            _Logger.Error(ex)
-            _Logger.Warn($"NewExecuteNonQueryAsync failed SQLCommand [{SqlCommand}]")
+            Logger.Error(ex)
+            Logger.Warn($"NewExecuteNonQueryAsync failed SQLCommand [{SqlCommand}]")

        End Try
    End Sub
@@ -534,6 +530,6 @@ Public Class MSSQLServer
    Private Sub NewExecuteNonQueryAsync_Callback(ByVal result As IAsyncResult)
        Dim command As SqlCommand = CType(result.AsyncState, SqlCommand)
        Dim res = command.EndExecuteNonQuery(result)
-        _Logger.Info("Finished executing Async database operation: {0}", command.CommandText)
+        Logger.Info("Finished executing Async database operation: {0}", command.CommandText)
    End Sub
 End Class
--- a/Modules.Database/Adapters/Oracle.vb
+++ b/Modules.Database/Adapters/Oracle.vb
@@ -1,27 +1,30 @@
-Imports DigitalData.Modules.Logging
+Imports DigitalData.Modules.Encryption
+Imports DigitalData.Modules.Logging
 Imports Oracle.ManagedDataAccess.Client

 Public Class Oracle
-    Public DBInitialized As Boolean = False
-    Public CurrentOracleConnectionString As String = ""
+    Implements IDatabase

-    Private _Timeout As Integer
-    Private _Logger As Logger
+    Public Property DBInitialized As Boolean = False Implements IDatabase.DBInitialized
+    Public Property ConnectionString As String = "" Implements IDatabase.ConnectionString
+
+    Private ReadOnly _Timeout As Integer
+    Private ReadOnly _Logger As Logger

    Public Sub New(LogConfig As LogConfig, ConnectionString As String, Optional Timeout As Integer = 120)
        _Timeout = Timeout
        _Logger = LogConfig.GetLogger()

-        CurrentOracleConnectionString = ConnectionString
-        DBInitialized = TestCanConnect(CurrentOracleConnectionString)
+        ConnectionString = ConnectionString
+        DBInitialized = TestCanConnect(ConnectionString)
    End Sub

    Public Sub New(LogConfig As LogConfig, Server As String, Database As String, UserId As String, Password As String, Optional Timeout As Integer = 120)
        _Timeout = Timeout
        _Logger = LogConfig.GetLogger()

-        CurrentOracleConnectionString = GetConnectionString(Server, Database, UserId, Password)
-        DBInitialized = TestCanConnect(CurrentOracleConnectionString)
+        ConnectionString = GetConnectionString(Server, Database, UserId, Password)
+        DBInitialized = TestCanConnect(ConnectionString)
    End Sub

    Private Function TestCanConnect(ConnectionString As String) As Boolean
@@ -43,30 +46,36 @@ Public Class Oracle
    End Function

    ''' <summary>
-    ''' Returns a datatable for a sql-statement 
+    ''' Encrypts a connection string password.
    ''' </summary>
-    ''' <param name="sqlcommand">sqlcommand for datatable (select XYZ from TableORView)</param>
-    ''' <returns>Returns a datatable</returns>
-    Public Function GetDatatable(sqlcommand As String) As DataTable
-        Try
-            Dim oSQLconnect As New OracleConnection
-            Dim oSQLCOmmand As OracleCommand
-            oSQLconnect.ConnectionString = CurrentOracleConnectionString
-            oSQLconnect.Open()
-            oSQLCOmmand = oSQLconnect.CreateCommand()
-            oSQLCOmmand.CommandText = sqlcommand
-            oSQLCOmmand.CommandTimeout = _Timeout
-            Dim adapter1 As OracleDataAdapter = New OracleDataAdapter(oSQLCOmmand)
-            Dim dt As DataTable = New DataTable()
-            adapter1.Fill(dt)
-            oSQLconnect.Close()
-            Return dt
-        Catch ex As Exception
-            _Logger.Error(ex)
-            _Logger.Debug("sqlcommand: " & sqlcommand)
-            Return Nothing
-        End Try
+    ''' <param name="ConnectionString">A connection string with a plain-text password</param>
+    ''' <returns>The connection string with the password encrypted.</returns>
+    <DebuggerStepThrough()>
+    Public Shared Function EncryptConnectionString(ConnectionString As String) As String
+        Dim oEncryption As New EncryptionLegacy()
+        Dim oBuilder As New OracleConnectionStringBuilder() With {.ConnectionString = ConnectionString}
+        Dim oEncryptedPassword = oEncryption.EncryptData(oBuilder.Password)
+        oBuilder.Password = oEncryptedPassword
+
+        Return oBuilder.ToString()
    End Function
+
+    ''' <summary>
+    ''' Decrypts a connection string password.
+    ''' </summary>
+    ''' <param name="ConnectionString">A connection string with a encrypted password</param>
+    ''' <returns>The connection string with the password decrypted.</returns>
+    <DebuggerStepThrough()>
+    Public Shared Function DecryptConnectionString(ConnectionString As String) As String
+        Dim oEncryption As New EncryptionLegacy()
+        Dim oBuilder As New OracleConnectionStringBuilder() With {.ConnectionString = ConnectionString}
+        Dim oDecryptedPassword = oEncryption.DecryptData(oBuilder.Password)
+        oBuilder.Password = oDecryptedPassword
+
+        Return oBuilder.ToString()
+    End Function
+
+
    ''' <summary>
    ''' Executes the passed sql-statement 
    ''' </summary>
@@ -76,7 +85,7 @@ Public Class Oracle
        Try
            Dim oSQLconnect As New OracleConnection
            Dim oSQLCOmmand As OracleCommand
-            oSQLconnect.ConnectionString = CurrentOracleConnectionString
+            oSQLconnect.ConnectionString = ConnectionString
            oSQLconnect.Open()
            oSQLCOmmand = oSQLconnect.CreateCommand()
            oSQLCOmmand.CommandText = executeStatement
@@ -102,7 +111,7 @@ Public Class Oracle
        Try
            Dim oSQLconnect As New OracleConnection
            Dim oSQLCOmmand As OracleCommand
-            oSQLconnect.ConnectionString = CurrentOracleConnectionString
+            oSQLconnect.ConnectionString = ConnectionString
            oSQLconnect.Open()
            oSQLCOmmand = oSQLconnect.CreateCommand()
            oSQLCOmmand.CommandText = executeStatement
@@ -117,4 +126,128 @@ Public Class Oracle
            Throw ex
        End Try
    End Function
+
+    Public Function GetDatatable(pSQLCommand As String, pTimeout As Integer) As DataTable Implements IDatabase.GetDatatable
+        Try
+            Using oConnection = GetConnection(ConnectionString)
+                Dim oSQLCommand As OracleCommand
+                oSQLCommand = oConnection.CreateCommand()
+                oSQLCommand.CommandText = pSQLCommand
+                oSQLCommand.CommandTimeout = pTimeout
+
+                Dim oAdapter As OracleDataAdapter = New OracleDataAdapter(oSQLCommand)
+                Dim oTable As DataTable = New DataTable()
+
+                _Logger.Debug("GetDatatable: Running Query [{0}]", oSQLCommand)
+
+                oAdapter.Fill(oTable)
+
+                Return oTable
+            End Using
+        Catch ex As Exception
+            _Logger.Error(ex)
+            _Logger.Warn("GetDatatable: Error in GetDatatable while executing command: [{0}]", pSQLCommand)
+            Return Nothing
+        End Try
+    End Function
+
+    Private Function GetDatatable(pSQLCommand As String) As DataTable Implements IDatabase.GetDatatable
+        Return GetDatatable(pSQLCommand, _Timeout)
+    End Function
+
+    Public Function ExecuteNonQuery(pSQLCommand As String, pTimeout As Integer) As Boolean Implements IDatabase.ExecuteNonQuery
+        Try
+            Using oConnection = GetConnection(ConnectionString)
+                Dim oSQLCOmmand As OracleCommand
+                oSQLCOmmand = oConnection.CreateCommand()
+                oSQLCOmmand.CommandText = pSQLCommand
+                oSQLCOmmand.CommandTimeout = pTimeout
+
+
+                _Logger.Debug("ExecuteNonQuery: Running Query [{0}]", oSQLCOmmand)
+                oSQLCOmmand.ExecuteNonQuery()
+                oSQLCOmmand.Dispose()
+                Return True
+            End Using
+        Catch ex As Exception
+            _Logger.Error(ex)
+            _Logger.Warn("ExecuteNonQuery: Error in ExecuteNonQuery while executing command: [{0}]", pSQLCommand)
+            Return False
+        End Try
+    End Function
+
+    Public Function ExecuteNonQuery(pSQLCommand As String) As Boolean Implements IDatabase.ExecuteNonQuery
+        Return ExecuteNonQuery(pSQLCommand, _Timeout)
+    End Function
+
+    Public Function GetScalarValue(pSQLCommand As String, pTimeout As Integer) As Object Implements IDatabase.GetScalarValue
+        Dim result
+        Try
+            Using oConnection = GetConnection(ConnectionString)
+                Dim oSQLCOmmand As OracleCommand
+                oSQLCOmmand = oConnection.CreateCommand()
+                oSQLCOmmand.CommandText = pSQLCommand
+                oSQLCOmmand.CommandTimeout = pTimeout
+
+                _Logger.Debug("GetScalarValue: Running Query [{0}]", oSQLCOmmand)
+                result = oSQLCOmmand.ExecuteScalar()
+
+                Return result
+            End Using
+
+        Catch ex As Exception
+            _Logger.Error(ex)
+            _Logger.Warn("GetScalarValue: Error in GetScalarValue while executing command: [{0}]", pSQLCommand)
+            Throw ex
+        End Try
+    End Function
+
+    Public Function GetScalarValue(pSQLCommand As String) As Object Implements IDatabase.GetScalarValue
+        Return GetScalarValue(pSQLCommand, _Timeout)
+    End Function
+
+    Private Function GetConnection(ConnectionString As String) As OracleConnection
+        Try
+            Dim oConnection As New OracleConnection(ConnectionString)
+            oConnection = OpenSQLConnection(oConnection)
+
+            Dim oMaskedConnectionString = MaskConnectionString(ConnectionString)
+            _Logger.Debug("The Following Connection is open: {0}", oMaskedConnectionString)
+
+            Return oConnection
+        Catch ex As Exception
+            _Logger.Error(ex)
+
+            Return Nothing
+        End Try
+    End Function
+
+    ''' <summary>
+    ''' This Function intentionally has no try..catch block to have any errors caught outside
+    ''' </summary>
+    ''' <param name="Connection"></param>
+    ''' <returns></returns>
+    Private Function OpenSQLConnection(Connection As OracleConnection) As OracleConnection
+        If Connection.State = ConnectionState.Closed Then
+            Connection.Open()
+        End If
+
+        Return Connection
+    End Function
+
+    <DebuggerStepThrough()>
+    Private Function MaskConnectionString(ConnectionString As String) As String
+        Try
+            If ConnectionString Is Nothing OrElse ConnectionString.Length = 0 Then
+                Throw New ArgumentNullException("ConnectionString")
+            End If
+
+            Dim oBuilder As New OracleConnectionStringBuilder() With {.ConnectionString = ConnectionString}
+            Dim oConnectionString = ConnectionString.Replace(oBuilder.Password, "XXXXX")
+            Return oConnectionString
+        Catch ex As Exception
+            _Logger.Error(ex)
+            Return "Invalid ConnectionString"
+        End Try
+    End Function
 End Class