Changeset 20 for trunk/Forms/UFormDatabases.pas

Timestamp:

Mar 23, 2018, 1:59:25 PM (6 years ago)

Author:

chronos

Message:

• Modified: Database classes reorganized. Now TDbConnectProfile is class which holds information about connection to database.
• Modified: TDbManager is top most class for managing other database classes.
• Modified: TDbConnectParams class contains client specific parameters for connect profile.

File:

• trunk/Forms/UFormDatabases.pas (modified) (7 diffs)

trunk/Forms/UFormDatabases.pas

@@ -40 +40 @@
       Selected: Boolean);
   private
-    { private declarations }
   public
-    SelectedDatabase: TDatabase;
+    SelectedProfile: TDbConnectProfile;
     procedure ReloadList;
     procedure UpdateInterface;
@@ -67 +66 @@
 begin
   if Assigned(ListView1.Selected) then begin
-    SelectedDatabase := TDatabase(ListView1.Selected.Data);
+    SelectedProfile := TDbConnectProfile(ListView1.Selected.Data);
     ModalResult := mrOk;
   end;
@@ -76 +75 @@
   if Assigned(ListView1.Selected) then begin
     if MessageDlg('Remove database connection', 'Do you want to really remove database connection ' +
-    TDatabase(ListView1.Selected.Data).Name, mtConfirmation, [mbYes, mbNo], 0) = mrYes then begin
-      Core.Databases.Remove(ListView1.Selected.Data);
+    TDbConnectProfile(ListView1.Selected.Data).Name, mtConfirmation, [mbYes, mbNo], 0) = mrYes then begin
+      Core.DbManager.ConnectProfiles.Remove(ListView1.Selected.Data);
       ReloadList;
     end;
@@ -85 +84 @@
 procedure TFormDatabases.AAddExecute(Sender: TObject);
 var
-  NewDatabase: TDatabase;
+  NewConnectProfile: TDbConnectProfile;
 begin
-  NewDatabase := TDatabase.Create;
-  NewDatabase.Name := 'New database';
-  FormConnect.Load(NewDatabase);
+  NewConnectProfile := TDbConnectProfile.Create;
+  NewConnectProfile.Name := 'New database';
+  FormConnect.Load(NewConnectProfile);
   if FormConnect.ShowModal = mrOk then begin
-    FormConnect.Save(NewDatabase);
-    Core.Databases.Add(NewDatabase);
+    FormConnect.Save(NewConnectProfile);
+    Core.DbManager.ConnectProfiles.Add(NewConnectProfile);
     ReloadList;
-  end else NewDatabase.Free;
+  end else NewConnectProfile.Free;
 end;
 
@@ -100 +99 @@
 begin
   if Assigned(ListView1.Selected) then begin
-    FormConnect.Load(TDatabase(ListView1.Selected.Data));
+    FormConnect.Load(TDbConnectProfile(ListView1.Selected.Data));
     if FormConnect.ShowModal = mrOk then begin
-      FormConnect.Save(TDatabase(ListView1.Selected.Data));
+      FormConnect.Save(TDbConnectProfile(ListView1.Selected.Data));
       ReloadList;
     end;
@@ -119 +118 @@
 procedure TFormDatabases.ListView1Data(Sender: TObject; Item: TListItem);
 begin
-  if (Item.Index >= 0) and (Item.Index < Core.Databases.Count) then
-  with TDatabase(Core.Databases[Item.Index]) do begin
+  if (Item.Index >= 0) and (Item.Index < Core.DbManager.ConnectProfiles.Count) then
+  with TDbConnectProfile(Core.DbManager.ConnectProfiles[Item.Index]) do begin
     Item.Caption := Name;
-    Item.SubItems.Add(Engine.Name);
-    Item.SubItems.Add(ConnectionString);
-    Item.Data := Core.Databases[Item.Index];
+    Item.SubItems.Add(ClientType.Name);
+    Item.SubItems.Add(Params.ConnectionString);
+    Item.Data := Core.DbManager.ConnectProfiles[Item.Index];
   end
 end;
@@ -136 +135 @@
 procedure TFormDatabases.ReloadList;
 begin
-  ListView1.Items.Count := Core.Databases.Count;
+  ListView1.Items.Count := Core.DbManager.ConnectProfiles.Count;
   ListView1.Repaint;
   UpdateInterface;