Changeset 20 for trunk/DbEngines/UEngineXML.pas

Timestamp:

Mar 23, 2018, 1:59:25 PM (7 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/UEngineXML.pas (modified) (11 diffs)

trunk/DbEngines/UEngineXML.pas

@@ -12 +12 @@
   { TDatabaseXML }
 
-  TDatabaseXML = class(TDatabaseClient)
+  TDatabaseXML = class(TDbClient)
   private
-    function GetFileName: string;
+    FFileName: string;
+    Tables: TTables;
     procedure LoadNodeRecord(Row: TRecord; Node: TDOMNode);
     procedure SaveNodeRecord(Row: TRecord; Node: TDOMNode);
@@ -30 +31 @@
     procedure SaveToFile(FileName: string);
     function GetNextPart(var Text: string): string;
+  protected
   public
     procedure Query(DbRows: TDbRows; Text: string); override;
+    procedure LoadTables(Tables: TTables); override;
     procedure Load; override;
     procedure Save; override;
-    property FileName: string read GetFileName;
+    constructor Create; override;
+    destructor Destroy; override;
+    property FileName: string read FFileName write FFileName;
+  end;
+
+  { TDbConnectParamsXml }
+
+  TDbConnectParamsXml = class(TDbConnectParams)
+  protected
+    function GetConnectionString: string; override;
+    procedure SetConnectionString(AValue: string); override;
+  public
+    FileName: string;
   end;
 
@@ -46 +61 @@
   SWrongFileFormat = 'Wrong file format';
 
-{ TDatabaseXML }
-
-function TDatabaseXML.GetFileName: string;
+{ TDbConnectParamsXml }
+
+function TDbConnectParamsXml.GetConnectionString: string;
+begin
+  Result := 'file:///' + FileName;
+end;
+
+procedure TDbConnectParamsXml.SetConnectionString(AValue: string);
 var
   URL: TURL;
@@ -54 +74 @@
   URL := TURL.Create;
   try
-    URL.AsString := Database.ConnectionString;
-    if URL.Scheme <> 'file' then
+    URL.AsString := AValue;
+    if (URL.Scheme <> 'file') and (AValue <> '') then
       raise Exception.Create('Wrong connection string. Required file scheme.');
-
-    Result := URL.Path
+    FileName := Copy(URL.Path, 2, Length(URL.Path));
   finally
     URL.Free;
   end;
 end;
+
+{ TDatabaseXML }
 
 procedure TDatabaseXML.LoadNodeRecord(Row: TRecord; Node: TDOMNode);
@@ -137 +158 @@
 begin
   Field.Name := ReadString(Node, 'Name', '');
-  Field.DataType := Field.Table.Database.Engine.DataTypes.FindByType(TFieldType(ReadInteger(Node, 'Type', 0)));
+  Field.DataType := Field.Table.DbClient.ClientType.DataTypes.FindByType(TFieldType(ReadInteger(Node, 'Type', 0)));
   Field.TextBefore := ReadString(Node, 'TextBefore', '');
   Field.TextAfter := ReadString(Node, 'TextAfter', '');
@@ -219 +240 @@
   while Assigned(Node2) and (Node2.NodeName = 'Table') do begin
     NewTable := TTable.Create;
-    NewTable.Database := Tables.Database;
+    NewTable.DbClient := Tables.DbClient;
     LoadNodeTable(NewTable, Node2);
     Tables.Add(NewTable);
@@ -252 +273 @@
       NewNode := FindNode('Tables');
       if Assigned(NewNode) then
-        LoadNodeTables(Database.Tables, NewNode);
+        LoadNodeTables(Tables, NewNode);
     end;
   finally
@@ -273 +294 @@
       NewNode := OwnerDocument.CreateElement('Tables');
       AppendChild(NewNode);
-      SaveNodeTables(Database.Tables, NewNode);
+      SaveNodeTables(Tables, NewNode);
     end;
     ForceDirectories(ExtractFileDir(FileName));
@@ -310 +331 @@
       TableName := GetNextPart(Text);
     end else raise Exception.Create('No table specified with FROM');
-    Table := Database.Tables.SearchByName(TableName);
+    Table := Tables.SearchByName(TableName);
     if Assigned(Table) then begin
       DbRows.Count := 0;
@@ -330 +351 @@
 end;
 
+procedure TDatabaseXML.LoadTables(Tables: TTables);
+begin
+  inherited;
+
+end;
+
 procedure TDatabaseXML.Load;
 begin
@@ -341 +368 @@
 end;
 
+constructor TDatabaseXML.Create;
+begin
+  Tables := TTables.Create;
+  inherited Create;
+end;
+
+destructor TDatabaseXML.Destroy;
+begin
+  Tables.Free;
+  inherited Destroy;
+end;
+
 
 end.