Remove ClassDatabase, ClassDataASorDB, replace with DatabaseWithFallback

This commit is contained in:
Jonathan Jenne
2022-01-12 14:34:27 +01:00
parent 482f015d6f
commit 6725d0f7d6
14 changed files with 294 additions and 538 deletions

View File

@@ -5,6 +5,8 @@ Imports DD_LIB_Standards
Imports DigitalData.Controls.LookupGrid
Imports DigitalData.Modules.Language.Utils
Imports System.IO
Imports DigitalData.Modules.EDMI.API.DatabaseWithFallback
Imports DigitalData.Modules.EDMI.API.Constants
Public Class frmMassValidator
Private DTCONTROLS As DataTable
@@ -891,7 +893,10 @@ Public Class frmMassValidator
Try
LOGGER.Debug("Setting Values for Control [{0}]", displayboxname)
Dim oResultTable As DataTable = ClassDatabase.Return_Datatable_ConId(sqlCommand, sqlConnection)
'Dim oResultTable As DataTable = ClassDatabase.Return_Datatable_ConId(sqlCommand, sqlConnection)
Dim oResultTable As DataTable = Database.GetDatatable(New GetDatatableOptions(sqlCommand, DatabaseType.ECM) With {
.ConnectionId = sqlConnection
})
If Not IsNothing(oResultTable) Then
LOGGER.Debug("Result Table has [{0}] rows", oResultTable.Rows.Count)
@@ -1017,7 +1022,12 @@ Public Class frmMassValidator
Dim sql_Statement = ROW.Item(2)
Dim cellvalue = dgv.Rows(dgv.Rows.Count - 2).Cells(0).Value.ToString()
sql_Statement = sql_Statement.ToString.Replace(dgv.Name, cellvalue)
Dim resultDT As DataTable = ClassDatabase.Return_Datatable_ConId(sql_Statement, ROW.Item(1))
Dim oConnectionId = ROW.Item(1)
'Dim resultDT As DataTable = ClassDatabase.Return_Datatable_ConId(sql_Statement, ROW.Item(1))
Dim resultDT As DataTable = Database.GetDatatable(New GetDatatableOptions(sql_Statement, DatabaseType.ECM) With {
.ConnectionId = oConnectionId
})
If resultDT.Rows.Count >= 1 Then
'Nur dediziert einen Wert zurückerhalten
For Each row1 As DataRow In resultDT.Rows