Changeset 44 for trunk/Application

Timestamp:

Mar 9, 2012, 3:02:00 PM (13 years ago)

Author:

chronos

Message:

• Fixed: Login profile manager can lost some values during edit.
• Added: Base initialization of TChronisClient.

Location:

trunk/Application

Files:

• Clients/UChronisClientMySQL.pas (modified) (5 diffs)
• Clients/UChronisClientXMLRPC.pas (modified) (2 diffs)
• UChronisClient.pas (modified) (9 diffs)

trunk/Application/Clients/UChronisClientMySQL.pas

@@ -16 +16 @@
     procedure InitSystemTypes; override;
     function GetConnected: Boolean; override;
+    procedure Init; override;
   public
     Database: TSqlDatabase;
     procedure ObjectLoad(AObject: TObjectProxy); override;
     procedure ObjectSave(AObject: TObjectProxy); override;
-    procedure ObjectAdd(AObject: TObjectProxy); override;
     procedure ObjectDelete(AObject: TObjectProxy); override;
     procedure ListLoad(AList: TListProxy); override;
@@ -64 +64 @@
 
 procedure TChronisClientMySQL.ObjectLoad(AObject: TObjectProxy);
-begin
-
+var
+  DbRows: TDbRows;
+  NewObject: TObjectProxy;
+  Table: string;
+begin
+  try
+    DbRows := TDbRows.Create;
+    Table := '`' + AObject.ObjectName + '`';
+    if AObject.SchemaName <> '' then Table := '`' + AObject.SchemaName + '`.' + Table;
+    Database.Query(DbRows, 'SELECT * FROM ' + Table +
+      ' WHERE `Id`=' + IntToStr(AObject.Id));
+    AObject.Properties.Assign(TDictionaryStringString(DbRows[0]));
+  finally
+    DbRows.Free;
+  end;
 end;
 
 procedure TChronisClientMySQL.ObjectSave(AObject: TObjectProxy);
-begin
-  inherited ObjectSave(AObject);
-end;
-
-procedure TChronisClientMySQL.ObjectAdd(AObject: TObjectProxy);
-begin
-  inherited ObjectAdd(AObject);
+var
+  DbRows: TDbRows;
+  NewObject: TObjectProxy;
+  Table: string;
+begin
+  try
+    DbRows := TDbRows.Create;
+    Database.Replace(AObject.ObjectName, AObject.Properties, AObject.SchemaName);
+    if AObject.Id = 0 then AObject.Id := Database.LastInsertId;
+  finally
+    DbRows.Free;
+  end;
 end;
 
 procedure TChronisClientMySQL.ObjectDelete(AObject: TObjectProxy);
 begin
-  inherited ObjectDelete(AObject);
+  Database.Delete(AObject.ObjectName, 'Id=' + IntToStr(AObject.Id),
+    AObject.SchemaName);
 end;
 
@@ -143 +162 @@
         raise Exception.Create(Format(SMissingBaseType, [RefType.Name]));
 
-      Query := Query + '`' + Items[I].Key + '` ' + RefType.DbType + ' NOT NULL,';
+      Query := Query + '`' + Items[I].Key + '` ' + RefType.DbType + ' NULL,';
     end;
     Query := Query + 'PRIMARY KEY (`Id`)' +
@@ -177 +196 @@
 end;
 
+procedure TChronisClientMySQL.Init;
+begin
+  inherited;
+end;
+
 constructor TChronisClientMySQL.Create;
 begin
@@ -197 +221 @@
   Database.Database := Schema;
   Database.Connect;
+  Init;
 end;
 

trunk/Application/Clients/UChronisClientXMLRPC.pas

@@ -9 +9 @@
 
 type
+
+  { TChronisClientXMLRPC }
+
   TChronisClientXMLRPC = class(TChronisClient)
   end;
@@ -14 +17 @@
 implementation
 
+
 end.
 

trunk/Application/UChronisClient.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, SpecializedList, SpecializedDictionary;
+
+const
+  SystemVersionObject = 'SystemVersion';
 
 type
@@ -26 +29 @@
     procedure Save;
     procedure Delete;
-    procedure Add;
     constructor Create;
     destructor Destroy; override;
@@ -81 +83 @@
   protected
     procedure InitSystemTypes; virtual;
+    procedure Init; virtual;
     function GetConnected: Boolean; virtual;
   public
@@ -89 +92 @@
     Password: string;
     Types: TChronisTypeList;
+    Version: string;
     procedure ObjectLoad(AObject: TObjectProxy); virtual; abstract;
     procedure ObjectSave(AObject: TObjectProxy); virtual; abstract;
-    procedure ObjectAdd(AObject: TObjectProxy); virtual; abstract;
     procedure ObjectDelete(AObject: TObjectProxy); virtual; abstract;
     procedure ListLoad(AList: TListProxy); virtual; abstract;
@@ -98 +101 @@
     procedure TypeUndefine(AType: TChronisType); virtual; abstract;
     procedure CheckTypes;
+    function TypeExists(Name: string): Boolean; virtual; abstract;
     constructor Create; virtual;
     destructor Destroy; override;
-    procedure Connect; virtual; abstract;
-    procedure Disconnect; virtual; abstract;
+    procedure Connect; virtual;
+    procedure Disconnect; virtual;
+    procedure Install; virtual;
+    procedure Uninstall; virtual;
+    procedure Update; virtual;
     property Connected: Boolean read GetConnected;
   end;
@@ -110 +117 @@
 resourcestring
   SClientNotSet = 'Client not set';
+  SNotSupported = 'Not supported';
+  SVersionMismatch = 'Version mismatch, client: %0:s, server: %1:s. Please upgrade database.';
+
 
 { TChronisTypeList }
@@ -174 +184 @@
 end;
 
-procedure TObjectProxy.Add;
-begin
-  if Assigned(Client) then Client.ObjectAdd(Self)
-    else raise EClientNotSet.Create(SClientNotSet);
-end;
-
 constructor TObjectProxy.Create;
 begin
@@ -230 +234 @@
 procedure TChronisClient.InitSystemTypes;
 begin
+end;
+
+procedure TChronisClient.Init;
+var
+  NewProxy: TListProxy;
+  NewType: TChronisType;
+  NewObject: TObjectProxy;
+  DbVersion: string;
+begin
+  NewProxy := TListProxy.Create;
+  NewProxy.Client := Self;
+  NewProxy.SchemaName := 'information_schema';
+  NewProxy.ObjectName := 'TABLES';
+  NewProxy.Condition := '(TABLE_SCHEMA = "' + Schema +
+    '") AND (TABLE_NAME = "' + SystemVersionObject + '")';
+  NewProxy.Load;
+  if NewProxy.Objects.Count > 0 then begin
+    DbVersion := TObjectProxy(NewProxy.Objects[0]).Properties.Values['Version'];
+    if Version <> DbVersion then
+      raise Exception.Create(Format(SVersionMismatch, [Version, DbVersion]));
+  end else begin
+    NewType := TChronisType.Create;
+    NewType.Client := Self;
+    NewType.Name := SystemVersionObject;
+    NewType.Properties.Add('Version', 'String');
+    NewType.Properties.Add('Time', 'DateTime');
+    NewType.Define;
+
+    NewObject := TObjectProxy.Create;
+    NewObject.Client := Self;
+    NewObject.SchemaName := Schema;
+    NewObject.ObjectName := SystemVersionObject;
+    NewObject.Properties.Add('Version', Version);
+    NewObject.Properties.Add('Time', 'NOW()');
+    NewObject.Save;
+
+    Install;
+  end;
 end;
 
@@ -287 +329 @@
 end;
 
+procedure TChronisClient.Connect;
+begin
+  raise Exception.Create(SNotSupported);
+end;
+
+procedure TChronisClient.Disconnect;
+begin
+  raise Exception.Create(SNotSupported);
+end;
+
+procedure TChronisClient.Install;
+begin
+
+end;
+
+procedure TChronisClient.Uninstall;
+begin
+
+end;
+
+procedure TChronisClient.Update;
+begin
+
+end;
+
 end.