Changeset 561 for PersistentData/Backend

Timestamp:

Sep 10, 2022, 6:26:39 PM (2 years ago)

Author:

chronos

Message:

• Modified: Code cleanup.
• Modified: Use Generics.Collections.

Location:

PersistentData/Backend

Files:

• UPDClientINI.pas (modified) (3 diffs)
• UPDClientMemory.pas (modified) (9 diffs)
• UPDClientMySQL.pas (modified) (6 diffs)
• UPDClientRegistry.pas (modified) (4 diffs)
• UPDClientXMLRPC.pas (modified) (2 diffs)

PersistentData/Backend/UPDClientINI.pas

@@ -1 +1 @@
 unit UPDClientINI;
-
-{$mode delphi}
 
 interface
@@ -23 +21 @@
     procedure Disconnect; override;
   end;
+
 
 implementation
@@ -49 +48 @@
 begin
   Disconnect;
-  inherited Destroy;
+  inherited;
 end;
 

PersistentData/Backend/UPDClientMemory.pas

@@ -1 +1 @@
 unit UPDClientMemory;
-
-{$mode Delphi}{$H+}
 
 interface
 
 uses
-  Classes, SysUtils, UPDClient, SpecializedList;
+  Classes, SysUtils, UPDClient, Generics.Collections;
 
 type
@@ -21 +19 @@
     function SearchObject(Id: Integer): TObjectProxy;
   public
-    Objects: TListObject;
+    Objects: TObjectProxies;
     procedure ObjectLoad(AObject: TObjectProxy); override;
     procedure ObjectSave(AObject: TObjectProxy); override;
@@ -40 +38 @@
 resourcestring
   SObjectNotFound = 'Object with id %s not found';
+
 
 implementation
@@ -97 +96 @@
     else begin
       AObject.Id := GetNewObjectId;
-      Obj := TObjectProxy(Objects.AddNew(TObjectProxy.Create));
+      Obj := Objects.AddProxy;
       Obj.Assign(AObject);
     end;
@@ -119 +118 @@
   NewObject: TObjectProxy;
   Table: string;
+  Item: TPair<string, string>;
 begin
   AList.Objects.Clear;
@@ -132 +132 @@
 
       if AList.ColummsFilterUse then begin
-        for P := 0 to Properties.Count - 1 do
-        if AList.ColumnsFilter.IndexOf(Properties.Keys[I]) <> -1 then
-          NewObject.Properties.Add(Properties.Keys[I], Properties[I].Value);
+        for Item in Properties do
+        if AList.ColumnsFilter.IndexOf(Item.Key) <> -1 then
+          NewObject.Properties.Add(Item.Key, Item.Value);
       end else NewObject.Properties.Assign(Properties);
     end;
@@ -147 +147 @@
 procedure TPDClientMemory.ListSave(AList: TListProxy);
 begin
-
 end;
 
 procedure TPDClientMemory.TypeDefine(AType: TPDType);
 begin
-
 end;
 
 procedure TPDClientMemory.TypeUndefine(AType: TPDType);
 begin
-
 end;
 
 function TPDClientMemory.TypeIsDefined(AType: TPDType): Boolean;
 begin
-
+  Result := False;
 end;
 
 procedure TPDClientMemory.Install;
 begin
-
 end;
 
 procedure TPDClientMemory.Uninstall;
 begin
-
 end;
 
@@ -178 +173 @@
 begin
   inherited;
-  Objects := TListObject.Create;
+  Objects := TObjectProxies.Create;
   BackendName := 'Memory';
 end;
@@ -184 +179 @@
 destructor TPDClientMemory.Destroy;
 begin
-  Objects.Free;
-  inherited Destroy;
+  FreeAndNil(Objects);
+  inherited;
 end;
 
 procedure TPDClientMemory.Connect;
 begin
-  inherited Connect;
+  inherited;
 end;
 
 procedure TPDClientMemory.Disconnect;
 begin
-  inherited Disconnect;
+  inherited;
 end;
 

PersistentData/Backend/UPDClientMySQL.pas

@@ -1 +1 @@
 unit UPDClientMySQL;
 
-{$mode delphi}
-
 interface
 
 uses
-  Classes, SysUtils, USqlDatabase, UPDClient, SpecializedDictionary;
+  Classes, SysUtils, USqlDatabase, UPDClient, UGenerics;
 
 type
@@ -22 +20 @@
     function GetConnected: Boolean; override;
     procedure Init; override;
+    function GetConnectionString: string; override;
   public
     procedure ObjectLoad(AObject: TObjectProxy); override;
@@ -45 +44 @@
   end;
 
+
 implementation
-
 
 resourcestring
   SMissingBaseType = 'Missing base typ for %s';
   SUndefinedType = 'Undefined type in %0:s.%1:s';
-
 
 { TPDClientMySQL }
@@ -155 +153 @@
 procedure TPDClientMySQL.ListSave(AList: TListProxy);
 begin
-
 end;
 
@@ -245 +242 @@
 end;
 
+function TPDClientMySQL.GetConnectionString: string;
+begin
+  Result := 'Host:' + Host + ',Port:' + IntToStr(Port) + ',User:' + User +
+    ',Password:' + Password + ',Schema:' + Schema;
+end;
+
 constructor TPDClientMySQL.Create(AOwner: TComponent);
 begin
@@ -255 +258 @@
 begin
   FreeAndNil(FDatabase);
-  inherited Destroy;
+  inherited;
 end;
 

PersistentData/Backend/UPDClientRegistry.pas

@@ -1 +1 @@
 unit UPDClientRegistry;
-
-{$mode delphi}
 
 interface
@@ -13 +11 @@
 
   TPDClientRegistry = class(TPDClient)
+  public
     Reg: TRegistry;
     //procedure GetItemList(Condition: TCondition; ItemList: TItemList); override;
@@ -19 +18 @@
     destructor Destroy; override;
   end;
+
 
 implementation
@@ -46 +46 @@
 begin
   Reg.Free;
-  inherited Destroy;
+  inherited;
 end;
 

PersistentData/Backend/UPDClientXMLRPC.pas

@@ -1 +1 @@
 unit UPDClientXMLRPC;
-
-{$mode delphi}
 
 interface
@@ -16 +14 @@
   end;
 
+
 implementation
-
 
 { TPDClientXMLRPC }