Changeset 37 for trunk/Application

Timestamp:

Mar 8, 2012, 3:11:10 PM (13 years ago)

Author:

chronos

Message:

• Modified: Direct acces using Database: TSqlDatabase replaced by TChronisClient interface.

Location:

trunk/Application

Files:

• Clients/UChronisClientMySQL.pas (modified) (7 diffs)
• UChronisClient.pas (modified) (6 diffs)
• UDataTypes.pas (modified) (4 diffs)

trunk/Application/Clients/UChronisClientMySQL.pas

@@ -13 +13 @@
 
   TChronisClientMySQL = class(TChronisClient)
+  protected
+    function GetConnected: Boolean; override;
+  public
     Database: TSqlDatabase;
     procedure ObjectLoad(AObject: TObjectProxy); override;
@@ -20 +23 @@
     procedure ListLoad(AList: TListProxy); override;
     procedure ListSave(AList: TListProxy); override;
-    constructor Create;
+    procedure DefineType(AType: TChronisType); override;
+    procedure UndefineType(AType: TChronisType); override;
+    procedure Install;
+    procedure Uninstall;
+    constructor Create; override;
     destructor Destroy; override;
+    procedure Connect; override;
+    procedure Disconnect; override;
   end;
 
@@ -27 +36 @@
 
 { TChronisClientMySQL }
+
+function TChronisClientMySQL.GetConnected: Boolean;
+begin
+  Result := Database.Connected;
+end;
 
 procedure TChronisClientMySQL.ObjectLoad(AObject: TObjectProxy);
@@ -52 +66 @@
   DbRows: TDbRows;
   Filter: string;
-  Condition: string;
+  DbCondition: string;
   I: Integer;
   NewObject: TObjectProxy;
+  Table: string;
 begin
   try
@@ -64 +79 @@
       Delete(Filter, Length(Filter) - 1, 2);
     end else Filter := '*';
-    if AList.ConditionUse then Condition := '`' + AList.ConditionColumn + '` = "' +
-      AList.ConditionValue + '"'
-      else Condition := '1';
-    Database.Query(DbRows, 'SELECT ' + Filter + ' FROM `' + AList.SchemaName + '`.`' +
-      AList.ObjectName + '` WHERE ' + Condition);
+    if AList.Condition <> '' then DbCondition := ' WHERE ' + AList.Condition
+      else DbCondition := '';
+    Table := '`' + AList.ObjectName + '`';
+    if AList.SchemaName <> '' then Table := '`' + AList.SchemaName + '`.' + Table;
+    Database.Query(DbRows, 'SELECT ' + Filter + ' FROM ' + Table + DbCondition);
     AList.Objects.Clear;
     for I := 0 to DbRows.Count - 1 do begin
@@ -86 +101 @@
 end;
 
+procedure TChronisClientMySQL.DefineType(AType: TChronisType);
+var
+  Data: TDictionaryStringString;
+  I: Integer;
+begin
+  try
+    Data := TDictionaryStringString.Create;
+    Data.Add('Name', AType.Name);
+    Database.Insert('Type', Data);
+  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);
+begin
+
+end;
+
+procedure TChronisClientMySQL.Install;
+begin
+(*  if Tables.IndexOf(InformationTable) = -1 then begin
+    Database.Query(DbRows, 'CREATE TABLE IF NOT EXISTS `' + InformationTable + '` ( ' +
+'`Version` varchar(255) NOT NULL,' +
+'`LastUpdateTime` datetime NOT NULL' +
+') ENGINE=InnoDB DEFAULT CHARSET=utf8;');
+    Database.Query(DbRows, 'INSERT INTO `' + InformationTable + '` (`Version`, `LastUpdateTime`) VALUES ' +
+'("0.1", "0000-00-00 00:00:00");');
+  end;
+  Database.Select(DbRows, InformationTable);
+  StructureVersion := DbRows[0].Values['Version'];*)
+end;
+
+procedure TChronisClientMySQL.Uninstall;
+begin
+
+end;
+
 constructor TChronisClientMySQL.Create;
 begin
@@ -97 +163 @@
 end;
 
+procedure TChronisClientMySQL.Connect;
+begin
+  Database.Port := Port;
+  Database.UserName := User;
+  Database.Password := Password;
+  Database.HostName := Host;
+  Database.Database := Schema;
+  Database.Connect;
+end;
+
+procedure TChronisClientMySQL.Disconnect;
+begin
+  Database.Disconnect;
+end;
+
 end.
 

trunk/Application/UChronisClient.pas

@@ -19 +19 @@
     Properties: TDictionaryStringString;
     Client: TChronisClient;
+    ObjectName: string;
+    SchemaName: string;
     procedure Load;
     procedure Save;
@@ -39 +41 @@
     ColumnsFilter: TListString;
     ColummsFilterUse: Boolean;
-    ConditionColumn: string;
-    ConditionValue: string;
-    ConditionUse: Boolean;
+    Condition: string;
     ObjectName: string;
     SchemaName: string;
     Objects: TListObject; // TListObject<TObjectProxy>
-    procedure SetCondition(ColumnName: string; Value: string);
     procedure Clear;
     constructor Create;
@@ -53 +52 @@
   end;
 
+  TChronisType = class
+    OID: Integer;
+    Name: string;
+  end;
+
+  TChronisTypeRecordItem = class
+    Name: string;
+    ItemType: TChronisType;
+  end;
+
+  { TChronisTypeRecord }
+
+  TChronisTypeRecord = class(TChronisType)
+    Items: TListObject; // TListObject<TChronisTypeRecordItem>
+    constructor Create;
+    destructor Destroy; override;
+  end;
+
   { TChronisClient }
 
   TChronisClient = class
+  protected
+    function GetConnected: Boolean; virtual;
+  public
     Host: string;
     Port: Word;
@@ -67 +87 @@
     procedure ListLoad(AList: TListProxy); virtual; abstract;
     procedure ListSave(AList: TListProxy); virtual; abstract;
+    procedure DefineType(AType: TChronisType); virtual; abstract;
+    procedure UndefineType(AType: TChronisType); virtual; abstract;
     constructor Create; virtual;
+    procedure Connect; virtual; abstract;
+    procedure Disconnect; virtual; abstract;
+    property Connected: Boolean read GetConnected;
   end;
 
 implementation
+
+{ TChronisTypeRecord }
+
+constructor TChronisTypeRecord.Create;
+begin
+  Items := TListObject.Create;
+end;
+
+destructor TChronisTypeRecord.Destroy;
+begin
+  Items.Free;
+  inherited Destroy;
+end;
 
 { TObjectProxy }
@@ -107 +145 @@
 { TListProxy }
 
-procedure TListProxy.SetCondition(ColumnName: string; Value: string);
-begin
-  ConditionColumn := ColumnName;
-  ConditionValue := Value;
-  ConditionUse := True;
-end;
-
 procedure TListProxy.Clear;
 begin
-  ConditionUse := False;
   PageUse := False;
   ColummsFilterUse := False;
@@ -148 +178 @@
 { TChronisClient }
 
+function TChronisClient.GetConnected: Boolean;
+begin
+  Result := False;
+end;
+
 constructor TChronisClient.Create;
 begin

trunk/Application/UDataTypes.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, Controls, Spin, StdCtrls, ExtCtrls, MaskEdit, EditBtn;
+  Classes, SysUtils, Controls, Spin, StdCtrls, ExtCtrls, MaskEdit, EditBtn,
+  UChronisClient;
 
 type
@@ -147 +148 @@
 function GetDataType(ACustomType: Integer): TDataType;
 var
-  DbRows: TDbRows;
+  Proxy: TListProxy;
   BaseType: Integer;
 begin
   try
-    DbRows := TDbRows.Create;
-    Core.System.Database.Select(DbRows, CustomTypeTableName, '*', 'Id=' + IntToStr(ACustomType));
-    BaseType := StrToInt(DbRows[0].Values['Type']);
+    Proxy := TListProxy.Create;
+    Proxy.Client := Core.System.Client;
+    Proxy.ObjectName := CustomTypeTableName;
+    Proxy.Condition := 'Id=' + IntToStr(ACustomType);
+    Proxy.Load;
+    BaseType := StrToInt(TObjectProxy(Proxy.Objects[0]).Properties.Values['Type']);
   finally
-    DbRows.Free;
+    Proxy.Free;
   end;
 
@@ -231 +235 @@
 procedure TDataTypeRelationMany.LoadDef(ACustomType: Integer);
 var
-  DbRows: TDbRows;
+  Proxy: TListProxy;
   BaseType: Integer;
 begin
   try
-    DbRows := TDbRows.Create;
-    Core.System.Database.Select(DbRows, TypeRelationMany, '*', 'CustomType=' + IntToStr(ACustomType));
-    PropertyID := StrToInt(DbRows[0].Values['ObjectProperty']);
+    Proxy := TListProxy.Create;
+    Proxy.Client := Core.System.Client;
+    Proxy.ObjectName := TypeRelationMany;
+    Proxy.Condition := 'CustomType=' + IntToStr(ACustomType);
+    Proxy.Load;
+    PropertyID := StrToInt(TObjectProxy(Proxy.Objects[0]).Properties.Values['ObjectProperty']);
   finally
-    DbRows.Free;
+    Proxy.Free;
   end;
   try
-    DbRows := TDbRows.Create;
-    Core.System.Database.Select(DbRows, PropertyTable, '*', 'Id=' + IntToStr(PropertyID));
-    ObjectId := StrToInt(DbRows[0].Values['Object']);
-    PropertyName := DbRows[0].Values['ColumnName'];
+    Proxy := TListProxy.Create;
+    Proxy.Client := Core.System.Client;
+    Proxy.ObjectName := PropertyTable;
+    Proxy.Condition := 'Id=' + IntToStr(PropertyID);
+    ObjectId := StrToInt(TObjectProxy(Proxy.Objects[0]).Properties.Values['Object']);
+    PropertyName := TObjectProxy(Proxy.Objects[0]).Properties.Values['ColumnName'];
   finally
-    DbRows.Free;
+    Proxy.Free;
   end;
 end;
@@ -286 +295 @@
 procedure TDataTypeRelationOne.LoadDef(ACustomType: Integer);
 var
-  DbRows: TDbRows;
+  Proxy: TListProxy;
 begin
   try
-    DbRows := TDbRows.Create;
-    Core.System.Database.Select(DbRows, TypeRelationOne, '*', 'CustomType=' + IntToStr(ACustomType));
-    ObjectId := StrToInt(DbRows[0].Values['Object']);
+    Proxy := TListProxy.Create;
+    Proxy.Client := Core.System.Client;
+    Proxy.ObjectName := TypeRelationOne;
+    Proxy.Condition := 'CustomType=' + IntToStr(ACustomType);
+    Proxy.Load;
+    ObjectId := StrToInt(TObjectProxy(Proxy.Objects[0]).Properties.Values['Object']);
   finally
-    DbRows.Free;
+    Proxy.Free;
   end;
 end;