Changeset 43 for trunk/Application

Timestamp:

Mar 9, 2012, 1:09:52 PM (13 years ago)

Author:

chronos

Message:

• Fixed: Selection of available protocols in profile manager.
• Modified: Initialization of persistent data structures rewrited to more native structures.

Location:

trunk/Application

Files:

• Clients/UChronisClientMySQL.pas (modified) (5 diffs)
• Clients/UChronisClientXMLRPC.pas (modified) (1 diff)
• UChronisClient.pas (modified) (8 diffs)

trunk/Application/Clients/UChronisClientMySQL.pas

@@ -14 +14 @@
   TChronisClientMySQL = class(TChronisClient)
   protected
+    procedure InitSystemTypes; override;
     function GetConnected: Boolean; override;
   public
@@ -23 +24 @@
     procedure ListLoad(AList: TListProxy); override;
     procedure ListSave(AList: TListProxy); override;
-    procedure DefineType(AType: TChronisType); override;
-    procedure UndefineType(AType: TChronisType); override;
+    procedure TypeDefine(AType: TChronisType); override;
+    procedure TypeUndefine(AType: TChronisType); override;
     procedure Install;
     procedure Uninstall;
@@ -35 +36 @@
 implementation
 
+
+resourcestring
+  SMissingBaseType = 'Missing base typ for %s';
+  SUndefinedType = 'Undefinned type %s';
+
+
 { TChronisClientMySQL }
+
+procedure TChronisClientMySQL.InitSystemTypes;
+begin
+  inherited InitSystemTypes;
+  Types.AddType('Integer', 'int(11)');
+  Types.AddType('String', 'varchar(255)');
+  Types.AddType('RelationOne', 'int(11)');
+  Types.AddType('Double', 'double');
+  Types.AddType('DateTime', 'datetime');
+  Types.AddType('Date', 'date');
+  Types.AddType('Time', 'time');
+  Types.AddType('Text', 'text');
+  Types.AddType('Boolean', 'bool');
+end;
 
 function TChronisClientMySQL.GetConnected: Boolean;
@@ -103 +124 @@
 end;
 
-procedure TChronisClientMySQL.DefineType(AType: TChronisType);
+procedure TChronisClientMySQL.TypeDefine(AType: TChronisType);
 var
-  Data: TDictionaryStringString;
+  DbRows: TDbRows;
   I: Integer;
+  Query: string;
+  RefType: TChronisType;
 begin
   try
-    Data := TDictionaryStringString.Create;
-    Data.Add('Name', AType.Name);
-    Database.Insert('Type', Data);
+    DbRows := TDbRows.Create;
+    Query := 'CREATE TABLE IF NOT EXISTS `' + AType.Name + '` ( ' +
+      '`Id` int(11) NOT NULL AUTO_INCREMENT,';
+    for I := 0 to AType.Properties.Count - 1 do
+    with AType.Properties do begin
+      RefType := Types.SearchByName(Items[I].Value);
+      if not Assigned(RefType) then
+        raise Exception.Create(Format(SUndefinedType, [Items[I].Value]));
+      if RefType.DbType = '' then
+        raise Exception.Create(Format(SMissingBaseType, [RefType.Name]));
+
+      Query := Query + '`' + Items[I].Key + '` ' + RefType.DbType + ' NOT NULL,';
+    end;
+    Query := Query + 'PRIMARY KEY (`Id`)' +
+      ') ENGINE=InnoDB  DEFAULT CHARSET=utf8';
+    Database.Query(DbRows, Query);
   finally
-    Data.Free;
-  end;
-  if AType is TChronisTypeRecord then begin
-    for I := 0 to TChronisTypeRecord(AType).Items.Count - 1 do
-      try
-        Data := TDictionaryStringString.Create;
-        Data.Add('Name',
-          TChronisTypeRecordItem(TChronisTypeRecord(AType).Items[I]).Name);
-        Data.Add('Type', IntToStr(
-          TChronisTypeRecordItem(TChronisTypeRecord(AType).Items[I]).ItemType.OID));
-        Database.Insert('TypeRecordItem', Data);
-      finally
-        Data.Free;
-      end;
-  end;
-end;
-
-procedure TChronisClientMySQL.UndefineType(AType: TChronisType);
+    DbRows.Free;
+  end;
+end;
+
+procedure TChronisClientMySQL.TypeUndefine(AType: TChronisType);
 begin
 
@@ -156 +179 @@
 constructor TChronisClientMySQL.Create;
 begin
+  inherited;
   Database := TSqlDatabase.Create(nil);
 end;

trunk/Application/Clients/UChronisClientXMLRPC.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils; 
+  Classes, SysUtils, UChronisClient;
+
+type
+  TChronisClientXMLRPC = class(TChronisClient)
+  end;
 
 implementation

trunk/Application/UChronisClient.pas

@@ -9 +9 @@
 
 type
+  EClientNotSet = class(Exception);
+
   TChronisClient = class;
 
@@ -52 +54 @@
   end;
 
+  { TChronisType }
+
   TChronisType = class
-    OID: Integer;
+    Client: TChronisClient;
     Name: string;
-  end;
-
-  TChronisTypeRecordItem = class
-    Name: string;
-    ItemType: TChronisType;
-  end;
-
-  { TChronisTypeRecord }
-
-  TChronisTypeRecord = class(TChronisType)
-    Items: TListObject; // TListObject<TChronisTypeRecordItem>
+    DbType: string;
+    Properties: TDictionaryStringString;
+    procedure Define;
+    procedure Undefine;
     constructor Create;
     destructor Destroy; override;
   end;
 
+  { TChronisTypeList }
+
+  TChronisTypeList = class(TListObject)
+    Client: TChronisClient;
+    function AddType(Name: string; DbType: string = ''): TChronisType;
+    function SearchByName(Name: string): TChronisType;
+  end;
+
   { TChronisClient }
 
   TChronisClient = class
+  private
   protected
+    procedure InitSystemTypes; virtual;
     function GetConnected: Boolean; virtual;
   public
@@ -81 +88 @@
     User: string;
     Password: string;
+    Types: TChronisTypeList;
     procedure ObjectLoad(AObject: TObjectProxy); virtual; abstract;
     procedure ObjectSave(AObject: TObjectProxy); virtual; abstract;
@@ -87 +95 @@
     procedure ListLoad(AList: TListProxy); virtual; abstract;
     procedure ListSave(AList: TListProxy); virtual; abstract;
-    procedure DefineType(AType: TChronisType); virtual; abstract;
-    procedure UndefineType(AType: TChronisType); virtual; abstract;
+    procedure TypeDefine(AType: TChronisType); virtual; abstract;
+    procedure TypeUndefine(AType: TChronisType); virtual; abstract;
+    procedure CheckTypes;
     constructor Create; virtual;
+    destructor Destroy; override;
     procedure Connect; virtual; abstract;
     procedure Disconnect; virtual; abstract;
@@ -95 +105 @@
   end;
 
+
 implementation
 
-{ TChronisTypeRecord }
-
-constructor TChronisTypeRecord.Create;
-begin
-  Items := TListObject.Create;
-end;
-
-destructor TChronisTypeRecord.Destroy;
-begin
-  Items.Free;
+resourcestring
+  SClientNotSet = 'Client not set';
+
+{ TChronisTypeList }
+
+function TChronisTypeList.AddType(Name: string; DbType: string = ''): TChronisType;
+begin
+  Result := TChronisType(AddNew(TChronisType.Create));
+  Result.Client := Client;
+  Result.Name := Name;
+  Result.DbType := DbType;
+end;
+
+function TChronisTypeList.SearchByName(Name: string): TChronisType;
+var
+  I: Integer;
+begin
+  I := 0;
+  while (I < Count) and (TChronisType(Items[I]).Name <> Name) do Inc(I);
+  if I < Count then Result := TChronisType(Items[I])
+    else Result := nil;
+end;
+
+procedure TChronisType.Define;
+begin
+  if Assigned(Client) then Client.TypeDefine(Self)
+    else raise EClientNotSet.Create(SClientNotSet);
+end;
+
+procedure TChronisType.Undefine;
+begin
+  if Assigned(Client) then Client.TypeUndefine(Self)
+    else raise EClientNotSet.Create(SClientNotSet);
+end;
+
+constructor TChronisType.Create;
+begin
+  Properties := TDictionaryStringString.Create;
+end;
+
+destructor TChronisType.Destroy;
+begin
+  Properties.Free;
   inherited Destroy;
 end;
@@ -114 +158 @@
 procedure TObjectProxy.Load;
 begin
-  Client.ObjectLoad(Self);
+  if Assigned(Client) then Client.ObjectLoad(Self)
+    else raise EClientNotSet.Create(SClientNotSet);
 end;
 
 procedure TObjectProxy.Save;
 begin
-  Client.ObjectSave(Self);
+  if Assigned(Client) then Client.ObjectSave(Self)
+    else raise EClientNotSet.Create(SClientNotSet);
 end;
 
 procedure TObjectProxy.Delete;
 begin
-  Client.ObjectDelete(Self);
+  if Assigned(Client) then Client.ObjectDelete(Self)
+    else raise EClientNotSet.Create(SClientNotSet);
 end;
 
 procedure TObjectProxy.Add;
 begin
-  Client.ObjectAdd(Self);
+  if Assigned(Client) then Client.ObjectAdd(Self)
+    else raise EClientNotSet.Create(SClientNotSet);
 end;
 
@@ -168 +216 @@
 procedure TListProxy.Load;
 begin
-  Client.ListLoad(Self);
+  if Assigned(Client) then Client.ListLoad(Self)
+    else raise EClientNotSet.Create(SClientNotSet);
 end;
 
 procedure TListProxy.Save;
 begin
-  Client.ListSave(Self);
+  if Assigned(Client) then Client.ListSave(Self)
+    else raise EClientNotSet.Create(SClientNotSet);
 end;
 
 { TChronisClient }
 
+procedure TChronisClient.InitSystemTypes;
+begin
+end;
+
 function TChronisClient.GetConnected: Boolean;
 begin
@@ -183 +237 @@
 end;
 
+procedure TChronisClient.CheckTypes;
+var
+  StructureVersion: string;
+  Data: TDictionaryStringString;
+  ObjectId: Integer;
+  Tables: TListString;
+  I: Integer;
+  NewProxy: TListProxy;
+begin
+  try
+    Tables := TListString.Create;
+    Data := TDictionaryStringString.Create;
+
+    NewProxy := TListProxy.Create;
+    NewProxy.Client := Self;
+    NewProxy.SchemaName := 'information_schema';
+    NewProxy.ObjectName := 'TABLES';
+    NewProxy.Condition := 'TABLE_SCHEMA = "' + Schema + '"';
+    NewProxy.Load;
+    //Database.Query(DbRows, 'SHOW TABLES');
+    Tables.Count := NewProxy.Objects.Count;
+    for I := 0 to NewProxy.Objects.Count - 1 do
+      Tables[I] := TObjectProxy(NewProxy.Objects[I]).Properties.Values['TABLE_NAME'];
+
+    for I := 0 to Types.Count - 1 do
+    with TChronisType(Types[I]) do begin
+      if (DbType = '') and (Tables.IndexOf(Name) = -1) then begin
+        Define;
+      end;
+    end;
+  finally
+    NewProxy.Free;
+    Data.Free;
+    Tables.Free;
+  end;
+end;
+
 constructor TChronisClient.Create;
 begin
+  Types := TChronisTypeList.Create;
+  Types.Client := Self;
+  InitSystemTypes;
+end;
+
+destructor TChronisClient.Destroy;
+begin
+  Types.Free;
+  inherited Destroy;
 end;