From 095b79be96b7d142bed5a983071204ee98559d2b Mon Sep 17 00:00:00 2001
From: Jonathan Jenne <j.jenne@digitaldata.works>
Date: Tue, 2 Jun 2020 16:12:41 +0200
Subject: [PATCH] ClipboardWatcher: Actually use configured connection strings

---
 GUIs.ClipboardWatcher/ClipboardWatcher.vbproj |  8 ++---
 .../My Project/Resources.Designer.vb          |  4 +--
 .../My Project/Settings.Designer.vb           |  6 ++--
 .../My Project/licenses.licx                  |  1 +
 GUIs.ClipboardWatcher/ProfileSearches.vb      | 34 ++++++++++++++++---
 GUIs.ClipboardWatcher/frmMatch.vb             |  1 +
 6 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/GUIs.ClipboardWatcher/ClipboardWatcher.vbproj b/GUIs.ClipboardWatcher/ClipboardWatcher.vbproj
index 6b2b248c..1889a576 100644
--- a/GUIs.ClipboardWatcher/ClipboardWatcher.vbproj
+++ b/GUIs.ClipboardWatcher/ClipboardWatcher.vbproj
@@ -6,8 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{B7D465A2-AE31-4CDF-A8B2-34B42D3EA84E}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <RootNamespace>DigitalData.Modules.ClipboardWatcher</RootNamespace>
-    <AssemblyName>DigitalData.Modules.ClipboardWatcher</AssemblyName>
+    <RootNamespace>DigitalData.GUIs.ClipboardWatcher</RootNamespace>
+    <AssemblyName>DigitalData.GUIs.ClipboardWatcher</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <MyType>Windows</MyType>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
@@ -18,7 +18,7 @@
     <DefineDebug>true</DefineDebug>
     <DefineTrace>true</DefineTrace>
     <OutputPath>bin\Debug\</OutputPath>
-    <DocumentationFile>DigitalData.Modules.ClipboardWatcher.xml</DocumentationFile>
+    <DocumentationFile>DigitalData.GUIs.ClipboardWatcher.xml</DocumentationFile>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -27,7 +27,7 @@
     <DefineTrace>true</DefineTrace>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DocumentationFile>DigitalData.Modules.ClipboardWatcher.xml</DocumentationFile>
+    <DocumentationFile>DigitalData.GUIs.ClipboardWatcher.xml</DocumentationFile>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/GUIs.ClipboardWatcher/My Project/Resources.Designer.vb b/GUIs.ClipboardWatcher/My Project/Resources.Designer.vb
index 1fdfc6b9..36236405 100644
--- a/GUIs.ClipboardWatcher/My Project/Resources.Designer.vb	
+++ b/GUIs.ClipboardWatcher/My Project/Resources.Designer.vb	
@@ -22,7 +22,7 @@ Namespace My.Resources
     '''<summary>
     '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
     '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0"),  _
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0"),  _
      Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
      Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
      Global.Microsoft.VisualBasic.HideModuleNameAttribute()>  _
@@ -39,7 +39,7 @@ Namespace My.Resources
         Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
             Get
                 If Object.ReferenceEquals(resourceMan, Nothing) Then
-                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("DigitalData.Modules.ClipboardWatcher.Resources", GetType(Resources).Assembly)
+                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("DigitalData.GUIs.ClipboardWatcher.Resources", GetType(Resources).Assembly)
                     resourceMan = temp
                 End If
                 Return resourceMan
diff --git a/GUIs.ClipboardWatcher/My Project/Settings.Designer.vb b/GUIs.ClipboardWatcher/My Project/Settings.Designer.vb
index 392c3d68..58785339 100644
--- a/GUIs.ClipboardWatcher/My Project/Settings.Designer.vb	
+++ b/GUIs.ClipboardWatcher/My Project/Settings.Designer.vb	
@@ -15,7 +15,7 @@ Option Explicit On
 Namespace My
     
     <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.7.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.4.0.0"),  _
      Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
     Partial Friend NotInheritable Class MySettings
         Inherits Global.System.Configuration.ApplicationSettingsBase
@@ -64,9 +64,9 @@ Namespace My
     Friend Module MySettingsProperty
         
         <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>  _
-        Friend ReadOnly Property Settings() As Global.DigitalData.Modules.ClipboardWatcher.My.MySettings
+        Friend ReadOnly Property Settings() As Global.DigitalData.GUIs.ClipboardWatcher.My.MySettings
             Get
-                Return Global.DigitalData.Modules.ClipboardWatcher.My.MySettings.Default
+                Return Global.DigitalData.GUIs.ClipboardWatcher.My.MySettings.Default
             End Get
         End Property
     End Module
diff --git a/GUIs.ClipboardWatcher/My Project/licenses.licx b/GUIs.ClipboardWatcher/My Project/licenses.licx
index e69de29b..df67c51b 100644
--- a/GUIs.ClipboardWatcher/My Project/licenses.licx	
+++ b/GUIs.ClipboardWatcher/My Project/licenses.licx	
@@ -0,0 +1 @@
+DevExpress.XtraEditors.TileControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
diff --git a/GUIs.ClipboardWatcher/ProfileSearches.vb b/GUIs.ClipboardWatcher/ProfileSearches.vb
index 1533e402..d26f1c69 100644
--- a/GUIs.ClipboardWatcher/ProfileSearches.vb
+++ b/GUIs.ClipboardWatcher/ProfileSearches.vb
@@ -1,5 +1,7 @@
-Imports DigitalData.Modules.Logging
+Imports DigitalData.Modules.Database
+Imports DigitalData.Modules.Logging
 Imports DigitalData.Modules.ZooFlow
+Imports DigitalData.Modules.Patterns
 
 Public Class ProfileSearches
     Private _LogConfig As LogConfig
@@ -34,7 +36,7 @@ Public Class ProfileSearches
         Dim oSearchesDataTable = _Environment.Database.GetDatatable(oSQL)
         Dim oDocSearches As New List(Of Search)
         Dim oCounter As Integer = 0
-        Dim oPatterns As New Patterns.ClassPatterns(_LogConfig)
+        Dim oPatterns As New ClassPatterns(_LogConfig)
 
         For Each oRow As DataRow In oSearchesDataTable.Rows
             Dim oProfileId As Integer = oRow.Item("PROFILE_ID")
@@ -47,7 +49,8 @@ Public Class ProfileSearches
             oSQL = oPatterns.ReplaceInternalValues(oSQL)
             oSQL = oPatterns.ReplaceClipboardContents(oSQL, _Params.ClipboardContents)
 
-            Dim oDatatable As DataTable = _Environment.Database.GetDatatable(oSQL, oConnectionId)
+            Dim oConnectionString = GetConnectionString(oConnectionId)
+            Dim oDatatable As DataTable = _Environment.Database.GetDatatableWithConnection(oSQL, oConnectionString)
 
             If oDatatable Is Nothing Then
                 _Logger.Warn("Error in SQL-Query '{0}'", oSQL)
@@ -69,6 +72,26 @@ Public Class ProfileSearches
         Return oDocSearches
     End Function
 
+    Private Function GetConnectionString(ConnectionId As Integer) As String
+        Dim oDatatable As DataTable = _Environment.Database.GetDatatable($"SELECT * FROM TBDD_CONNECTION WHERE GUID = {ConnectionId}")
+
+        If oDatatable.Rows.Count > 0 Then
+            Dim oRow As DataRow = oDatatable.Rows.Item(0)
+
+            Select Case oRow.Item("SQL_PROVIDER")
+                Case "MS-SQL"
+                    Dim oConnectionString = MSSQLServer.GetConnectionString(oRow.Item("SERVER"), oRow.Item("DATENBANK"), oRow.Item("USERNAME"), oRow.Item("PASSWORD"))
+                    Return oConnectionString
+
+                Case Else
+                    Return Nothing
+
+            End Select
+        Else
+            Return Nothing
+        End If
+    End Function
+
     Public Async Function LoadDataSearchesAsync(ProfileId As Integer) As Task(Of List(Of Search))
         Return Await Task.Run(Function()
                                   Return DoLoadDataSearches(ProfileId)
@@ -83,7 +106,7 @@ Public Class ProfileSearches
             Dim oSearchesDataTable = _Environment.Database.GetDatatable(oSQL)
 
             Dim oCounter As Integer = 0
-            Dim oPatterns As New Patterns.ClassPatterns(_LogConfig)
+            Dim oPatterns As New ClassPatterns(_LogConfig)
 
             For Each oRow As DataRow In oSearchesDataTable.Rows
                 Try
@@ -95,7 +118,8 @@ Public Class ProfileSearches
                     oSQL = oPatterns.ReplaceUserValues(oSQL, _Environment.User)
                     oSQL = oPatterns.ReplaceInternalValues(oSQL)
 
-                    Dim oDatatable As DataTable = _Environment.Database.GetDatatable(oSQL, oConnectionId)
+                    Dim oConnectionString = GetConnectionString(oConnectionId)
+                    Dim oDatatable As DataTable = _Environment.Database.GetDatatableWithConnection(oSQL, oConnectionString)
 
                     If oDatatable Is Nothing Then
                         _Logger.Warn("Error in SQL-Query '{0}'", oSQL)
diff --git a/GUIs.ClipboardWatcher/frmMatch.vb b/GUIs.ClipboardWatcher/frmMatch.vb
index 0f0b1767..f9b47583 100644
--- a/GUIs.ClipboardWatcher/frmMatch.vb
+++ b/GUIs.ClipboardWatcher/frmMatch.vb
@@ -7,6 +7,7 @@ Imports DigitalData.Modules.Windows
 Imports DigitalData.Modules.Language
 Imports DigitalData.Modules.ZooFlow
 Imports DigitalData.Modules.ZooFlow.Params
+Imports DigitalData.Modules
 
 ''' <summary>
 '''