Changeset 21 for trunk/DbEngines

Timestamp:

Mar 23, 2018, 3:06:47 PM (7 years ago)

Author:

chronos

Message:

• Modified: Allow to create and remove tables for XML backend.

Location:

trunk/DbEngines

Files:

• UEngineMySQL.pas (modified) (3 diffs)
• UEngineXML.pas (modified) (6 diffs)

trunk/DbEngines/UEngineMySQL.pas

@@ -19 +19 @@
   public
     SqlDatabase: TSqlDatabase;
-    procedure Query(DbRows: TDbRows; Text: string); override;
+    procedure Query(Text: string; DbRows: TDbRows = nil); override;
     constructor Create; override;
     destructor Destroy; override;
@@ -87 +87 @@
       if DbRows2.Count > 0 then begin
         TypeName := TDictionaryStringString(DbRows2[0]).Values['Name'];
-        NewField.DataType := Table.DbClient.ClientType.DataTypes.FindByName(TypeName);
+        NewField.DataType := Table.DbClient.ClientType.DataTypes.SearchByName(TypeName);
         if not Assigned(NewField.DataType) then
-          NewField.DataType := Table.DbClient.ClientType.DataTypes.FindByType(ftString);
+          NewField.DataType := Table.DbClient.ClientType.DataTypes.SearchByType(ftString);
       end else begin
         // Use string as default
-        NewField.DataType := Table.DbClient.ClientType.DataTypes.FindByType(ftString);
+        NewField.DataType := Table.DbClient.ClientType.DataTypes.SearchByType(ftString);
       end;
       Table.Fields.Add(NewField);
@@ -125 +125 @@
 end;
 
-procedure TDatabaseMySQL.Query(DbRows: TDbRows; Text: string);
+procedure TDatabaseMySQL.Query(Text: string; DbRows: TDbRows = nil);
 begin
   SqlDatabase.Query(DbRows, Text);

trunk/DbEngines/UEngineXML.pas

@@ -30 +30 @@
     procedure LoadFromFile(FileName: string);
     procedure SaveToFile(FileName: string);
-    function GetNextPart(var Text: string): string;
+    function GetNextPart(var Text: string; Separator: string = ' '): string;
   protected
   public
-    procedure Query(DbRows: TDbRows; Text: string); override;
+    procedure Query(Text: string; DbRows: TDbRows = nil); override;
     procedure LoadTables(Tables: TTables); override;
     procedure Load; override;
@@ -158 +158 @@
 begin
   Field.Name := ReadString(Node, 'Name', '');
-  Field.DataType := Field.Table.DbClient.ClientType.DataTypes.FindByType(TFieldType(ReadInteger(Node, 'Type', 0)));
+  Field.DataType := Field.Table.DbClient.ClientType.DataTypes.SearchByType(TFieldType(ReadInteger(Node, 'Type', 0)));
   Field.TextBefore := ReadString(Node, 'TextBefore', '');
   Field.TextAfter := ReadString(Node, 'TextAfter', '');
@@ -296 +296 @@
       SaveNodeTables(Tables, NewNode);
     end;
-    ForceDirectories(ExtractFileDir(FileName));
+    if Pos(DirectorySeparator, FileName) > 0 then
+      ForceDirectories(ExtractFileDir(FileName));
     WriteXMLFile(Doc, FileName);
   finally
@@ -303 +304 @@
 end;
 
-function TDatabaseXML.GetNextPart(var Text: string): string;
-begin
-  if Pos(' ', Text) > 0 then begin
-    Result := Trim(Copy(Text, 1, Pos(' ', Text) - 1));
-    Delete(Text, 1, Pos(' ', Text));
+function TDatabaseXML.GetNextPart(var Text: string; Separator: string = ' '): string;
+begin
+  if Pos(Separator, Text) > 0 then begin
+    Result := Trim(Copy(Text, 1, Pos(Separator, Text) - Length(Separator)));
+    Delete(Text, 1, Pos(Separator, Text));
   end else begin
     Result := Text;
@@ -314 +315 @@
 end;
 
-procedure TDatabaseXML.Query(DbRows: TDbRows; Text: string);
+procedure TDatabaseXML.Query(Text: string; DbRows: TDbRows = nil);
 var
   Command: string;
@@ -348 +349 @@
       end else raise Exception.Create('Unsupported columns ' + Columns + ' specification');
     end else raise Exception.Create('Table ' + TableName + ' not found.');
-  end else raise Exception.Create('Unsupported SQL command ' + Command);
+  end else
+  if Command = 'CREATE' then begin
+    Command := GetNextPart(Text);
+    if Command = 'TABLE' then begin
+      TableName := GetNextPart(Text);
+      Table := TTable.Create;
+      Table.Name := TableName;
+      Table.DbClient := Self;
+      Tables.Add(Table);;
+    end else raise Exception.Create('TABLE keyword expected');
+  end else
+  if Command = 'DROP' then begin
+    Command := GetNextPart(Text);
+    if Command = 'TABLE' then begin
+      TableName := GetNextPart(Text);
+      Table := Tables.SearchByName(TableName);
+      if Assigned(Table) then Tables.Remove(Table)
+      else raise Exception.Create('Table ' + TableName + ' not found');
+    end else raise Exception.Create('TABLE keyword expected');
+  end else
+    raise Exception.Create('Unsupported SQL command ' + Command);
 end;
 
 procedure TDatabaseXML.LoadTables(Tables: TTables);
 begin
-  inherited;
-
+  Tables.Assign(Self.Tables);
 end;
 
 procedure TDatabaseXML.Load;
 begin
+  FileName := TDbConnectParamsXml(ConnectProfile.Params).FileName;
   if FileExists(FileName) then
     LoadFromFile(FileName);