WIP: EDM Designer, Create Tables

EDMDesigner/FrmConnection.vb

@@ -1,7 +1,13 @@
-Imports Modules.Database
+Imports DigitalData.Modules.Database
 
 Public Class FrmConnection
+    Public Property LogFactory As NLog.LogFactory
+
+    Private _logger As NLog.Logger
+
     Private Sub FrmConnection_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+        _logger = LogFactory.GetCurrentClassLogger()
+
         FbDatabaseLocationTextBox.DataBindings.Add("Text", My.Settings, "fbDatabaseLocation")
         FbDatasourceTextBox.DataBindings.Add("Text", My.Settings, "fbDatasource")
         FbUserTextBox.DataBindings.Add("Text", My.Settings, "fbUser")
@@ -9,24 +15,35 @@ Public Class FrmConnection
     End Sub
 
     Private Sub BtnConnect_Click(sender As Object, e As EventArgs) Handles btnConnect.Click
-        My.Settings.Save()
+        Dim dbTest As Firebird
 
-        Dim dbTest As New Firebird(My.Settings.fbDatasource, My.Settings.fbDatabaseLocation, My.Settings.fbUser, My.Settings.fbPassword)
+        Try
+            dbTest = New Firebird(LogFactory, My.Settings.fbDatasource, My.Settings.fbDatabaseLocation, My.Settings.fbUser, My.Settings.fbPassword)
 
-        If dbTest.ConnectionFailed Then
+            If dbTest.ConnectionFailed Then
+                MsgBox("Connection failed!", MsgBoxStyle.Information, "Database Connection")
+
+                lblConnectionStatus.Text = "No connection established"
+                lblConnectionStatus.BackColor = Color.Red
+
+                DialogResult = DialogResult.None
+            Else
+                My.Settings.Save()
+
+                MsgBox("Connection successful!", MsgBoxStyle.Information, "Database Connection")
+
+                lblConnectionStatus.Text = "Connection established!"
+                lblConnectionStatus.BackColor = Color.GreenYellow
+
+                DialogResult = DialogResult.OK
+            End If
+        Catch ex As Exception
             MsgBox("Connection failed!", MsgBoxStyle.Information, "Database Connection")
 
             lblConnectionStatus.Text = "No connection established"
             lblConnectionStatus.BackColor = Color.Red
 
             DialogResult = DialogResult.None
-        Else
-            MsgBox("Connection successful!", MsgBoxStyle.Information, "Database Connection")
-
-            lblConnectionStatus.Text = "Connection established!"
-            lblConnectionStatus.BackColor = Color.GreenYellow
-
-            DialogResult = DialogResult.OK
-        End If
+        End Try
     End Sub
 End Class