Remove ClassDatabase, Replace with Database.MSSQL Module

This commit is contained in:
Jonathan Jenne
2021-09-22 16:33:24 +02:00
parent 01e0a9dcf8
commit 7e28e072df
27 changed files with 214 additions and 314 deletions

View File

@@ -66,7 +66,7 @@ Public Class frmSQL_DESIGNER
'TBDD_CONNECTIONTableAdapter.Connection.ConnectionString = MyConnectionString
'TBDD_CONNECTIONTableAdapter.Fill(DD_DMSLiteDataSet.TBDD_CONNECTION)
' CURRENT_DT_SQL_CONFIG_TABLE = ClassDatabase.Return_Datatable(String.Format("SELECT T.CONNECTION_ID,T1.BEZEICHNUNG AS 'CON_STRING',ISNULL(T.SQL_COMMAND,'') AS 'SQL_COMMAND' FROM TBPM_PROFILE_FINAL_INDEXING T, TBDD_CONNECTION T1 WHERE T.CONNECTION_ID = T1.GUID AND T.GUID = {0}", CURRENT_INDEX_ID), True)
' CURRENT_DT_SQL_CONFIG_TABLE = DATABASE_ECM.GetDatatable(String.Format("SELECT T.CONNECTION_ID,T1.BEZEICHNUNG AS 'CON_STRING',ISNULL(T.SQL_COMMAND,'') AS 'SQL_COMMAND' FROM TBPM_PROFILE_FINAL_INDEXING T, TBDD_CONNECTION T1 WHERE T.CONNECTION_ID = T1.GUID AND T.GUID = {0}", CURRENT_INDEX_ID), True)
'If (CURRENT_DESIGN_TYPE = "INPUT_INDEX") Or CURRENT_DESIGN_TYPE = "FINAL_INDEX" Then
' If CURRENT_DT_SQL_CONFIG_TABLE.Rows.Count = 1 Then
' cmbConnection.SelectedValue = CURRENT_DT_SQL_CONFIG_TABLE.Rows(0).Item("CONNECTION_ID")
@@ -74,7 +74,7 @@ Public Class frmSQL_DESIGNER
' End If
' Dim oSQL = String.Format("SELECT NAME FROM TBPM_PROFILE_CONTROLS WHERE PROFIL_ID = {0} AND CTRL_TYPE <> 'LBL' ORDER BY NAME", CURRENT_ProfilGUID)
' Dim oDatatable As DataTable = ClassDatabase.Return_Datatable(oSQL, True)
' Dim oDatatable As DataTable = DATABASE_ECM.GetDatatable(oSQL, True)
' cmbControls.DataSource = oDatatable
' cmbControls.DisplayMember = oDatatable.Columns(0).ColumnName
' cmbControls.Visible = True
@@ -181,7 +181,7 @@ Public Class frmSQL_DESIGNER
Dim connectionString As String
connectionString = ClassDatabase.Get_ConnectionString(connectionId)
connectionString = DATABASE_ECM.Get_ConnectionStringforID(connectionId)
If connectionString <> "" Then
@@ -295,7 +295,7 @@ Public Class frmSQL_DESIGNER
Private Sub LoadConnections()
Try
Dim oDatatable As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBDD_CONNECTION")
Dim oDatatable As DataTable = DATABASE_ECM.GetDatatable("SELECT * FROM TBDD_CONNECTION")
cmbConnection.ValueMember = "GUID"
cmbConnection.DisplayMember = "BEZEICHNUNG"
@@ -315,7 +315,7 @@ Public Class frmSQL_DESIGNER
Private Sub LoadControls()
Try
Dim oDatatable = ClassDatabase.Return_Datatable($"SELECT * FROM TBDD_INDEX_MAN WHERE DOK_ID = {DocTypeId} AND ACTIVE = 1")
Dim oDatatable = DATABASE_ECM.GetDatatable($"SELECT * FROM TBDD_INDEX_MAN WHERE DOK_ID = {DocTypeId} AND ACTIVE = 1")
cmbControls.ValueMember = "WD_INDEX"
cmbControls.DisplayMember = "NAME"