Changeset 21 for trunk/Forms/UMainForm.pas

Timestamp:

Jun 16, 2011, 10:32:01 AM (13 years ago)

Author:

george

Message:

• Added: Item selection form for TypeRelationOne.
• Modified: Primary keys have to have their property record for each object.
• Added: Object propery havet to be initialized with Editable flag.

File:

• trunk/Forms/UMainForm.pas (modified) (2 diffs)

trunk/Forms/UMainForm.pas

@@ -445 +445 @@
 
   ObjectGroupId := AddObject('Object groups', 'ObjectGroup', Core.System.Database.Database, GroupId);
-    AddPropertyString(ObjectGroupId, 'Name', 'Name');
-    ObjectGroupParentId := AddPropertyRelationOne(ObjectGroupId, 'Parent', 'Parent', ObjectGroupId);
+    AddPropertyNumber(ObjectGroupId, 'Id', 'Id', False);
+    AddPropertyString(ObjectGroupId, 'Name', 'Name', True);
+    ObjectGroupParentId := AddPropertyRelationOne(ObjectGroupId, 'Parent', 'Parent', True, ObjectGroupId);
 
   ObjectId := AddObject('Objects', 'Object', Core.System.Database.Database, GroupId);
-    AddPropertyString(ObjectId, 'Name', 'Name');
-    ObjectIdGroupId := AddPropertyRelationOne(ObjectId, 'Group', 'Group', ObjectGroupId);
-    AddPropertyString(ObjectId, 'Schema', 'Schema');
-    AddPropertyString(ObjectId, 'Table', 'Table');
-    AddPropertyString(ObjectId, 'Primary key', 'PrimaryKey');
-    AddPropertyNumber(ObjectId, 'Sequence', 'Sequence');
+    AddPropertyNumber(ObjectId, 'Id', 'Id', False);
+    AddPropertyString(ObjectId, 'Name', 'Name', True);
+    ObjectIdGroupId := AddPropertyRelationOne(ObjectId, 'Group', 'Group', True, ObjectGroupId);
+    AddPropertyString(ObjectId, 'Schema', 'Schema', True);
+    AddPropertyString(ObjectId, 'Table', 'Table', True);
+    AddPropertyString(ObjectId, 'Primary key', 'PrimaryKey', True);
+    AddPropertyNumber(ObjectId, 'Sequence', 'Sequence', True);
 
   PropertyTypeId := AddObject('Property types', 'Type', Core.System.Database.Database, GroupId);
-    AddPropertyString(PropertyTypeId, 'Name', 'Name');
-    AddPropertyString(PropertyTypeId, 'Type', 'DbType');
+    AddPropertyNumber(PropertyTypeId, 'Id', 'Id', False);
+    AddPropertyString(PropertyTypeId, 'Name', 'Name', True);
+    AddPropertyString(PropertyTypeId, 'Type', 'DbType', True);
     //AddPropertyNumber(ObjectId, 'Parent', 'Parent');
 
   CustomTypeId := AddObject('Custom types', 'TypeCustom', Core.System.Database.Database, GroupId);
-    CustomTypeIdType := AddPropertyRelationOne(CustomTypeId, 'Type', 'Type', PropertyTypeId);
+    AddPropertyNumber(CustomTypeId, 'Id', 'Id', False);
+    CustomTypeIdType := AddPropertyRelationOne(CustomTypeId, 'Type', 'Type', True, PropertyTypeId);
 
   ObjectPropertyGroupId := AddObject('Property groups', 'PropertyGroup', Core.System.Database.Database, GroupId);
+    AddPropertyNumber(ObjectPropertyGroupId, 'Id', 'Id', False);
 
   ObjectPropertyId := AddObject('Properties', 'Property', Core.System.Database.Database, GroupId);
-    AddPropertyString(ObjectPropertyId, 'Name', 'Name');
-    PropertyParentId := AddPropertyRelationOne(ObjectPropertyId, 'Object', 'Object', ObjectId);
-    ObjectPropertyIdGroup := AddPropertyRelationOne(ObjectPropertyId, 'Property group', 'PropertyGroup', ObjectPropertyGroupId);
-    AddPropertyNumber(ObjectPropertyId, 'Custom type', 'CustomType');
-    AddProperty(ObjectPropertyId, 'Editable', 'Editable', TypeBoolean);
-    AddPropertyString(ObjectPropertyId, 'Column name', 'ColumnName');
-
-    AddPropertyRelationMany(ObjectGroupId, 'Childs', 'Childs', PropertyParentId);
-    AddPropertyRelationMany(ObjectGroupId, 'Objects', 'Objects', ObjectIdGroupId);
-    AddPropertyRelationMany(ObjectId, 'Properties', 'Properties', PropertyParentId);
-    AddPropertyRelationMany(ObjectPropertyGroupId, 'Properties', 'Properties', ObjectPropertyIdGroup);
-    AddPropertyRelationMany(PropertyTypeId, 'Custom types', 'CustomTypes', CustomTypeIdType);
+    AddPropertyNumber(ObjectPropertyId, 'Id', 'Id', False);
+    AddPropertyString(ObjectPropertyId, 'Name', 'Name', True);
+    PropertyParentId := AddPropertyRelationOne(ObjectPropertyId, 'Object', 'Object', True, ObjectId);
+    ObjectPropertyIdGroup := AddPropertyRelationOne(ObjectPropertyId, 'Property group', 'PropertyGroup', True, ObjectPropertyGroupId);
+    AddPropertyNumber(ObjectPropertyId, 'Custom type', 'CustomType', True);
+    AddProperty(ObjectPropertyId, 'Editable', 'Editable', TypeBoolean, True);
+    AddPropertyString(ObjectPropertyId, 'Column name', 'ColumnName', True);
+
+    AddPropertyRelationMany(ObjectGroupId, 'Childs', 'Childs', True, PropertyParentId);
+    AddPropertyRelationMany(ObjectGroupId, 'Objects', 'Objects', True, ObjectIdGroupId);
+    AddPropertyRelationMany(ObjectId, 'Properties', 'Properties', True, PropertyParentId);
+    AddPropertyRelationMany(ObjectPropertyGroupId, 'Properties', 'Properties', True, ObjectPropertyIdGroup);
+    AddPropertyRelationMany(PropertyTypeId, 'Custom types', 'CustomTypes', True, CustomTypeIdType);
   end;
 end;
@@ -739 +745 @@
     Report.Load(SelectedObject);
 
-    Columns.Clear;
-    for I := 0 to Report.Columns.Count - 1 do
-    if not TReportColumn(Report.Columns[I]).VirtualItem then begin
-      NewColumn := Columns.Add;
-      NewColumn.Caption := TReportColumn(Report.Columns[I]).Caption;
-    end;
+    Report.FillListColumns(Columns);
     Items.Count := Report.Count;
     Refresh;