Modules.Database
This commit is contained in:
@@ -1,11 +1,11 @@
|
||||
Imports DD_FirebirdDLL
|
||||
Imports Modules.Database
|
||||
Imports Modules.Logging
|
||||
|
||||
Public Class FrmMain
|
||||
Private SelectedTable As Integer
|
||||
Private Logger As NLog.Logger
|
||||
Private LogWrapper As Logger
|
||||
Private DB As ClassFirebird
|
||||
Private DBFirebird As Firebird
|
||||
|
||||
Private Sub CreateTableNodesFromDatatable(dt As DataTable)
|
||||
' Node der Datenbank erstellen
|
||||
@@ -40,7 +40,7 @@ Public Class FrmMain
|
||||
End Sub
|
||||
|
||||
Private Function LoadTables()
|
||||
Return DB.ReturnDatatable("SELECT DISTINCT T.TABLE_ID,T.""TABLE"" from VWEDM_TABLE_COLUMN T")
|
||||
Return DBFirebird.GetDatatable("SELECT DISTINCT T.TABLE_ID,T.""TABLE"" from VWEDM_TABLE_COLUMN T")
|
||||
End Function
|
||||
|
||||
Private Function DatabaseSettingsExist()
|
||||
@@ -48,15 +48,15 @@ Public Class FrmMain
|
||||
End Function
|
||||
|
||||
Private Sub Init()
|
||||
DB = New ClassFirebird(My.Settings.fbDatasource, My.Settings.fbDatabaseLocation, My.Settings.fbUser, My.Settings.fbPassword)
|
||||
DBFirebird = New Firebird(My.Settings.fbDatasource, My.Settings.fbDatabaseLocation, My.Settings.fbUser, My.Settings.fbPassword)
|
||||
|
||||
If DB.ConnectionFailed Then
|
||||
If DBFirebird.ConnectionFailed Then
|
||||
MsgBox("Database connection failed. Please check the log.", vbCritical)
|
||||
Exit Sub
|
||||
End If
|
||||
|
||||
' Get info about the logged in user
|
||||
CurrentUser = New ClassCurrentUser(DB)
|
||||
CurrentUser = New ClassCurrentUser(DBFirebird)
|
||||
|
||||
Dim dt As DataTable = LoadTables()
|
||||
CreateTableNodesFromDatatable(dt)
|
||||
@@ -65,7 +65,7 @@ Public Class FrmMain
|
||||
|
||||
|
||||
Private Sub FrmMain_Load(sender As Object, e As EventArgs) Handles Me.Load
|
||||
LogWrapper = New Logger("EDMDesigner", ClassLogger.PathType.CurrentDirectory)
|
||||
LogWrapper = New Logger(ClassLogger.PathType.CurrentDirectory)
|
||||
|
||||
Logger = NLog.LogManager.GetCurrentClassLogger()
|
||||
|
||||
@@ -120,7 +120,7 @@ Public Class FrmMain
|
||||
End Sub
|
||||
|
||||
Private Sub SpaltenBearbeitenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles SpaltenBearbeitenToolStripMenuItem.Click
|
||||
Dim dt As DataTable = DB.ReturnDatatable($"SELECT * FROM VWEDM_TABLE_COLUMN WHERE TABLE_ID = {SelectedTable}")
|
||||
Dim dt As DataTable = DBFirebird.GetDatatable($"SELECT * FROM VWEDM_TABLE_COLUMN WHERE TABLE_ID = {SelectedTable}")
|
||||
gridControlTableProperties.DataSource = dt
|
||||
End Sub
|
||||
|
||||
|
||||
Reference in New Issue
Block a user