AppStd/FileFlow
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove ClassDatabase, Replace with Database.MSSQL Module

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

41
Global_Indexer/frmSQLConfigAutoIndex.vb
View File

@@ -26,7 +26,7 @@ Public Class SQLConfigAutoIndex
End If
Next
Dim typeCS As String = ClassDatabase.Execute_Scalar("SELECT SQL_PROVIDER FROM TBDD_CONNECTION WHERE GUID = " & cmbConnection.SelectedValue, MyConnectionString, True)
Dim typeCS As String = DATABASE_ECM.GetScalarValue("SELECT SQL_PROVIDER FROM TBDD_CONNECTION WHERE GUID = " & cmbConnection.SelectedValue)
Dim dt As DataTable
If typeCS.Length > 0 Then
Dim CS As String
@@ -34,7 +34,8 @@ Public Class SQLConfigAutoIndex
If typeCS.ToUpper = "Oracle".ToUpper Then
dt = ClassDatabase.Oracle_Return_Datatable(query, CS, True)
Else
dt = ClassDatabase.Return_Datatable_CS(query, CS, True)
'dt = ClassDatabase.Return_Datatable_CS(query, CS, True)
dt = DATABASE_ECM.GetDatatableWithConnection(query, CS)
End If
End If
@@ -127,7 +128,7 @@ Public Class SQLConfigAutoIndex
Me.TBDD_CONNECTIONTableAdapter.Connection.ConnectionString = MyConnectionString
Me.TBDD_INDEX_MANTableAdapter.Connection.ConnectionString = MyConnectionString
Me.TBDD_CONNECTIONTableAdapter.Fill(Me.MyDataset.TBDD_CONNECTION)
Dim DT As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBDD_INDEX_AUTOM WHERE GUID = " & CURRENT_INDEXAUTO)
Dim DT As DataTable = DATABASE_ECM.GetDatatable("SELECT * FROM TBDD_INDEX_AUTOM WHERE GUID = " & CURRENT_INDEXAUTO)
If DT.Rows.Count = 1 Then
Me.cmbConnection.SelectedValue = DT.Rows(0).Item("CONNECTION_ID")
SQL_ERGEBNISTextBox.Text = DT.Rows(0).Item("SQL_RESULT")
@@ -141,7 +142,7 @@ Public Class SQLConfigAutoIndex
Catch ex As Exception
MsgBox(ex.Message, MsgBoxStyle.Critical, "Error in LoadFormData:")
End Try
End Sub
Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
@@ -151,17 +152,17 @@ Public Class SQLConfigAutoIndex
Private Sub Button2_Click(sender As Object, e As EventArgs) Handles btnsave.Click
Try
Dim origresultstring = ClassDatabase.Execute_Scalar("SELECT SQL_RESULT FROM TBDD_INDEX_AUTOM WHERE GUID = " & CURRENT_INDEXAUTO, MyConnectionString, True)
'Dim origConnection = ClassDatabase.Execute_Scalar("SELECT CONNECTION_ID FROM TBDD_INDEX_AUTOM WHERE GUID = " & CURRENT_INDEXAUTO, True)
Dim origresultstring = DATABASE_ECM.GetScalarValue("SELECT SQL_RESULT FROM TBDD_INDEX_AUTOM WHERE GUID = " & CURRENT_INDEXAUTO)
'Dim origConnection = DATABASE_ECM.GetScalarValue("SELECT CONNECTION_ID FROM TBDD_INDEX_AUTOM WHERE GUID = " & CURRENT_INDEXAUTO, True)
'If origConnection Is DBNull Then
'End If
Dim insresultstring = SQL_ERGEBNISTextBox.Text.Replace("'", "''")
If insresultstring <> origresultstring Then
Dim cmd As String
cmd = "UPDATE TBDD_INDEX_AUTOM SET CONNECTION_ID = " & cmbConnection.SelectedValue & ", SQL_RESULT = '" & insresultstring & "', CHANGED_WHO = '" & _
cmd = "UPDATE TBDD_INDEX_AUTOM SET CONNECTION_ID = " & cmbConnection.SelectedValue & ", SQL_RESULT = '" & insresultstring & "', CHANGED_WHO = '" &
Environment.UserName & "' WHERE GUID = " & CURRENT_INDEXAUTO
If ClassDatabase.Execute_non_Query(cmd, True) = True Then
If DATABASE_ECM.ExecuteNonQuery(cmd) = True Then
If USER_LANGUAGE = "de-DE" Then
lblSave.Text = "SQL-Daten gespeichert - " & Now
Else
@@ -280,7 +281,7 @@ Public Class SQLConfigAutoIndex
Catch ex As Exception
MsgBox(ex.Message, MsgBoxStyle.Critical, "Error in cmbSelectConditions_Changed:")
End Try
End Sub
Private Sub radioTable_CheckedChanged(sender As Object, e As EventArgs) Handles radioTable.CheckedChanged
@@ -320,10 +321,10 @@ Public Class SQLConfigAutoIndex
type = "'VIEW'"
End If
Dim typeCS As String = ClassDatabase.Execute_Scalar("SELECT SQL_PROVIDER FROM TBDD_CONNECTION WHERE GUID = " & cmbConnection.SelectedValue, MyConnectionString, True)
Dim typeCS As String = DATABASE_ECM.GetScalarValue("SELECT SQL_PROVIDER FROM TBDD_CONNECTION WHERE GUID = " & cmbConnection.SelectedValue)
Dim dt As DataTable
If typeCS.Length > 0 Then
Dim SQL As String = "SELECT TABLE_NAME from information_schema.tables where TABLE_TYPE = " & type & " ORDER BY TABLE_NAME"
Dim oSQL As String = "SELECT TABLE_NAME from information_schema.tables where TABLE_TYPE = " & type & " ORDER BY TABLE_NAME"
Dim CS As String
CS = ClassFormFunctions.GetConnectionString(cmbConnection.SelectedValue)
If typeCS.ToUpper = "Oracle".ToUpper Then
@@ -331,15 +332,16 @@ Public Class SQLConfigAutoIndex
If type = "'VIEW'" Then
'DB-Abfrage für alle Views definieren
SQL = "select VIEW_NAME from USER_VIEWS"
oSQL = "select VIEW_NAME from USER_VIEWS"
Else
'DB-Abfrage für alle Tables definieren
SQL = "select TABLE_NAME from USER_TABLES"
oSQL = "select TABLE_NAME from USER_TABLES"
End If
dt = ClassDatabase.Oracle_Return_Datatable(SQL, CS, True)
dt = ClassDatabase.Oracle_Return_Datatable(oSQL, CS, True)
Else
SQL = "SELECT TABLE_NAME from information_schema.tables where TABLE_TYPE = " & type & " ORDER BY TABLE_NAME"
dt = ClassDatabase.Return_Datatable_CS(SQL, CS, True)
oSQL = "SELECT TABLE_NAME from information_schema.tables where TABLE_TYPE = " & type & " ORDER BY TABLE_NAME"
'dt = ClassDatabase.Return_Datatable_CS(SQL, CS, True)
dt = DATABASE_ECM.GetDatatableWithConnection(oSQL, CS)
End If
If dt IsNot Nothing Then
cmbFromTables.Items.Clear()
@@ -361,7 +363,7 @@ Public Class SQLConfigAutoIndex
Try
Dim CS As String
CS = ClassFormFunctions.GetConnectionString(cmbConnection.SelectedValue)
Dim typeCS As String = ClassDatabase.Execute_Scalar("SELECT SQL_PROVIDER FROM TBDD_CONNECTION WHERE GUID = " & cmbConnection.SelectedValue, MyConnectionString, True)
Dim typeCS As String = DATABASE_ECM.GetScalarValue("SELECT SQL_PROVIDER FROM TBDD_CONNECTION WHERE GUID = " & cmbConnection.SelectedValue)
Dim SQL As String
Dim DT As DataTable
If typeCS.ToUpper = "Oracle".ToUpper Then
@@ -369,7 +371,8 @@ Public Class SQLConfigAutoIndex
DT = ClassDatabase.Oracle_Return_Datatable(SQL, CS, True)
Else
SQL = "SELECT name FROM sys.columns WHERE object_id = OBJECT_ID('" & tableName & "') ORDER BY name"
DT = ClassDatabase.Return_Datatable_CS(SQL, CS, True)
'DT = ClassDatabase.Return_Datatable_CS(SQL, CS, True)
DT = DATABASE_ECM.GetDatatableWithConnection(SQL, CS)
End If
If DT IsNot Nothing Then
@@ -381,7 +384,7 @@ Public Class SQLConfigAutoIndex
Catch ex As Exception
MsgBox(ex.Message, MsgBoxStyle.Critical, "Error in GetColumns:")
End Try
End Sub
Private Sub cmbWhereColumns_DropDown(sender As Object, e As EventArgs) Handles cmbWhereColumns.DropDown