Database: Improve dispatcher

Database/Constants.vb

@@ -2,7 +2,9 @@
     Public Const PROVIDER_MSSQL = "MS-SQL"
     Public Const PROVIDER_ORACLE = "ORACLE"
     Public Const PROVIDER_ODBC = "ODBC"
+    Public Const PROVIDER_FIREBIRD = "FIREBIRD"
 
     Public Const DEFAULT_TIMEOUT = 120
     Public Const DEFAULT_TABLE = "DDRESULT"
+    Public Const DEFAULT_CONNECTION_ID = 1
 End Class

Database/Database.vbproj

@@ -69,6 +69,9 @@
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Data.Odbc, Version=6.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Data.Odbc.6.0.1\lib\net461\System.Data.Odbc.dll</HintPath>
+    </Reference>
     <Reference Include="System.IO.Compression" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.ServiceModel" />
@@ -115,6 +118,7 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
+    <Compile Include="Queries.vb" />
     <Compile Include="TableCache.vb" />
   </ItemGroup>
   <ItemGroup>

Database/Dispatcher.vb

@@ -1,5 +1,5 @@
-Imports DigitalData.Modules.Base
+Imports DigitalData.Modules.Logging
-Imports DigitalData.Modules.Logging
+Imports Oracle.ManagedDataAccess.Client
 
 Public Class Dispatcher
     Public ReadOnly Property Connections As New List(Of DispatcherConnection)
@@ -7,27 +7,121 @@ Public Class Dispatcher
     Public ReadOnly Logger As Logger
     Public ReadOnly LogConfig As LogConfig
 
+    ''' <summary>
+    ''' Create a new instance of Dispatcher. This is the preferred way to create the dispatcher.
+    ''' </summary>
+    ''' <param name="pLogConfig">An instance of LogConfig</param>
+    ''' <param name="pConnectionString">Initial connectionstring for connecting to DD_ECM database.</param>
+    ''' <returns>An instance of Dispatcher with connections</returns>
+    Public Shared Function Create(pLogConfig As LogConfig, pConnectionString As String) As Dispatcher
+        Dim oDecryptedConnectionString As String = MSSQLServer.DecryptConnectionString(pConnectionString)
+        Dim oDatabase As MSSQLServer = New MSSQLServer(pLogConfig, oDecryptedConnectionString)
+        Dim oTable As DataTable = oDatabase.GetDatatable(Queries.DD_ECM.Connections.AllConnections)
+
+        Dim oConnections As New List(Of DispatcherConnection)
+        For Each oRow As DataRow In oTable.Rows
+            Dim oConnection As DispatcherConnection = CreateFromDataRow(oRow)
+
+            If oConnection IsNot Nothing Then
+                oConnections.Add(oConnection)
+            End If
+        Next
+
+        Return New Dispatcher(pLogConfig, oConnections)
+    End Function
+
+    ''' <summary>
+    ''' Create a new instance of Dispatcher. Needs a manually constructed list of connection objects.
+    ''' </summary>
+    ''' <param name="pLogConfig">An instance of LogConfig</param>
+    ''' <param name="pConnections">A list of DispatcherConnection objects</param>
+    ''' <seealso cref="Create"/>
     Public Sub New(pLogConfig As LogConfig, pConnections As List(Of DispatcherConnection))
         LogConfig = pLogConfig
         Logger = pLogConfig.GetLogger()
         Connections = pConnections
     End Sub
 
+    Public Enum ConnectionType
+        MSSQL
+        Oracle
+        ODBC
+        Firebird
+    End Enum
+
+    Public Class DispatcherOptions
+        Public Property QueryTimeout As Integer = Constants.DEFAULT_TIMEOUT
+    End Class
+
+    Public Class DispatcherConnection
+        Public Property Id As Integer
+        Public Property Name As String
+        Public Property ConnectionString As String
+        Public Property ConnectionType As ConnectionType
+    End Class
+
+    ''' <summary>
+    ''' Returns a Datatable from the database with the specified connection id
+    ''' </summary>
+    ''' <param name="pSQLCommand">The SQL query</param>
+    ''' <param name="pConnectionId">The connection id</param>
+    ''' <returns>A datatable with the results or nothing if an error occurred</returns>
     Public Function GetDatatable(pSQLCommand As String, pConnectionId As Integer) As DataTable
         Dim oAdapter As IDatabase = GetAdapterClass(pConnectionId)
         Return oAdapter.GetDatatable(pSQLCommand)
     End Function
 
-    Public Function ExectueNonQuery(pSQLCommand As String, pConnectionId As Integer) As Boolean
+    ''' <summary>
+    ''' Returns a Datatable from the database
+    ''' </summary>
+    ''' <param name="pSQLCommand">The SQL query</param>
+    ''' <returns>A datatable with the results or nothing if an error occurred</returns>
+    Public Function GetDatatable(pSQLCommand As String) As DataTable
+        Return GetDatatable(pSQLCommand, Constants.DEFAULT_CONNECTION_ID)
+    End Function
+
+    ''' <summary>
+    ''' Executes a query without return value like INSERT or UPDATE from the database with the specified connection id and 
+    ''' returns a boolean value indicating success or failure of the query
+    ''' </summary>
+    ''' <param name="pSQLCommand">The SQL query</param>
+    ''' <param name="pConnectionId">The connection id</param>
+    ''' <returns>True if the query was successful, otherwise false</returns>
+    Public Function ExecuteNonQuery(pSQLCommand As String, pConnectionId As Integer) As Boolean
         Dim oAdapter As IDatabase = GetAdapterClass(pConnectionId)
         Return oAdapter.ExecuteNonQuery(pSQLCommand)
     End Function
 
+    ''' <summary>
+    ''' Executes a query without return value like INSERT or UPDATE from the database and 
+    ''' returns a boolean value indicating success or failure of the query
+    ''' </summary>
+    ''' <param name="pSQLCommand">The SQL query</param>
+    ''' <returns>True if the query was successful, otherwise false</returns>
+    Public Function ExecuteNonQuery(pSQLCommand As String) As Boolean
+        Return ExecuteNonQuery(pSQLCommand, Constants.DEFAULT_CONNECTION_ID)
+    End Function
+
+    ''' <summary>
+    ''' Returns a single value from the database specified by the connection id
+    ''' </summary>
+    ''' <param name="pSQLCommand">The SQL query</param>
+    ''' <param name="pConnectionId">The connection id</param>
+    ''' <returns>A value of type object</returns>
     Public Function GetScalarValue(pSQLCommand As String, pConnectionId As Integer) As Object
         Dim oAdapter As IDatabase = GetAdapterClass(pConnectionId)
         Return oAdapter.GetScalarValue(pSQLCommand)
     End Function
 
+    ''' <summary>
+    ''' Returns a single value from the database
+    ''' </summary>
+    ''' <param name="pSQLCommand">The SQL query</param>
+    ''' <returns>A value of type object</returns>
+    Public Function GetScalarValue(pSQLCommand As String) As Object
+        Return GetScalarValue(pSQLCommand, Constants.DEFAULT_CONNECTION_ID)
+    End Function
+
     Private Function GetConnection(pConnectionId As Integer) As DispatcherConnection
         Dim oConnection As DispatcherConnection = Connections.
             Where(Function(conn) conn.Id = pConnectionId).
@@ -49,7 +143,8 @@ Public Class Dispatcher
 
         Select Case oConnection.ConnectionType
             Case ConnectionType.MSSQL
-                Return New MSSQLServer(LogConfig, oConnection.ConnectionString, Constants.DEFAULT_TIMEOUT)
+                Dim oConnectionString = MSSQLServer.DecryptConnectionString(oConnection.ConnectionString)
+                Return New MSSQLServer(LogConfig, oConnectionString, Constants.DEFAULT_TIMEOUT)
 
             Case ConnectionType.Oracle
                 Return New Oracle(LogConfig, oConnection.ConnectionString, Constants.DEFAULT_TIMEOUT)
@@ -68,22 +163,66 @@ Public Class Dispatcher
         End Select
     End Function
 
-    Public Enum ConnectionType
+    Private Shared Function CreateFromDataRow(pConnectionDataRow As DataRow) As DispatcherConnection
-        MSSQL
+        Try
-        Oracle
+            Dim oGuid = pConnectionDataRow.Item("GUID")
-        ODBC
+            Dim oName = pConnectionDataRow.Item("BEZEICHNUNG")
-        Firebird
+            Dim oUser = pConnectionDataRow.Item("USERNAME")
-    End Enum
+            Dim oPassword = pConnectionDataRow.Item("PASSWORD")
+            Dim oServer = pConnectionDataRow.Item("SERVER")
+            Dim oDatabase = pConnectionDataRow.Item("DATENBANK")
+
+            Dim oConnectionType As ConnectionType
+            Dim oConnectionString As String
+
+            Select Case pConnectionDataRow.Item("SQL_PROVIDER")
+                Case "Oracle"
+                    ' TODO: Test Oracle Connection
+                    oConnectionType = ConnectionType.Oracle
+                    oConnectionString = New OracleConnectionStringBuilder() With {
+                        .UserID = oUser,
+                        .Password = oPassword,
+                        .DataSource = oServer
+                    }.ToString()
+
+                Case "ODBC"
+                    ' TODO: Test ODBC Connection
+                    oConnectionType = ConnectionType.ODBC
+                    oConnectionString = New Data.Odbc.OdbcConnectionStringBuilder() With {
+                        .ConnectionString = oServer
+                    }.ToString()
+
+                Case "Firebird"
+                    oConnectionType = ConnectionType.Firebird
+                    oConnectionString = New FirebirdSql.Data.FirebirdClient.FbConnectionStringBuilder() With {
+                        .UserID = oUser,
+                        .Password = oPassword,
+                        .DataSource = oServer,
+                        .Database = oDatabase
+                    }.ToString()
+
+                Case Else ' MSSQL
+                    oConnectionType = ConnectionType.MSSQL
+                    oConnectionString = New SqlClient.SqlConnectionStringBuilder() With {
+                        .UserID = oUser,
+                        .Password = oPassword,
+                        .DataSource = oServer,
+                        .InitialCatalog = oDatabase
+                    }.ToString()
+
+            End Select
+
+            Return New DispatcherConnection With {
+                    .Id = oGuid,
+                    .Name = oName,
+                    .ConnectionType = oConnectionType,
+                    .ConnectionString = oConnectionString
+                }
+        Catch ex As Exception
+            Return Nothing
+        End Try
+    End Function
 
-    Public Class DispatcherOptions
-        Public Property QueryTimeout As Integer = Constants.DEFAULT_TIMEOUT
-    End Class
 
-    Public Class DispatcherConnection
-        Public Property Id As Integer
-        Public Property Name As String
-        Public Property ConnectionString As String
-        Public Property ConnectionType As ConnectionType
-    End Class
 End Class
 

Database/Queries.vb

@@ -0,0 +1,11 @@
+Public Class Queries
+    Public Class DD_ECM
+        Public Class ThirdPartyModules
+            Public Const GdPictureLicense As String = "SELECT LICENSE FROM TBDD_3RD_PARTY_MODULES WHERE NAME = 'GDPICTURE'"
+        End Class
+
+        Public Class Connections
+            Public Const AllConnections As String = "SELECT * FROM TBDD_CONNECTION"
+        End Class
+    End Class
+End Class

Database/packages.config

@@ -4,4 +4,5 @@
   <package id="EntityFramework.Firebird" version="6.4.0" targetFramework="net461" />
   <package id="FirebirdSql.Data.FirebirdClient" version="7.5.0" targetFramework="net461" />
   <package id="NLog" version="4.7.15" targetFramework="net461" />
+  <package id="System.Data.Odbc" version="6.0.1" targetFramework="net461" />
 </packages>