Changeset 20 for trunk/UCore.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/UCore.pas (modified) (10 diffs)

trunk/UCore.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, XMLConf, FileUtil, Controls, ActnList, UDatabase,
-  UCoolTranslator, UApplicationInfo, UPersistentForm, Forms;
+  Classes, SysUtils, FileUtil, Controls, ActnList, UDatabase,
+  UCoolTranslator, UApplicationInfo, UPersistentForm, Forms, URegistry;
 
 type
@@ -23 +23 @@
     ImageList1: TImageList;
     PersistentForm1: TPersistentForm;
-    XMLConfig1: TXMLConfig;
     procedure AAboutExecute(Sender: TObject);
     procedure ADatabaseConnectExecute(Sender: TObject);
@@ -33 +32 @@
     procedure DataModuleDestroy(Sender: TObject);
   private
-    FDatabase: TDatabase;
+    FDbClient: TDbClient;
     Initialized: Boolean;
-    procedure InitEngines;
-    procedure InitDataTypes;
-    procedure SetDatabase(AValue: TDatabase);
+    procedure SetDbClient(AValue: TDbClient);
   public
     Preferences: TPreferences;
-    Databases: TDatabases;
-    Engines: TDatabaseEngines;
-    DataTypes: TDataTypes;
+    DbManager: TDbManager;
     procedure LoadConfig;
     procedure SaveConfig;
@@ -48 +43 @@
     procedure Done;
     procedure UpdateInterface;
-    property Database: TDatabase read FDatabase write SetDatabase;
+    property DbClient: TDbClient read FDbClient write SetDbClient;
   end;
 
@@ -54 +49 @@
   Core: TCore;
 
+const
+  DefaultRegKey = '\Software\Chronosoft\MyData';
+
 
 implementation
 
 uses
-  UEngineXML, UEngineMySQL, UEngineSQLite, UFormTables, UFormConnect,
-  UFormDatabases, UDataTypes, UFormPreferences, UFormMain, UFormAbout;
+  UFormTables, UFormConnect,
+  UFormDatabases, UFormPreferences, UFormMain, UFormAbout;
 
 {$R *.lfm}
 
-resourcestring
-  STypeString = 'String';
-  STypeInteger = 'Integer';
-  STypeFloat = 'Float';
-  STypeBoolean = 'Boolean';
-  STypeMapPosition = 'Map position';
-  STypeImage = 'Image';
-  STypeDate = 'Date';
-  STypeTime = 'Time';
-  STypeDateTime = 'Date and time';
-  STypeReference = 'Reference';
-
 { TCore }
 
 procedure TCore.DataModuleCreate(Sender: TObject);
 begin
-  Databases := TDatabases.Create;
-  Engines := TDatabaseEngines.Create;
-  DataTypes := TDataTypes.Create;
+  DbManager := TDbManager.Create;
   Preferences := TPreferences.Create;
 end;
 
+procedure TCore.DataModuleDestroy(Sender: TObject);
+begin
+  DbClient := nil;
+  FreeAndNil(Preferences);
+  FreeAndNil(DbManager);
+end;
+
 procedure TCore.AExitExecute(Sender: TObject);
 begin
@@ -92 +83 @@
 procedure TCore.ADatabaseDisconnectExecute(Sender: TObject);
 begin
-  Database := nil;
+  DbClient := nil;
 end;
 
 procedure TCore.ADatabaseConnectExecute(Sender: TObject);
+var
+  NewClient: TDbClient;
 begin
   if FormDatabases.ShowModal = mrOk then begin
-    Database := FormDatabases.SelectedDatabase;
+    DbClient := nil;
+    NewClient := FormDatabases.SelectedProfile.ClientType.DatabaseClientClass.Create;
+    NewClient.ConnectProfile := FormDatabases.SelectedProfile;
+    DbClient := NewClient;
   end;
 end;
@@ -122 +118 @@
   I: Integer;
 begin
-  for I := 0 to DataTypes.Count - 1 do begin
-    TDataType(DataTypes[I]).Title := CoolTranslator1.TranslateText(TDataType(DataTypes[I]).Title, TDataType(DataTypes[I]).Title);
-  end;
-end;
-
-procedure TCore.DataModuleDestroy(Sender: TObject);
-begin
-  FreeAndNil(Preferences);
-  FreeAndNil(DataTypes);
-  FreeAndNil(Engines);
-  FreeAndNil(Databases);
-end;
-
-procedure TCore.InitEngines;
-var
-  NewEngine: TDatabaseEngine;
-begin
-  Engines.Clear;
-  NewEngine := Engines.RegisterEngine('XML file', TDatabaseXML);
-  NewEngine.UseTypes(DataTypes, [ftString, ftInteger, ftDateTime, ftBoolean, ftFloat]);
-
-  NewEngine := Engines.RegisterEngine('MySQL', TDatabaseMySQL);
-  NewEngine.UseTypes(DataTypes, [ftString, ftInteger, ftDateTime, ftBoolean, ftFloat,
-    ftReference]);
-
-  NewEngine := Engines.RegisterEngine('SQLite', TDatabaseSQLite);
-  NewEngine.UseTypes(DataTypes, [ftString, ftInteger, ftDateTime, ftBoolean, ftFloat]);
-end;
-
-procedure TCore.InitDataTypes;
-begin
-  DataTypes.Clear;
-  with DataTypes do begin
-    RegisterType(1, 'String', STypeString, ftString, TFieldString);
-    RegisterType(2, 'Integer', STypeInteger, ftInteger, TFieldInteger);
-    RegisterType(3, 'DateTime', STypeDateTime, ftDateTime, TFieldDateTime);
-    RegisterType(4, 'Boolean', STypeBoolean, ftBoolean, TFieldBoolean);
-    RegisterType(5, 'Float', STypeFloat, ftFloat, TFieldFloat);
-    RegisterType(6, 'MapPosition', STypeMapPosition, ftMapPosition, TFieldMapPosition);
-    RegisterType(7, 'Date', STypeDate, ftDate, TFieldDate);
-    RegisterType(8, 'Time', STypeTime, ftTime, TFieldTime);
-    RegisterType(9, 'Image', STypeImage, ftImage, TFieldImage);
-    RegisterType(10, 'Reference', STypeReference, ftReference, TFieldReference);
-  end;
-end;
-
-procedure TCore.SetDatabase(AValue: TDatabase);
-begin
-  if FDatabase = AValue then Exit;
-  if Assigned(FDatabase) then begin
-    FDatabase.Save;
-    FDatabase.Clear;
-  end;
-  FDatabase := AValue;
-  if Assigned(FDatabase) then begin
-    FDatabase.Load;
-    Preferences.LastDatabaseName := FDatabase.Name;
-  end;
-  FormTables.Database := FDatabase;
+  for I := 0 to DbManager.DataTypes.Count - 1 do begin
+    TDataType(DbManager.DataTypes[I]).Title := CoolTranslator1.TranslateText(TDataType(DbManager.DataTypes[I]).Title, TDataType(DbManager.DataTypes[I]).Title);
+  end;
+end;
+
+procedure TCore.SetDbClient(AValue: TDbClient);
+begin
+  if FDbClient = AValue then Exit;
+  if Assigned(FDbClient) then begin
+    DbClient.Save;
+    FDbClient.Free;
+  end;
+  FDbClient := AValue;
+  if Assigned(FDbClient) then begin
+    DbClient.Load;
+    Preferences.LastDatabaseName := FDbClient.ConnectProfile.Name;
+    if not Assigned(FormTables.Tables) then
+      FormTables.Tables := TTables.Create;
+    DbClient.LoadTables(FormTables.Tables);
+  end;
   UpdateInterface;
 end;
 
 procedure TCore.LoadConfig;
-var
-  I: Integer;
-  NewDatabase: TDatabase;
-  Engine: TDatabaseEngine;
-begin
-  XMLConfig1.FileName := 'Config.xml';
-  Databases.Count := XMLConfig1.GetValue('Database/Count', 0);
-  for I := 0 to Databases.Count - 1 do begin
-    Engine := Core.Engines.FindByName(XMLConfig1.GetValue('Database/Item' + IntToStr(I) + '/Engine', ''));
-
-    NewDatabase := TDatabase.Create;
-    NewDatabase.Engine := Engine;
-    NewDatabase.Name := XMLConfig1.GetValue('Database/Item' + IntToStr(I) + '/Name', '');
-    NewDatabase.ConnectionString := XMLConfig1.GetValue('Database/Item' + IntToStr(I) + '/ConnectionString', '');
-    Databases[I] := NewDatabase;
-  end;
-  //Databases.ConnectionString := XMLConfig1.GetValue('ConnectionString', 'file://' + ExtractFileDir(Application.ExeName) + '/data.xml');
-  Preferences.RememberDatabase := XMLConfig1.GetValue('RememberDatabase', True);
-  Preferences.LastDatabaseName := XMLConfig1.GetValue('LastDatabaseName', '');
-  CoolTranslator1.Language := CoolTranslator1.Languages.SearchByCode(XMLConfig1.GetValue('Language', ''));
+begin
+  with TRegistryEx.Create do
+  try
+    CurrentContext := TRegistryContext.Create(rrKeyCurrentUser, DefaultRegKey);
+    Preferences.RememberDatabase := GetValue('RememberDatabase', True);
+    Preferences.LastDatabaseName := GetValue('LastDatabaseName', '');
+    CoolTranslator1.Language := CoolTranslator1.Languages.SearchByCode(
+      GetValue('Language', ''));
+  finally
+    Free;
+  end;
+  DbManager.ConnectProfiles.LoadFromRegistry(TRegistryContext.Create(rrKeyCurrentUser, DefaultRegKey + '\Database'));
 end;
 
 procedure TCore.SaveConfig;
-var
-  I: Integer;
-begin
-  XMLConfig1.SetValue('Database/Count', Databases.Count);
-  for I := 0 to Databases.Count - 1 do begin
-    XMLConfig1.SetValue('Database/Item' + IntToStr(I) + '/Name', TDatabase(Databases[I]).Name);
-    XMLConfig1.SetValue('Database/Item' + IntToStr(I) + '/ConnectionString', TDatabase(Databases[I]).ConnectionString);
-    XMLConfig1.SetValue('Database/Item' + IntToStr(I) + '/Engine', TDatabase(Databases[I]).Engine.Name);
-  end;
-  XMLConfig1.SetValue('RememberDatabase', Preferences.RememberDatabase);
-  XMLConfig1.SetValue('LastDatabaseName', Preferences.LastDatabaseName);
-  XMLConfig1.SetValue('Language', CoolTranslator1.Language.Code);
+begin
+  with TRegistryEx.Create do
+  try
+    CurrentContext := TRegistryContext.Create(rrKeyCurrentUser, DefaultRegKey);
+    SetValue('RememberDatabase', Preferences.RememberDatabase);
+    SetValue('LastDatabaseName', Preferences.LastDatabaseName);
+    SetValue('Language', CoolTranslator1.Language.Code);
+  finally
+    Free;
+  end;
+  DbManager.ConnectProfiles.SaveToRegistry(TRegistryContext.Create(rrKeyCurrentUser, DefaultRegKey + '\Database'));
 end;
 
 procedure TCore.Init;
+var
+  ConnectProfile: TDbConnectProfile;
 begin
   if not Initialized then begin
@@ -230 +180 @@
       CoolTranslator1.POFilesFolder := '/usr/share/MyData/languages';
     {$ENDIF}
-    InitDataTypes;
-    InitEngines;
     FormConnect.Init;
     Initialized := True;
@@ -238 +186 @@
     UpdateInterface;
     if Preferences.RememberDatabase then begin
-      Database := Databases.FindByName(Preferences.LastDatabaseName);
+      ConnectProfile := DbManager.ConnectProfiles.FindByName(Preferences.LastDatabaseName);
+      if Assigned(ConnectProfile) then
+        DbClient := ConnectProfile.ClientType.DatabaseClientClass.Create;
     end else ADatabaseConnect.Execute;
   end;
@@ -250 +200 @@
 procedure TCore.UpdateInterface;
 begin
-  ADatabaseDisconnect.Enabled := Assigned(FormTables.Database);
+  ADatabaseDisconnect.Enabled := Assigned(DbClient);
   FormMain.UpdateInterface;
 end;