Use Database from Monorepo, Add initial ODBC Support

app/DD_Clipboard_Searcher/ClassInit.vb

@@ -2,9 +2,12 @@
 Imports DD_LIB_Standards
 Imports DigitalData.Modules.Logging
 Imports DigitalData.Modules.Config
+Imports DigitalData.Modules.Database
 
 Public Class ClassInit
     Public _lizenzManager As clsLicenseManager
+    Public _database As MSSQLServer
+
     Public Sub InitLogger()
         LogConfig = New LogConfig(LogConfig.PathType.AppData)
         Logger = LogConfig.GetLogger()
@@ -29,6 +32,23 @@ Public Class ClassInit
             Return True
         End If
     End Function
+
+    Public Function InitDatabase_New() As Boolean
+        If MyConnectionString = String.Empty Then
+            MsgBox("No Databaseconnection configured. (First Start or Appdata not accessible)" & vbNewLine & "Basic-Config will be loaded.", MsgBoxStyle.Information)
+            ERROR_INIT = "NO DB-CONNECTION"
+            frmConfig_Basic.ShowDialog()
+        End If
+
+        Try
+            Database = New MSSQLServer(LogConfig, MyConnectionString)
+            Return True
+        Catch ex As Exception
+            Logger.Error(ex)
+            Return False
+        End Try
+    End Function
+
     Public Function InitBasics()
         ConfigManager = New ConfigManager(Of ClassConfig)(LogConfig, Application.UserAppDataPath, Application.CommonAppDataPath)
 
@@ -74,7 +94,7 @@ Public Class ClassInit
                 USER_USERNAME = _User
             End If
             Try
-                DT_CLIENT_USER = clsDatabase.Return_Datatable(String.Format("SELECT * FROM VWDD_USER_CLIENT WHERE UPPER(USERNAME) = UPPER('{0}')", Environment.UserName), False)
+                DT_CLIENT_USER = Database.GetDatatable(String.Format("SELECT * FROM VWDD_USER_CLIENT WHERE UPPER(USERNAME) = UPPER('{0}')", Environment.UserName), False)
                 If DT_CLIENT_USER.Rows.Count > 1 Then
                     frmClientLogin.ShowDialog()
                 ElseIf DT_CLIENT_USER.Rows.Count = 1 Then
@@ -92,7 +112,7 @@ Public Class ClassInit
 
             'ClassLogger.Add(">> Username: " & USER_USERNAME, False)
             Dim sql = String.Format("SELECT * FROM [dbo].[FNDD_CHECK_USER_MODULE] ('{0}','CW',{1})", USER_USERNAME, CLIENT_SELECTED)
-            Dim DT_CHECKUSER_MODULE As DataTable = clsDatabase.Return_Datatable(sql)
+            Dim DT_CHECKUSER_MODULE As DataTable = Database.GetDatatable(sql)
             If DT_CHECKUSER_MODULE.Rows.Count = 0 Then
                 Logger.Info("DT_CHECKUSER_MODULE.Rows.Count = 0", True)
                 'ERROR_STATE = "NO USER"
@@ -142,12 +162,12 @@ Public Class ClassInit
             ClassLicense.Refresh_Licence(DT_CLIENT_USER.Rows(0).Item("CLIENT_ID"))
             'Am System anmelden
             ' sql = String.Format("UPDATE TBDD_USER SET LOGGED_IN = 1, LOGGED_WHERE = '{0}' WHERE GUID = {1}", Environment.MachineName, USER_ID)
-            'clsDatabase.Execute_non_Query(sql)
+            'Database.GetDatatable(sql)
             sql = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_ID & " AND MODULE = 'Clipboard-Watcher'"
-            clsDatabase.Execute_non_Query(sql, True)
+            Database.ExecuteNonQuery(sql, True)
 
             sql = String.Format("INSERT INTO TBDD_USER_MODULE_LOG_IN (USER_ID,CLIENT_ID,MODULE,VERSION_CLIENT,MACHINE_NAME) VALUES ({0},{1},'Clipboard-Watcher','{2}','{3}')", USER_ID, 0, My.Application.Info.Version.ToString, Environment.MachineName)
-            clsDatabase.Execute_non_Query(sql)
+            Database.ExecuteNonQuery(sql)
 
             If USER_IS_ADMIN = True Then
                 If ESC_Hidden = True Then
@@ -162,8 +182,8 @@ Public Class ClassInit
                 '    pageAdmin.Visible = True
             End If
 
-            WD_UNICODE = clsDatabase.Execute_Scalar("SELECT WD_UNICODE FROM TBCW_CONFIGURATION WHERE GUID = 1")
-            GDPICTURE_LICENSE = clsDatabase.Execute_Scalar("SELECT GDPICTURE_LICENSE FROM TBCW_CONFIGURATION WHERE GUID = 1")
+            WD_UNICODE = Database.NewExecuteScalar("SELECT WD_UNICODE FROM TBCW_CONFIGURATION WHERE GUID = 1")
+            GDPICTURE_LICENSE = Database.NewExecuteScalar("SELECT GDPICTURE_LICENSE FROM TBCW_CONFIGURATION WHERE GUID = 1")
 
             Logger.Debug(" >> Count Users logged in: " & USERCOUNT_LOGGED_IN.ToString, False)
             If LICENSE_COUNT < USERCOUNT_LOGGED_IN And LICENSE_EXPIRED = False Then
@@ -178,7 +198,7 @@ Public Class ClassInit
                 If USER_IS_ADMIN = False Then
                     'Anmeldung wieder herausnehmen
                     sql = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_ID & " AND MODULE= 'Clipboard-Watcher'"
-                    clsDatabase.Execute_non_Query(sql, True)
+                    Database.ExecuteNonQuery(sql, True)
                     Logger.Info(" - logged out the user", False)
                     Return False
                 End If
@@ -197,12 +217,12 @@ Public Class ClassInit
     Public Shared Sub Refresh_Profile_Links()
         Try
             Dim oSql = String.Format("SELECT * FROM VWCW_USER_PROFILE WHERE USER_ID = {0} OR GROUP_ID IN (SELECT DISTINCT GUID FROM TBDD_GROUPS WHERE GUID IN (SELECT GROUP_ID FROM TBDD_GROUPS_USER WHERE USER_ID = {0}))", USER_ID)
-            DT_USER_PROFILES = clsDatabase.Return_Datatable(oSql)
+            DT_USER_PROFILES = Database.GetDatatable(oSql)
             If DT_USER_PROFILES.Rows.Count = 0 Then
                 MsgBox("No profiles configured for this user so far!", MsgBoxStyle.Exclamation)
             Else
                 oSql = $"SELECT * FROM VWCW_PROFILE_REL_WINDOW WHERE USER_ID = {USER_ID}"
-                DTPROFILE_REL_WINDOW = clsDatabase.Return_Datatable(oSql)
+                DTPROFILE_REL_WINDOW = Database.GetDatatable(oSql)
             End If
         Catch ex As Exception
             MsgBox("Unexpected Error in Refresh_Profile_Links: " & ex.Message, MsgBoxStyle.Critical)