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

trunk/DbEngines/UEngineMySQL.pas

@@ -12 +12 @@
   { TDatabaseMySQL }
 
-  TDatabaseMySQL = class(TDatabaseClient)
+  TDatabaseMySQL = class(TDbClient)
   private
     procedure LoadFields(Table: TTable);
-    procedure LoadTables;
+  protected
+    procedure LoadTables(Tables: TTables); override;
   public
     SqlDatabase: TSqlDatabase;
@@ -25 +26 @@
   end;
 
+  { TDbConnectParamsMySQL }
+
+  TDbConnectParamsMySQL = class(TDbConnectParams)
+  protected
+    function GetConnectionString: string; override;
+    procedure SetConnectionString(AValue: string); override;
+  public
+    Host: string;
+    Port: Word;
+  end;
+
+
 implementation
+
+{ TDbConnectParamsMySQL }
+
+function TDbConnectParamsMySQL.GetConnectionString: string;
+begin
+  Result := 'mysql://' + Host + ':' + IntToStr(Port);
+end;
+
+procedure TDbConnectParamsMySQL.SetConnectionString(AValue: string);
+var
+  URL: TURL;
+begin
+  URL := TURL.Create;
+  try
+    URL.AsString := AValue;
+    if (URL.Scheme <> 'mysql') and (AValue <> '') then
+      raise Exception.Create('Wrong connection string. Required mysql scheme.');
+    Host := URL.Host.AsString;
+    Port := URL.Port;
+  finally
+    URL.Free;
+  end;
+end;
 
 { TDatabaseMySQL }
@@ -51 +87 @@
       if DbRows2.Count > 0 then begin
         TypeName := TDictionaryStringString(DbRows2[0]).Values['Name'];
-        NewField.DataType := Table.Database.Engine.DataTypes.FindByName(TypeName);
+        NewField.DataType := Table.DbClient.ClientType.DataTypes.FindByName(TypeName);
         if not Assigned(NewField.DataType) then
-          NewField.DataType := Table.Database.Engine.DataTypes.FindByType(ftString);
+          NewField.DataType := Table.DbClient.ClientType.DataTypes.FindByType(ftString);
       end else begin
         // Use string as default
-        NewField.DataType := Table.Database.Engine.DataTypes.FindByType(ftString);
+        NewField.DataType := Table.DbClient.ClientType.DataTypes.FindByType(ftString);
       end;
       Table.Fields.Add(NewField);
@@ -66 +102 @@
 end;
 
-procedure TDatabaseMySQL.LoadTables;
+procedure TDatabaseMySQL.LoadTables(Tables: TTables);
 var
   DbRows: TDbRows;
@@ -78 +114 @@
       NewTable := TTable.Create;
       NewTable.Id := StrToInt(TDictionaryStringString(DbRows[I]).Values['Id']);
-      NewTable.Database := Database;
+      NewTable.DbClient := Self;
       NewTable.Name := TDictionaryStringString(DbRows[I]).Values['Name'];
       NewTable.Caption := TDictionaryStringString(DbRows[I]).Values['Title'];
       LoadFields(NewTable);
-      Database.Tables.Add(NewTable);
+      Tables.Add(NewTable);
     end;
   finally
@@ -112 +148 @@
   URL := TURL.Create;
   try
-    URL.AsString := Database.ConnectionString;
+    URL.AsString := ConnectProfile.Params.ConnectionString;
     if URL.Scheme <> 'mysql' then
       raise Exception.Create('Wrong connection string. Required mysql protocol.');
@@ -124 +160 @@
       SqlDatabase.Database := Copy(URL.Path, 2, High(Integer));
     SqlDatabase.Connect;
-    LoadTables;
   finally
     URL.Free;