Changeset 345

Timestamp:

Apr 3, 2012, 8:30:29 AM (12 years ago)

Author:

chronos

Message:

• Modified: MySQL Schema renamed to more general Path. Path will be used for Registry, INI files and other persistent storages.

Location:

PersistentData

Files:

• Backend/UPDClientINI.pas (modified) (3 diffs)
• Backend/UPDClientMySQL.pas (modified) (6 diffs)
• Backend/UPDClientRegistry.pas (modified) (4 diffs)
• UPDClient.pas (modified) (6 diffs)

PersistentData/Backend/UPDClientINI.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, UPDClient;
+  Classes, SysUtils, UPDClient, IniFiles;
 
 type
@@ -13 +13 @@
 
   TPDClientINI = class(TPDClient)
+    IniFile: TIniFile;
     //procedure GetItemList(Condition: TCondition; ItemList: TItemList); override;
     //procedure SetItemList(Condition: TCondition; ItemList: TItemList); override;
+    FileName: string;
     constructor Create; override;
     destructor Destroy; override;
+    procedure Connect; override;
+    procedure Disconnect; override;
   end;
 
@@ -42 +46 @@
 destructor TPDClientINI.Destroy;
 begin
+  Disconnect;
   inherited Destroy;
+end;
+
+procedure TPDClientINI.Connect;
+begin
+  IniFile := TIniFile.Create(FileName);
+end;
+
+procedure TPDClientINI.Disconnect;
+begin
+  FreeAndNil(IniFile);
 end;
 

PersistentData/Backend/UPDClientMySQL.pas

@@ -75 +75 @@
     DbRows := TDbRows.Create;
     Table := '`' + AObject.ObjectName + '`';
-    if AObject.SchemaName <> '' then Table := '`' + AObject.SchemaName + '`.' + Table;
+    if AObject.Path <> '' then Table := '`' + AObject.Path + '`.' + Table;
     Database.Query(DbRows, 'SELECT * FROM ' + Table +
       ' WHERE `Id`=' + IntToStr(AObject.Id));
@@ -92 +92 @@
   try
     DbRows := TDbRows.Create;
-    Database.Replace(AObject.ObjectName, AObject.Properties, AObject.SchemaName);
-    if AObject.Id = 0 then AObject.Id := Database.LastInsertId;
+    if AObject.Id = 0 then begin
+      Database.Insert(AObject.ObjectName, AObject.Properties, AObject.Path);
+      AObject.Id := Database.LastInsertId;
+    end else Database.Update(AObject.ObjectName, AObject.Properties,
+      'Id=' + IntToStr(AObject.Id), AObject.Path);
   finally
     DbRows.Free;
@@ -102 +105 @@
 begin
   Database.Delete(AObject.ObjectName, 'Id=' + IntToStr(AObject.Id),
-    AObject.SchemaName);
+    AObject.Path);
 end;
 
@@ -125 +128 @@
       else DbCondition := '';
     Table := '`' + AList.ObjectName + '`';
-    if AList.SchemaName <> '' then Table := '`' + AList.SchemaName + '`.' + Table;
+    if AList.Path <> '' then Table := '`' + AList.Path + '`.' + Table;
     Database.Query(DbRows, 'SELECT ' + Filter + ' FROM ' + Table + DbCondition);
     AList.Objects.Clear;
@@ -132 +135 @@
       NewObject.Client := AList.Client;
       NewObject.ObjectName := AList.ObjectName;
-      NewObject.SchemaName := AList.SchemaName;
+      NewObject.Path := AList.Path;
       NewObject.Properties.Assign(TDictionaryStringString(DbRows[I]));
       AList.Objects.Add(NewObject);
@@ -198 +201 @@
     NewProxy := TListProxy.Create;
     NewProxy.Client := Self;
-    NewProxy.SchemaName := 'information_schema';
+    NewProxy.Path := 'information_schema';
     NewProxy.ObjectName := 'TABLES';
     NewProxy.Condition := '(TABLE_SCHEMA = "' + Schema +

PersistentData/Backend/UPDClientRegistry.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, UPDClient;
+  Classes, SysUtils, UPDClient, Registry;
 
 type
@@ -13 +13 @@
 
   TPDClientRegistry = class(TPDClient)
+    Reg: TRegistry;
     //procedure GetItemList(Condition: TCondition; ItemList: TItemList); override;
     //procedure SetItemList(Condition: TCondition; ItemList: TItemList); override;
@@ -37 +38 @@
 constructor TPDClientRegistry.Create;
 begin
+  Reg := TRegistry.Create;
   inherited Create;
 end;
@@ -42 +44 @@
 destructor TPDClientRegistry.Destroy;
 begin
+  Reg.Free;
   inherited Destroy;
 end;

PersistentData/UPDClient.pas

@@ -25 +25 @@
     Client: TPDClient;
     ObjectName: string;
-    SchemaName: string;
+    Path: string;
     procedure Load;
     procedure Save;
@@ -47 +47 @@
     Condition: string;
     ObjectName: string;
-    SchemaName: string;
+    Path: string;
     Objects: TListObject; // TListObject<TObjectProxy>
     procedure Clear;
@@ -252 +252 @@
   NewProxy := TListProxy.Create;
   NewProxy.Client := Self;
-  NewProxy.SchemaName := 'information_schema';
+  NewProxy.Path := 'information_schema';
   NewProxy.ObjectName := 'TABLES';
   NewProxy.Condition := '(TABLE_SCHEMA = "' + Schema +
@@ -260 +260 @@
     NewObject := TObjectProxy.Create;
     NewObject.Client := Self;
-    NewObject.SchemaName := Schema;
+    NewObject.Path := Schema;
     NewObject.ObjectName := SystemVersionObject;
     NewObject.Id := 1;
@@ -278 +278 @@
     NewObject := TObjectProxy.Create;
     NewObject.Client := Self;
-    NewObject.SchemaName := Schema;
+    NewObject.Path := Schema;
     NewObject.ObjectName := SystemVersionObject;
     NewObject.Properties.Add('Version', Version);
@@ -308 +308 @@
     NewProxy := TListProxy.Create;
     NewProxy.Client := Self;
-    NewProxy.SchemaName := 'information_schema';
+    NewProxy.Path := 'information_schema';
     NewProxy.ObjectName := 'TABLES';
     NewProxy.Condition := 'TABLE_SCHEMA = "' + Schema + '"';