Changeset 14 for trunk/USystem.pas

Timestamp:

Jun 10, 2011, 2:16:52 PM (13 years ago)

Author:

george

Message:

• Added: Classes for base data types.

File:

• trunk/USystem.pas (modified) (11 diffs)

trunk/USystem.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, SpecializedList, SpecializedDictionary, USqlDatabase,
-  Strings;
+  Strings, UDataTypes;
 
 const
@@ -21 +21 @@
   TypeRelationOne = 'TypeRelationOne';
   TypeRelationMany = 'TypeRelationMany';
-  CustomType = 'TypeCustom';
+  CustomTypeTableName = 'TypeCustom';
   Enumeration = 'Enumeration';
   EnumerationState = 'EnumerationState';
@@ -45 +45 @@
   TReportColumn = class
     Caption: string;
-    TypeDef: TChronisType;
+    //TypeDef: TChronisType;
+    CustomType: TDataType;
     ColumnName: string;
   end;
@@ -80 +81 @@
     Id: Integer;
     DbType: string;
-    DbTable: string;
     TypeIndex: Integer;
-    Parent: TChronisType;
   end;
 
@@ -178 +177 @@
       NewColumn.Caption := 'Id';
       NewColumn.ColumnName := 'Id';
-      NewColumn.TypeDef := Base.Types.FindByTypeIndex(Integer(vtInteger));
+      NewColumn.CustomType := TDataTypeNumber.Create;
+
       for I := 0 to Properties.Count - 1 do
-      if Properties[I].Values['Type'] <> IntToStr(Integer(vtRelationMany)) then begin
+      if Properties[I].Values['CustomType'] <> IntToStr(Integer(vtRelationMany)) then begin
         NewColumn := TReportColumn.Create;
         Columns.Add(NewColumn);
         NewColumn.Caption := Properties[I].Values['Name'];
         NewColumn.ColumnName := Properties[I].Values['ColumnName'];;
-        NewColumn.TypeDef := Base.Types.FindById(StrToInt(Properties[I].Values['Type']));
-        if not Assigned(NewColumn.TypeDef) then
-          raise Exception.Create(Format(SUnsupportedType, [Properties[I].Values['Type']]));
+        NewColumn.CustomType := GetDataType(StrToInt(Properties[I].Values['CustomType']));
       end;
 
@@ -204 +202 @@
         NewItem.Id := StrToInt(Values[I].Values[Obj.PrimaryKey]);
         for C := 0 to Properties.Count - 1 do
-        if Properties[C].Values['Type'] <> IntToStr(Integer(vtRelationMany)) then begin
+        if Properties[C].Values['CustomType'] <> IntToStr(Integer(vtRelationMany)) then begin
           NewItem.Items.Add(Values[I].Values[Properties[C].Values['ColumnName']]);
         end;
@@ -225 +223 @@
     Data.Add('Name', Name);
     Data.Add('DbType', DataType);
-    Data.Add('TypeIndex', IntToStr(Integer(TypeIndex)));
+    Data.Add('Id', IntToStr(Integer(TypeIndex)));
     Database.Insert(PropertyTypeTable, Data);
     Result := Database.LastInsertId;
@@ -291 +289 @@
     Data.Clear;
     Data.Add('Type', IntToStr(Integer(vtInteger)));
-    Database.Insert(CustomType, Data);
+    Database.Insert(CustomTypeTableName, Data);
     CustomTypeId := Database.LastInsertId;
 
@@ -322 +320 @@
     Data.Clear;
     Data.Add('Type', IntToStr(Integer(vtString)));
-    Database.Insert(CustomType, Data);
+    Database.Insert(CustomTypeTableName, Data);
     CustomTypeId := Database.LastInsertId;
 
@@ -330 +328 @@
     Data.Add('Default', Default);
     Database.Insert(TypeString, Data);
-    CustomTypeId := Database.LastInsertId;
+    //CustomTypeId := Database.LastInsertId;
 
     Result := AddProperty(ObjectId, Name, ColumnName, CustomTypeId);
@@ -405 +403 @@
       with DbRows[I] do begin
         Id := StrToInt(Values['Id']);
-        TypeIndex := StrToInt(Values['TypeIndex']);
         DbType := Values['DbType'];
         //Parent := StrToInt(Values['Parent']);