BIG CLEANUP

This commit is contained in:
Jonathan Jenne
2022-02-15 16:28:43 +01:00
parent 8d42a486ed
commit 1b7675a1b4
29 changed files with 1117 additions and 2113 deletions

View File

@@ -26,13 +26,14 @@ Public Class SQLConfigAutoIndex
End If
Next
Dim typeCS As String = DATABASE_ECM.GetScalarValue("SELECT SQL_PROVIDER FROM TBDD_CONNECTION WHERE GUID = " & cmbConnection.SelectedValue)
Dim typeCS As String = DATABASE_ECM.GetScalarValue("SELECT SQL_PROVIDER FROM TBDD_CONNECTION WHERE GUID = " & conid)
Dim dt As DataTable
If typeCS.Length > 0 Then
Dim CS As String
CS = DATABASE_ECM.Get_ConnectionStringforID(cmbConnection.SelectedValue)
If typeCS.ToUpper = "Oracle".ToUpper Then
dt = ClassDatabase.Oracle_Return_Datatable(query, CS, True)
LOGGER.Warn("Oracle is not supported!")
'dt = ClassDatabase.Oracle_Return_Datatable(query, CS, True)
Else
'dt = ClassDatabase.Return_Datatable_CS(query, CS, True)
dt = DATABASE_ECM.GetDatatableWithConnection(query, CS)
@@ -208,7 +209,8 @@ Public Class SQLConfigAutoIndex
End If
End If
End Sub
Dim AtPlaceholderPattern As String = "\[%{1}[a-zA-Z0-9\!\$\&\/\(\)\=\?\,\.\-\;\:_öÖüÜäÄ\#\'\+\*\~\{\}\@\€\<\>\ ]+]{1}"
ReadOnly AtPlaceholderPattern As String = "\[%{1}[a-zA-Z0-9\!\$\&\/\(\)\=\?\,\.\-\;\:_öÖüÜäÄ\#\'\+\*\~\{\}\@\€\<\>\ ]+]{1}"
Private Sub SQL_ERGEBNISTextBox_KeyUp(sender As Object, e As KeyEventArgs) Handles SQL_ERGEBNISTextBox.KeyUp
CurrentPosition = SQL_ERGEBNISTextBox.SelectionStart
@@ -235,7 +237,6 @@ Public Class SQLConfigAutoIndex
End Set
End Property
Private Sub CheckForPlaceholders()
Dim count As Integer = 0
Dim text As String = Me.Value
Dim atPlaceholderRegex = New Regex(AtPlaceholderPattern, RegexOptions.IgnoreCase)
Dim matches As MatchCollection = atPlaceholderRegex.Matches(text)
@@ -330,14 +331,15 @@ Public Class SQLConfigAutoIndex
If typeCS.ToUpper = "Oracle".ToUpper Then
If type = "'VIEW'" Then
'DB-Abfrage für alle Views definieren
oSQL = "select VIEW_NAME from USER_VIEWS"
Else
'DB-Abfrage für alle Tables definieren
oSQL = "select TABLE_NAME from USER_TABLES"
End If
dt = ClassDatabase.Oracle_Return_Datatable(oSQL, CS, True)
'If type = "'VIEW'" Then
' 'DB-Abfrage für alle Views definieren
' oSQL = "select VIEW_NAME from USER_VIEWS"
'Else
' 'DB-Abfrage für alle Tables definieren
' oSQL = "select TABLE_NAME from USER_TABLES"
'End If
'dt = ClassDatabase.Oracle_Return_Datatable(oSQL, CS, True)
LOGGER.Warn("Oracle is not supported!")
Else
oSQL = "SELECT TABLE_NAME from information_schema.tables where TABLE_TYPE = " & type & " ORDER BY TABLE_NAME"
'dt = ClassDatabase.Return_Datatable_CS(SQL, CS, True)
@@ -367,8 +369,9 @@ Public Class SQLConfigAutoIndex
Dim SQL As String
Dim DT As DataTable
If typeCS.ToUpper = "Oracle".ToUpper Then
SQL = "select COLUMN_NAME from USER_TAB_COLS where TABLE_NAME='" & tableName & "' order by COLUMN_NAME"
DT = ClassDatabase.Oracle_Return_Datatable(SQL, CS, True)
'SQL = "select COLUMN_NAME from USER_TAB_COLS where TABLE_NAME='" & tableName & "' order by COLUMN_NAME"
'DT = ClassDatabase.Oracle_Return_Datatable(SQL, CS, True)
LOGGER.Warn("Oracle is not supported!")
Else
SQL = "SELECT name FROM sys.columns WHERE object_id = OBJECT_ID('" & tableName & "') ORDER BY name"
'DT = ClassDatabase.Return_Datatable_CS(SQL, CS, True)