Changeset 43 for trunk/Module

Timestamp:

Mar 9, 2012, 1:09:52 PM (13 years ago)

Author:

chronos

Message:

• Fixed: Selection of available protocols in profile manager.
• Modified: Initialization of persistent data structures rewrited to more native structures.

File:

• trunk/Module/UModuleSystem.pas (modified) (1 diff)

trunk/Module/UModuleSystem.pas

@@ -149 +149 @@
 
 procedure TModuleSystem.InitStructure;
-var
-  StructureVersion: string;
-  Data: TDictionaryStringString;
-  ObjectId: Integer;
-  Tables: TListString;
-  I: Integer;
-  NewProxy: TListProxy;
-begin
-  with TChronisBase(System) do
+begin
+  with TChronisBase(System).Client do
   try
-    Tables := TListString.Create;
-    Data := TDictionaryStringString.Create;
-
-    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,' +
-        '`Name` varchar(255) NOT NULL,' +
-        '`Schema` varchar(255) NOT NULL,' +
-        '`Table` varchar(255) NOT NULL,' +
-        '`PrimaryKey` varchar(255) NOT NULL DEFAULT "Id", ' +
-        '`Sequence` int(11) NOT NULL DEFAULT 0,' +
-        '`Group` int(11) NOT NULL,' +
-        'KEY `Group` (`Group`),' +
-        'PRIMARY KEY (`Id`)' +
-      ') ENGINE=InnoDB  DEFAULT CHARSET=utf8');
-
-    end;
-
-    if Tables.IndexOf(ObjectGroupTable) = -1 then begin
-      Database.Query(DbRows, 'CREATE TABLE IF NOT EXISTS `' + ObjectGroupTable + '` ( ' +
-        '`Id` int(11) NOT NULL AUTO_INCREMENT,' +
-        '`Name` varchar(255) NOT NULL,' +
-        '`Parent` int(11) NOT NULL DEFAULT 0,' +
-        '`Sequence` int(11) NOT NULL DEFAULT 0,' +
-        'KEY `Parent` (`Parent`),' +
-        'PRIMARY KEY (`Id`)' +
-      ') ENGINE=InnoDB  DEFAULT CHARSET=utf8');
-    end;
-
-    if Tables.IndexOf(PropertyTable) = -1 then begin
-      Database.Query(DbRows, 'CREATE TABLE IF NOT EXISTS `' + PropertyTable + '` ( ' +
-        '`Id` int(11) NOT NULL AUTO_INCREMENT,' +
-      '`Name` varchar(255) NOT NULL,' +
-      '`Object` int(11) NOT NULL,' +
-      '`PropertyGroup` int(11) NOT NULL DEFAULT 0,' +
-      '`CustomType` int(11) NOT NULL,' +
-      '`Editable` bool NOT NULL DEFAULT 1,' +
-      '`ColumnName` varchar(255) NOT NULL,' +
-      'KEY `Object` (`Object`),' +
-      'KEY `PropertyGroup` (`PropertyGroup`),' +
-      'KEY `CustomType` (`CustomType`),' +
-      'PRIMARY KEY (`Id`)' +
-      ') ENGINE=InnoDB  DEFAULT CHARSET=utf8');
-    end;
-    if Tables.IndexOf(PropertyTypeTable) = -1 then begin
-      Database.Query(DbRows, 'CREATE TABLE IF NOT EXISTS `' + PropertyTypeTable + '` ( ' +
-        '`Id` int(11) NOT NULL AUTO_INCREMENT,' +
-      '`Name` varchar(255) NOT NULL,' +
-      '`DbType` varchar(255) NOT NULL,' +
-      'PRIMARY KEY (`Id`)' +
-      ') ENGINE=InnoDB  DEFAULT CHARSET=utf8');
-    end;
-
-    if Tables.IndexOf(PropertyGroupTable) = -1 then begin
-      Database.Query(DbRows, 'CREATE TABLE IF NOT EXISTS `' + PropertyGroupTable + '` ( ' +
-        '`Id` int(11) NOT NULL AUTO_INCREMENT,' +
-      '`Name` varchar(255) NOT NULL,' +
-      '`Object` int(11) NOT NULL,' +
-      'KEY `Object` (`Object`),' +
-      'PRIMARY KEY (`Id`)' +
-      ') ENGINE=InnoDB  DEFAULT CHARSET=utf8');
-    end;
-
-    if Tables.IndexOf(EnumerationState) = -1 then begin
-      Database.Query(DbRows, 'CREATE TABLE IF NOT EXISTS `' + EnumerationState + '` ( ' +
-        '`Id` int(11) NOT NULL AUTO_INCREMENT,' +
-        '`Enumeration` int(11) NOT NULL,' +
-        '`Name` varchar(255) NOT NULL,' +
-        '`Sequence` int(11) NOT NULL DEFAULT 0,' +
-        'KEY `Enumeration` (`Enumeration`),' +
-        'PRIMARY KEY (`Id`)' +
-        ') ENGINE=InnoDB  DEFAULT CHARSET=utf8');
-    end;
-
-    if Tables.IndexOf(Enumeration) = -1 then begin
-      Database.Query(DbRows, 'CREATE TABLE IF NOT EXISTS `' + Enumeration + '` ( ' +
-        '`Id` int(11) NOT NULL AUTO_INCREMENT,' +
-        '`Name` varchar(255) NOT NULL,' +
-        'PRIMARY KEY (`Id`)' +
-        ') ENGINE=InnoDB  DEFAULT CHARSET=utf8');
-    end;
-
-    if Tables.IndexOf(TypeEnumeration) = -1 then begin
-      Database.Query(DbRows, 'CREATE TABLE IF NOT EXISTS `' + TypeEnumeration + '` ( ' +
-        '`Id` int(11) NOT NULL AUTO_INCREMENT,' +
-        '`Enumeration` int(11) NOT NULL,' +
-        'KEY `Enumeration` (`Enumeration`),' +
-        'PRIMARY KEY (`Id`)' +
-        ') ENGINE=InnoDB  DEFAULT CHARSET=utf8');
-    end;
-
-    if Tables.IndexOf(TypeRelationOne) = -1 then begin
-      Database.Query(DbRows, 'CREATE TABLE IF NOT EXISTS `' + TypeRelationOne + '` ( ' +
-        '`Id` int(11) NOT NULL AUTO_INCREMENT,' +
-        '`CustomType` int(11) NOT NULL,' +
-        '`Object` int(11) NOT NULL,' +
-        'KEY `CustomType` (`CustomType`),' +
-        'PRIMARY KEY (`Id`)' +
-        ') ENGINE=InnoDB  DEFAULT CHARSET=utf8');
-    end;
-
-    if Tables.IndexOf(TypeRelationMany) = -1 then begin
-      Database.Query(DbRows, 'CREATE TABLE IF NOT EXISTS `' + TypeRelationMany + '` ( ' +
-        '`Id` int(11) NOT NULL AUTO_INCREMENT,' +
-        '`CustomType` int(11) NOT NULL,' +
-        '`ObjectProperty` int(11) NOT NULL,' +
-        'KEY `CustomType` (`CustomType`),' +
-        'PRIMARY KEY (`Id`)' +
-        ') ENGINE=InnoDB  DEFAULT CHARSET=utf8');
-    end;
-
-    if Tables.IndexOf(TypeFile) = -1 then begin
-      Database.Query(DbRows, 'CREATE TABLE IF NOT EXISTS `' + TypeFile + '` ( ' +
-        '`Id` int(11) NOT NULL AUTO_INCREMENT,' +
-        '`Name` varchar(255) NOT NULL,' +
-        '`Size` int(11) NOT NULL,' +
-        'PRIMARY KEY (`Id`)' +
-        ') ENGINE=InnoDB  DEFAULT CHARSET=utf8');
-    end;
-
-    if Tables.IndexOf(TypeGPS) = -1 then begin
-      Database.Query(DbRows, 'CREATE TABLE IF NOT EXISTS `' + TypeGPS + '` ( ' +
-        '`Id` int(11) NOT NULL AUTO_INCREMENT,' +
-        '`Latitude` double NOT NULL,' +
-        '`Longitude` double NOT NULL,' +
-        'PRIMARY KEY (`Id`)' +
-        ') ENGINE=InnoDB  DEFAULT CHARSET=utf8');
-    end;
-
-    if Tables.IndexOf(CustomTypeTableName) = -1 then begin
-      Database.Query(DbRows, 'CREATE TABLE IF NOT EXISTS `' + CustomTypeTableName + '` ( ' +
-        '`Id` int(11) NOT NULL AUTO_INCREMENT,' +
-        '`Type` int NOT NULL,' +
-        'KEY `Type` (`Type`),' +
-        'PRIMARY KEY (`Id`)' +
-        ') ENGINE=InnoDB  DEFAULT CHARSET=utf8');
-    end;
-
-    if Tables.IndexOf(TypeNumber) = -1 then begin
-      Database.Query(DbRows, 'CREATE TABLE IF NOT EXISTS `' + TypeNumber + '` ( ' +
-        '`Id` int(11) NOT NULL AUTO_INCREMENT,' +
-        '`CustomType` int NOT NULL,' +
-        '`Default` int NOT NULL,' +
-        '`Min` int NOT NULL,' +
-        '`Max` int NOT NULL,' +
-        'KEY `CustomType` (`CustomType`),' +
-        'PRIMARY KEY (`Id`)' +
-        ') ENGINE=InnoDB  DEFAULT CHARSET=utf8');
-    end;
-
-    if Tables.IndexOf(TypeFloat) = -1 then begin
-      Database.Query(DbRows, 'CREATE TABLE IF NOT EXISTS `' + TypeFloat + '` ( ' +
-        '`Id` int(11) NOT NULL AUTO_INCREMENT,' +
-        '`CustomType` int NOT NULL,' +
-        '`Default` float NOT NULL,' +
-        '`Min` float NOT NULL,' +
-        '`Max` float NOT NULL,' +
-        'KEY `CustomType` (`CustomType`),' +
-        'PRIMARY KEY (`Id`)' +
-        ') ENGINE=InnoDB  DEFAULT CHARSET=utf8');
-    end;
-
-    if Tables.IndexOf(TypeDateTime) = -1 then begin
-      Database.Query(DbRows, 'CREATE TABLE IF NOT EXISTS `' + TypeDateTime + '` ( ' +
-        '`Id` int(11) NOT NULL AUTO_INCREMENT,' +
-        '`CustomType` int NOT NULL,' +
-        '`Default` datetime NOT NULL,' +
-        '`Min` datetime NOT NULL,' +
-        '`Max` datetime NOT NULL,' +
-        'KEY `CustomType` (`CustomType`),' +
-        'PRIMARY KEY (`Id`)' +
-        ') ENGINE=InnoDB  DEFAULT CHARSET=utf8');
-    end;
-
-    if Tables.IndexOf(TypeString) = -1 then begin
-      Database.Query(DbRows, 'CREATE TABLE IF NOT EXISTS `' + TypeString + '` ( ' +
-        '`Id` int(11) NOT NULL AUTO_INCREMENT,' +
-        '`CustomType` int NOT NULL,' +
-        '`Default` VARCHAR(255) NOT NULL,' +
-        '`MaxLength` int NOT NULL,' +
-        'KEY `CustomType` (`CustomType`),' +
-        'PRIMARY KEY (`Id`)' +
-        ') ENGINE=InnoDB  DEFAULT CHARSET=utf8');
-    end;
-
-      if Tables.IndexOf(ModuleTable) = -1 then begin
-      Database.Query(DbRows, 'CREATE TABLE IF NOT EXISTS `' + ModuleTable + '` ( ' +
-        '`Id` int(11) NOT NULL AUTO_INCREMENT,' +
-        '`Name` VARCHAR(255) NOT NULL,' +
-        '`Author` VARCHAR(255) NOT NULL,' +
-        '`Website` VARCHAR(255) NOT NULL,' +
-        '`Version` VARCHAR(255) NOT NULL,' +
-        '`License` VARCHAR(255) NOT NULL,' +
-        '`Description` TEXT NOT NULL,' +
-        'PRIMARY KEY (`Id`)' +
-        ') ENGINE=InnoDB  DEFAULT CHARSET=utf8');
-    end;   *)
+    with Types.AddType(ObjectTable) do begin
+      with Properties do begin
+        Add('Name', 'String');
+        Add('Schema', 'String');
+        Add('Table', 'String');
+        Add('PrimaryKey', 'String');
+        Add('Sequence', 'Integer');
+        Add('Group', 'RelationOne');
+      end;
+    end;
+
+    with Types.AddType(ObjectGroupTable) do begin
+      with Properties do begin
+        Add('Name', 'String');
+        Add('Schema', 'String');
+        Add('Parent', 'RelationOne');
+        Add('Sequence', 'Integer');
+      end;
+    end;
+
+    with Types.AddType(PropertyTable) do begin
+      with Properties do begin
+        Add('Name', 'String');
+        Add('Object', 'RelationOne');
+        Add('PropertyGroup', 'RelationOne');
+        Add('CustomType', 'RelationOne');
+        Add('Editable', 'Boolean');
+        Add('ColumnName', 'String');
+      end;
+    end;
+
+    with Types.AddType(PropertyTypeTable) do begin
+      with Properties do begin
+        Add('Name', 'String');
+        Add('DbType', 'String');
+      end;
+    end;
+
+    with Types.AddType(PropertyGroupTable) do begin
+      with Properties do begin
+        Add('Name', 'String');
+        Add('Object', 'RelationOne');
+      end;
+    end;
+
+    with Types.AddType(EnumerationState) do begin
+      with Properties do begin
+        Add('Enumeration', 'RelationOne');
+        Add('Name', 'String');
+        Add('Sequence', 'Integer');
+      end;
+    end;
+
+    with Types.AddType(Enumeration) do begin
+      with Properties do begin
+        Add('Name', 'String');
+      end;
+    end;
+
+    with Types.AddType(TypeEnumeration) do begin
+      with Properties do begin
+        Add('Enumeration', 'RelationOne');
+      end;
+    end;
+
+    with Types.AddType(TypeRelationOne) do begin
+      with Properties do begin
+        Add('CustomType', 'RelationOne');
+        Add('Object', 'Integer');
+      end;
+    end;
+
+    with Types.AddType(TypeRelationMany) do begin
+      with Properties do begin
+        Add('CustomType', 'RelationOne');
+        Add('ObjectProperty', 'Integer');
+      end;
+    end;
+
+    with Types.AddType(TypeFile) do begin
+      with Properties do begin
+        Add('Name', 'String');
+        Add('Size', 'Integer');
+      end;
+    end;
+
+    with Types.AddType(TypeGPS) do begin
+      with Properties do begin
+        Add('Latitude', 'Double');
+        Add('Longitude', 'Double');
+      end;
+    end;
+
+    with Types.AddType(CustomTypeTableName) do begin
+      with Properties do begin
+        Add('Type', 'RelationOne');
+      end;
+    end;
+
+    with Types.AddType(TypeNumber) do begin
+      with Properties do begin
+        Add('CustomType', 'RelationOne');
+        Add('Default', 'Integer');
+        Add('Min', 'Integer');
+        Add('Max', 'Integer');
+      end;
+    end;
+
+    with Types.AddType(TypeFloat) do begin
+      with Properties do begin
+        Add('CustomType', 'RelationOne');
+        Add('Default', 'Double');
+        Add('Min', 'Double');
+        Add('Max', 'Double');
+      end;
+    end;
+
+    with Types.AddType(TypeDateTime) do begin
+      with Properties do begin
+        Add('CustomType', 'RelationOne');
+        Add('Default', 'DateTime');
+        Add('Min', 'DateTime');
+        Add('Max', 'DateTime');
+      end;
+    end;
+
+    with Types.AddType(TypeString) do begin
+      with Properties do begin
+        Add('CustomType', 'RelationOne');
+        Add('Default', 'String');
+        Add('MaxLength', 'Integer');
+      end;
+    end;
+
+    with Types.AddType(ModuleTable) do begin
+      with Properties do begin
+        Add('Name', 'String');
+        Add('Author', 'String');
+        Add('Website', 'String');
+        Add('Version', 'String');
+        Add('License', 'String');
+        Add('Description', 'Text');
+      end;
+    end;
+
+    CheckTypes;
   finally
-    Tables.Free;
-    Data.Free;
-    NewProxy.Free;
   end;
 end;