Changeset 37 for trunk/Module

Timestamp:

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

Author:

chronos

Message:

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

File:

• trunk/Module/UModuleSystem.pas (modified) (8 diffs)

trunk/Module/UModuleSystem.pas

@@ -26 +26 @@
 
 uses
-  USystem, USqlDatabase;
+  USystem, USqlDatabase, UChronisClient;
 
 { TModuleSystem }
@@ -86 +86 @@
   GroupId := AddObjectGroup('System');
 
-  ObjectGroupId := AddObject('Object groups', 'ObjectGroup', Database.Database, GroupId);
+  ObjectGroupId := AddObject('Object groups', 'ObjectGroup', Client.Schema, GroupId);
     AddPropertyNumber(ObjectGroupId, 'Id', 'Id', False);
     AddPropertyString(ObjectGroupId, 'Name', 'Name', True);
     ObjectGroupParentId := AddPropertyRelationOne(ObjectGroupId, 'Parent', 'Parent', True, ObjectGroupId);
 
-  ObjectId := AddObject('Objects', 'Object', Database.Database, GroupId);
+  ObjectId := AddObject('Objects', 'Object', Client.Schema, GroupId);
     AddPropertyNumber(ObjectId, 'Id', 'Id', False);
     AddPropertyString(ObjectId, 'Name', 'Name', True);
@@ -100 +100 @@
     AddPropertyNumber(ObjectId, 'Sequence', 'Sequence', True);
 
-  PropertyTypeId := AddObject('Property types', 'Type', Database.Database, GroupId);
+  PropertyTypeId := AddObject('Property types', 'Type', Client.Schema, GroupId);
     AddPropertyNumber(PropertyTypeId, 'Id', 'Id', False);
     AddPropertyString(PropertyTypeId, 'Name', 'Name', True);
@@ -106 +106 @@
     //AddPropertyNumber(ObjectId, 'Parent', 'Parent');
 
-  CustomTypeId := AddObject('Custom types', 'TypeCustom', Database.Database, GroupId);
+  CustomTypeId := AddObject('Custom types', 'TypeCustom', Client.Schema, GroupId);
     AddPropertyNumber(CustomTypeId, 'Id', 'Id', False);
     CustomTypeIdType := AddPropertyRelationOne(CustomTypeId, 'Type', 'Type', True, PropertyTypeId);
 
-  ObjectPropertyGroupId := AddObject('Property groups', 'PropertyGroup', Database.Database, GroupId);
+  ObjectPropertyGroupId := AddObject('Property groups', 'PropertyGroup', Client.Schema, GroupId);
     AddPropertyNumber(ObjectPropertyGroupId, 'Id', 'Id', False);
 
-  ObjectPropertyId := AddObject('Properties', 'Property', Database.Database, GroupId);
+  ObjectPropertyId := AddObject('Properties', 'Property', Client.Schema, GroupId);
     AddPropertyNumber(ObjectPropertyId, 'Id', 'Id', False);
     AddPropertyString(ObjectPropertyId, 'Name', 'Name', True);
@@ -127 +127 @@
     AddPropertyRelationMany(ObjectPropertyGroupId, 'Properties', 'Properties', True, ObjectPropertyIdGroup);
     AddPropertyRelationMany(PropertyTypeId, 'Custom types', 'CustomTypes', True, CustomTypeIdType);
-  ModuleId := AddObject('Modules', 'Module', Database.Database, GroupId);
+
+  ModuleId := AddObject('Modules', 'Module', Client.Schema, GroupId);
     AddPropertyNumber(ModuleId, 'Id', 'Id', False);
     AddPropertyString(ModuleId, 'Name', 'Name', True);
@@ -149 +150 @@
 procedure TModuleSystem.InitStructure;
 var
-  DbRows: TDbRows;
-  DbRows2: TDbRows;
   StructureVersion: string;
   Data: TDictionaryStringString;
@@ -156 +155 @@
   Tables: TListString;
   I: Integer;
+  NewProxy: TListProxy;
 begin
   with TChronisBase(System) do
   try
-    DbRows := TDbRows.Create;
     Tables := TListString.Create;
     Data := TDictionaryStringString.Create;
 
-    Database.Query(DbRows, 'SHOW TABLES');
-    Tables.Count := DbRows.Count;
-    for I := 0 to DbRows.Count - 1 do
-      Tables[I] := DbRows[I].Items[0].Value;
-
-    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'];
-
-    if Tables.IndexOf(ObjectTable) = -1 then begin
+    NewProxy := TListProxy.Create;
+    NewProxy.SchemaName := 'information_schema';
+    NewProxy.ObjectName := 'TABLES';
+    NewProxy.Condition := 'TABLE_SCHEMA = "' + Client.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'];
+
+(*    if Tables.IndexOf(ObjectTable) = -1 then begin
       Database.Query(DbRows, 'CREATE TABLE IF NOT EXISTS `' + ObjectTable + '` ( ' +
         '`Id` int(11) NOT NULL AUTO_INCREMENT,' +
@@ -372 +365 @@
         'PRIMARY KEY (`Id`)' +
         ') ENGINE=InnoDB  DEFAULT CHARSET=utf8');
-    end;
+    end;   *)
   finally
     Tables.Free;
     Data.Free;
-    DbRows.Free;
+    NewProxy.Free;
   end;
 end;