Changeset 13 for trunk/USystem.pas

Timestamp:

Jun 10, 2011, 8:23:37 AM (13 years ago)

Author:

george

Message:

• Added: Type separated to base types and custom type instances. Every type which have parameters should have own SQL table. Types which have structured values should have tables for values too.

File:

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

trunk/USystem.pas

@@ -16 +16 @@
   PropertyTypeTable = 'Type';
   PropertyGroupTable = 'PropertyGroup';
+  TypeEnumeration = 'TypeEnumeration';
+  TypeFile = 'TypeFile';
+  TypeGPS = 'TypeGPS';
+  TypeRelationOne = 'TypeRelationOne';
+  TypeRelationMany = 'TypeRelationMany';
+  CustomType = 'TypeCustom';
+  Enumeration = 'Enumeration';
+  EnumerationState = 'EnumerationState';
+  TypeNumber = 'TypeNumber';
+  TypeString = 'TypeString';
 
 type
-  TDbValueType = (vtNone, vtInteger, vtString, vtText, vtDateTime, vtFloat, vtImage, vtBoolean,
-  vtIPv4, vtMAC, vtIPv6, vtFile, vtGPS, vtEnumeration, vtHyperlink, vtPassword,
-  vtReference, vtDate, vtTime, vtColor, vtCurrency);
+  TDbValueType = (vtNone, vtInteger, vtString, vtText, vtDateTime, vtFloat, vtImage,
+  vtBoolean, vtIPv4, vtIPv6, vtMAC, vtFile, vtGPS, vtCurrency, vtEnumeration,
+  vtTime, vtDate, vtColor, vtHyperlink, vtRelationOne, vtRelationMany, vtPassword);
 
   TChronisType = class;
@@ -90 +100 @@
     function AddObject(Name, TableName, Schema: string; GroupId: Integer): Integer;
     function AddProperty(ObjectId: Integer; Name, ColumnName: string; DataType: Integer): Integer;
+    function AddPropertyNumber(ObjectId: Integer; Name,
+      ColumnName: string; Default: Integer = 0; Min: Integer = 0;
+      Max: Integer = High(Integer)): Integer;
+    function AddPropertyString(ObjectId: Integer; Name, ColumnName: string;
+      Default: string = ''; MaxLength: Integer = 255): Integer;
     function AddObjectGroup(Name: string): Integer;
+    function AddEnumeration(Name: string): Integer;
+    function AddEnumerationState(Enum: Integer; Name: string): Integer;
     procedure LoadTypes;
     constructor Create;
     destructor Destroy; override;
+  private
   end;
 
@@ -99 +117 @@
 
 implementation
+
+resourcestring
+  SUnsupportedType = 'Unsupported property type "%s"';
 
 { TChronisTypeList }
@@ -159 +180 @@
       NewColumn.TypeDef := Base.Types.FindByTypeIndex(Integer(vtInteger));
       for I := 0 to Properties.Count - 1 do
-      if Properties[I].Values['Type'] <> IntToStr(20) then begin
+      if Properties[I].Values['Type'] <> IntToStr(Integer(vtRelationMany)) then begin
         NewColumn := TReportColumn.Create;
         Columns.Add(NewColumn);
@@ -165 +186 @@
         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']]));
       end;
 
@@ -181 +204 @@
         NewItem.Id := StrToInt(Values[I].Values[Obj.PrimaryKey]);
         for C := 0 to Properties.Count - 1 do
-        if Properties[C].Values['Type'] <> IntToStr(20) then begin
+        if Properties[C].Values['Type'] <> IntToStr(Integer(vtRelationMany)) then begin
           NewItem.Items.Add(Values[I].Values[Properties[C].Values['ColumnName']]);
         end;
@@ -244 +267 @@
     Data.Add('Object', IntToStr(ObjectId));
     Data.Add('ColumnName', ColumnName);
-    Data.Add('Type', IntToStr(DataType));
+    Data.Add('CustomType', IntToStr(DataType));
+    Data.Add('Editable', '1');
     Database.Insert(PropertyTable, Data);
     Result := Database.LastInsertId;
@@ -253 +277 @@
 end;
 
+function TChronisBase.AddPropertyNumber(ObjectId: Integer; Name,
+  ColumnName: string; Default: Integer = 0; Min: Integer = 0;
+  Max: Integer = High(Integer)): Integer;
+var
+  DbRows: TDbRows;
+  Data: TDictionaryStringString;
+  CustomTypeId: Integer;
+begin
+  try
+    DbRows := TDbRows.Create;
+    Data := TDictionaryStringString.Create;
+
+    Data.Clear;
+    Data.Add('Type', IntToStr(Integer(vtInteger)));
+    Database.Insert(CustomType, Data);
+    CustomTypeId := Database.LastInsertId;
+
+    Data.Clear;
+    Data.Add('CustomType', IntToStr(CustomTypeId));
+    Data.Add('Min', IntToStr(Min));
+    Data.Add('Max', IntToStr(Max));
+    Data.Add('Default', IntToStr(Default));
+    Database.Insert(TypeNumber, Data);
+    CustomTypeId := Database.LastInsertId;
+
+    Result := AddProperty(ObjectId, Name, ColumnName, CustomTypeId);
+  finally
+    Data.Free;
+    DbRows.Free;
+  end;
+end;
+
+function TChronisBase.AddPropertyString(ObjectId: Integer; Name,
+  ColumnName: string; Default: string = ''; MaxLength: Integer = 255): Integer;
+var
+  DbRows: TDbRows;
+  Data: TDictionaryStringString;
+  CustomTypeId: Integer;
+begin
+  try
+    DbRows := TDbRows.Create;
+    Data := TDictionaryStringString.Create;
+
+    Data.Clear;
+    Data.Add('Type', IntToStr(Integer(vtString)));
+    Database.Insert(CustomType, Data);
+    CustomTypeId := Database.LastInsertId;
+
+    Data.Clear;
+    Data.Add('CustomType', IntToStr(CustomTypeId));
+    Data.Add('MaxLength', IntToStr(MaxLength));
+    Data.Add('Default', Default);
+    Database.Insert(TypeString, Data);
+    CustomTypeId := Database.LastInsertId;
+
+    Result := AddProperty(ObjectId, Name, ColumnName, CustomTypeId);
+  finally
+    Data.Free;
+    DbRows.Free;
+  end;
+end;
+
 function TChronisBase.AddObjectGroup(Name: string): Integer;
 var
@@ -263 +349 @@
     Data.Add('Name', Name);
     Database.Insert(ObjectGroupTable, Data);
+    Result := Database.LastInsertId;
+  finally
+    Data.Free;
+    DbRows.Free;
+  end;
+end;
+
+function TChronisBase.AddEnumeration(Name: string): Integer;
+var
+  DbRows: TDbRows;
+  Data: TDictionaryStringString;
+begin
+  try
+    DbRows := TDbRows.Create;
+    Data := TDictionaryStringString.Create;
+    Data.Add('Name', Name);
+    Database.Insert(Enumeration, Data);
+    Result := Database.LastInsertId;
+  finally
+    Data.Free;
+    DbRows.Free;
+  end;
+end;
+
+function TChronisBase.AddEnumerationState(Enum: Integer; Name: string
+  ): Integer;
+var
+  DbRows: TDbRows;
+  Data: TDictionaryStringString;
+begin
+  try
+    DbRows := TDbRows.Create;
+    Data := TDictionaryStringString.Create;
+    Data.Add('Enumeration', IntToStr(Enum));
+    Data.Add('Name', Name);
+    Database.Insert(EnumerationState, Data);
     Result := Database.LastInsertId;
   finally