Changeset 561 for PersistentData/UPDClient.pas

Timestamp:

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

Author:

chronos

Message:

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

File:

• PersistentData/UPDClient.pas (modified) (18 diffs)

PersistentData/UPDClient.pas

@@ -1 +1 @@
 unit UPDClient;
 
-{$mode delphi}
-
 interface
 
 uses
-  Classes, SysUtils, SpecializedList, SpecializedDictionary;
+  Classes, SysUtils, Generics.Collections, UGenerics;
 
 const
@@ -33 +31 @@
     destructor Destroy; override;
     procedure Assign(Source: TObjectProxy);
+  end;
+
+  { TObjectProxies }
+
+  TObjectProxies = class(TObjectList<TObjectProxy>)
+    function AddProxy: TObjectProxy;
   end;
 
@@ -59 +63 @@
     ObjectName: string;
     Path: string;
-    Objects: TListObject; // TListObject<TObjectProxy>
+    Objects: TObjectList<TObjectProxy>;
     procedure Clear;
     constructor Create;
@@ -74 +78 @@
   end;
 
-  { TPDTypePropertyList }
-
-  TPDTypePropertyList = class(TListObject)
+  { TPDTypeProperties }
+
+  TPDTypeProperties = class(TObjectList<TPDTypeProperty>)
     Client: TPDClient;
-    procedure AddSimple(Name: string; TypeName: string; Unique: Boolean = False;
-      Index: Boolean = False);
+    function AddSimple(Name: string; TypeName: string; Unique: Boolean = False;
+      Index: Boolean = False): TPDTypeProperty;
   end;
 
@@ -91 +95 @@
     Name: string;
     DbType: string;
-    Properties: TPDTypePropertyList;
+    Properties: TPDTypeProperties;
     function IsDefined: Boolean;
     procedure Define;
@@ -100 +104 @@
   end;
 
-  { TPDTypeList }
-
-  TPDTypeList = class(TListObject)
+  { TPDTypes }
+
+  TPDTypes = class(TObjectList<TPDType>)
     Client: TPDClient;
     function AddType(Name: string; DbType: string = ''): TPDType;
@@ -121 +125 @@
     procedure SetConnectionString(AValue: string); virtual;
   public
-    Types: TPDTypeList;
+    Types: TPDTypes;
     Version: string;
     BackendName: string;
@@ -149 +153 @@
   TPDClientClass = class of TPDClient;
 
-  resourcestring
-    SClientNotSet = 'Client not set';
-    SNotSupported = 'Not supported';
-    SVersionMismatch = 'Version mismatch, client: %0:s, server: %1:s. Please upgrade database.';
-    SCantLoadObjectWithoutId = 'Can''t load object without id';
+resourcestring
+  SClientNotSet = 'Client not set';
+  SNotSupported = 'Not supported';
+  SVersionMismatch = 'Version mismatch, client: %0:s, server: %1:s. Please upgrade database.';
+  SCantLoadObjectWithoutId = 'Can''t load object without id';
 
 
 implementation
 
-{ TPDTypePropertyList }
-
-procedure TPDTypePropertyList.AddSimple(Name: string; TypeName: string;
-  Unique: Boolean; Index: Boolean);
-var
-  NewProperty: TPDTypeProperty;
-begin
-  NewProperty := TPDTypeProperty(AddNew(TPDTypeProperty.Create));
-  NewProperty.Name := Name;
-  NewProperty.DbType := Client.Types.SearchByName(TypeName);
-  NewProperty.Unique := Unique;
-  NewProperty.Index := Index;
-end;
-
-
-{ TPDTypeList }
-
-function TPDTypeList.AddType(Name: string; DbType: string = ''): TPDType;
-begin
-  Result := TPDType(AddNew(TPDType.Create));
+{ TObjectProxies }
+
+function TObjectProxies.AddProxy: TObjectProxy;
+begin
+  Result := TObjectProxy.Create;
+  Add(Result);
+end;
+
+{ TPDTypeProperties }
+
+function TPDTypeProperties.AddSimple(Name: string; TypeName: string;
+  Unique: Boolean = False; Index: Boolean = False): TPDTypeProperty;
+begin
+  Result := TPDTypeProperty.Create;
+  Result.Name := Name;
+  Result.DbType := Client.Types.SearchByName(TypeName);
+  Result.Unique := Unique;
+  Result.Index := Index;
+  Add(Result);
+end;
+
+{ TPDTypes }
+
+function TPDTypes.AddType(Name: string; DbType: string = ''): TPDType;
+begin
+  Result := TPDType.Create;
   Result.Client := Client;
   Result.Name := Name;
   Result.DbType := DbType;
-end;
-
-function TPDTypeList.SearchByName(Name: string): TPDType;
+  Add(Result);
+end;
+
+function TPDTypes.SearchByName(Name: string): TPDType;
 var
   I: Integer;
@@ -220 +231 @@
 constructor TPDType.Create;
 begin
-  Properties := TPDTypePropertyList.Create;
+  Properties := TPDTypeProperties.Create;
 end;
 
 destructor TPDType.Destroy;
 begin
-  Properties.Free;
-  inherited Destroy;
+  FreeAndNil(Properties);
+  inherited;
 end;
 
@@ -256 +267 @@
 destructor TObjectProxy.Destroy;
 begin
-  Properties.Free;
-  inherited Destroy;
+  FreeAndNil(Properties);
+  inherited;
 end;
 
@@ -282 +293 @@
 begin
   ColumnsFilter := TListString.Create;
-  Objects := TListObject.Create;
+  Objects := TObjectList<TObjectProxy>.Create;
 end;
 
 destructor TListProxy.Destroy;
 begin
-  Objects.Free;
-  ColumnsFilter.Free;
-  inherited Destroy;
+  FreeAndNil(Objects);
+  FreeAndNil(ColumnsFilter);
+  inherited;
 end;
 
@@ -313 +324 @@
 procedure TPDClient.SetConnectionString(AValue: string);
 begin
-
 end;
 
@@ -347 +357 @@
     NewObject.Load;
 
-    DbVersion := NewObject.Properties.Values['Version'];
+    DbVersion := NewObject.Properties.Items['Version'];
     if Version <> DbVersion then
       raise Exception.Create(Format(SVersionMismatch, [Version, DbVersion]));
@@ -397 +407 @@
     Tables.Count := NewProxy.Objects.Count;
     for I := 0 to NewProxy.Objects.Count - 1 do
-      Tables[I] := TObjectProxy(NewProxy.Objects[I]).Properties.Values['TABLE_NAME'];
+      Tables[I] := TObjectProxy(NewProxy.Objects[I]).Properties.Items['TABLE_NAME'];
 
     for I := 0 to Types.Count - 1 do
@@ -415 +425 @@
 begin
   inherited;
-  Types := TPDTypeList.Create;
+  Types := TPDTypes.Create;
   Types.Client := Self;
   InitSystemTypes;
@@ -422 +432 @@
 destructor TPDClient.Destroy;
 begin
-  Types.Free;
-  inherited Destroy;
+  FreeAndNil(Types);
+  inherited;
 end;
 
@@ -436 +446 @@
 procedure TPDClient.Install;
 begin
-
 end;
 
@@ -446 +455 @@
 procedure TPDClient.Update;
 begin
-
 end;