Changeset 21 for trunk/UDatabase.pas

Timestamp:

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

Author:

chronos

Message:

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

File:

• trunk/UDatabase.pas (modified) (13 diffs)

trunk/UDatabase.pas

@@ -143 +143 @@
     Name: string;
     Params: TDbConnectParams;
+    destructor Destroy; override;
+    function GetClient: TDbClient;
     property ClientType: TDbClientType read FClientType write SetClientType;
   end;
@@ -152 +154 @@
     procedure LoadFromRegistry(Context: TRegistryContext);
     procedure SaveToRegistry(Context: TRegistryContext);
-    function FindByName(Name: string): TDbConnectProfile;
+    function SearchByName(Name: string): TDbConnectProfile;
   end;
 
@@ -170 +172 @@
     function RegisterType(Id: Integer; Name, Title: string;
       FieldType: TFieldType; FieldTypeClass: TFieldTypeSpecificClass): TDataType;
-    function FindByType(FieldType: TFieldType): TDataType;
-    function FindByName(Name: string): TDataType;
+    function SearchByType(FieldType: TFieldType): TDataType;
+    function SearchByName(Name: string): TDataType;
   end;
 
@@ -183 +185 @@
     procedure SetConnectProfile(AValue: TDbConnectProfile); virtual;
   public
-    procedure Query(DbRows: TDbRows; Text: string); virtual;
+    procedure Query(Text: string; DbRows: TDbRows = nil); virtual;
     procedure LoadTables(Tables: TTables); virtual;
     constructor Create; virtual;
@@ -373 +375 @@
 end;
 
-function TDbConnectProfiles.FindByName(Name: string): TDbConnectProfile;
+function TDbConnectProfiles.SearchByName(Name: string): TDbConnectProfile;
 var
   I: Integer;
@@ -389 +391 @@
   if FClientType = AValue then Exit;
   if Assigned(FClientType) then begin
-    Params.Free;
+    FreeAndNil(Params);
   end;
   FClientType := AValue;
@@ -395 +397 @@
     Params := FClientType.ConnectParmasClass.Create;
   end;
+end;
+
+destructor TDbConnectProfile.Destroy;
+begin
+  ClientType := nil;
+  if Assigned(Params) then Params.Free;
+  inherited Destroy;
+end;
+
+function TDbConnectProfile.GetClient: TDbClient;
+begin
+  Result := ClientType.DatabaseClientClass.Create;
+  Result.ConnectProfile := Self;
 end;
 
@@ -422 +437 @@
 end;
 
-procedure TDbClient.Query(DbRows: TDbRows; Text: string);
+procedure TDbClient.Query(Text: string; DbRows: TDbRows = nil);
 begin
 end;
@@ -482 +497 @@
 end;
 
-function TDataTypes.FindByType(FieldType: TFieldType): TDataType;
+function TDataTypes.SearchByType(FieldType: TFieldType): TDataType;
 var
   I: Integer;
@@ -492 +507 @@
 end;
 
-function TDataTypes.FindByName(Name: string): TDataType;
+function TDataTypes.SearchByName(Name: string): TDataType;
 var
   I: Integer;
@@ -510 +525 @@
   DataTypes.Clear;
   for I := Low(TFieldType) to High(TFieldType) do
-    if I in Types then DataTypes.Add(ADataTypes.FindByType(I));
+    if I in Types then DataTypes.Add(ADataTypes.SearchByType(I));
 end;
 
@@ -698 +713 @@
   Records.Clear;
   DbRows := TDbRows.Create;
-  DbClient.Query(DbRows, 'SELECT * FROM ' + Name);
+  DbClient.Query('SELECT * FROM ' + Name, DbRows);
   for I := 0 to DbRows.Count - 1 do begin
     NewRecord := TRecord.Create;
@@ -723 +738 @@
   Records.Clear;
   DbRows := TDbRows.Create;
-  DbClient.Query(DbRows, 'SELECT COUNT(*) FROM ' + Name);
+  DbClient.Query('SELECT COUNT(*) FROM ' + Name, DbRows);
   if DbRows.Count = 1 then begin
     RecordsCount := StrToInt(TDictionaryStringString(DbRows[0]).Items[0].Value);