Changeset 8 for trunk/UCore.pas

Timestamp:

Jan 23, 2015, 12:00:37 AM (9 years ago)

Author:

chronos

Message:

• Modified: All data types have own table which is used to specify supported data types by database engines.

File:

• trunk/UCore.pas (modified) (6 diffs)

trunk/UCore.pas

@@ -24 +24 @@
     Initialized: Boolean;
     procedure InitEngines;
+    procedure InitDataTypes;
   public
     Databases: TDatabases;
     Engines: TDatabaseEngines;
+    DataTypes: TDataTypes;
     procedure LoadConfig;
     procedure SaveConfig;
@@ -39 +41 @@
 
 uses
-  UEngineXML, UEngineMySQL, UEngineSQLite, UFormTables, UFormConnect, UFormDatabases;
+  UEngineXML, UEngineMySQL, UEngineSQLite, UFormTables, UFormConnect,
+  UFormDatabases, UDataTypes;
 
 {$R *.lfm}
@@ -49 +52 @@
   Databases := TDatabases.Create;
   Engines := TDatabaseEngines.Create;
+  DataTypes := TDataTypes.Create;
 end;
 
@@ -58 +62 @@
 procedure TCore.DataModuleDestroy(Sender: TObject);
 begin
+  DataTypes.Free;
   Engines.Free;
   Databases.Free;
@@ -67 +72 @@
 begin
   Engines.Clear;
-
   NewEngine := Engines.RegisterEngine('XML file', TDatabaseXML);
-  with NewEngine.DataTypes do begin
-    RegisterType('String', ftString);
-    RegisterType('Integer', ftInteger);
-    RegisterType('Date and time', ftDateTime);
-    RegisterType('Boolean', ftBoolean);
-    RegisterType('Float', ftFloat);
-  end;
+  NewEngine.UseTypes(DataTypes, [ftString, ftInteger, ftDateTime, ftBoolean, ftFloat]);
 
   NewEngine := Engines.RegisterEngine('MySQL', TDatabaseMySQL);
-  with NewEngine.DataTypes do begin
-    RegisterType('String', ftString);
-    RegisterType('Integer', ftInteger);
-    RegisterType('Date and time', ftDateTime);
-    RegisterType('Boolean', ftBoolean);
-    RegisterType('Float', ftFloat);
-  end;
+  NewEngine.UseTypes(DataTypes, [ftString, ftInteger, ftDateTime, ftBoolean, ftFloat]);
 
   NewEngine := Engines.RegisterEngine('SQLite', TDatabaseSQLite);
-  with NewEngine.DataTypes do begin
-    RegisterType('String', ftString);
-    RegisterType('Integer', ftInteger);
-    RegisterType('Date and time', ftDateTime);
-    RegisterType('Boolean', ftBoolean);
-    RegisterType('Float', ftFloat);
+  NewEngine.UseTypes(DataTypes, [ftString, ftInteger, ftDateTime, ftBoolean, ftFloat]);
+end;
+
+procedure TCore.InitDataTypes;
+begin
+  DataTypes.Clear;
+  with DataTypes do begin
+    RegisterType('String', ftString, TFieldString);
+    RegisterType('Integer', ftInteger, TFieldInteger);
+    RegisterType('Date and time', ftDateTime, TFieldDateTime);
+    RegisterType('Boolean', ftBoolean, TFieldBoolean);
+    RegisterType('Float', ftFloat, TFieldFloat);
+    RegisterType('MapPosition', ftMapPosition, TFieldMapPosition);
+    RegisterType('Date', ftDate, TFieldDate);
+    RegisterType('Time', ftTime, TFieldTime);
+    RegisterType('Image', ftImage, TFieldImage);
   end;
 end;
@@ -130 +132 @@
 begin
   if not Initialized then begin
+    InitDataTypes;
     InitEngines;
     FormConnect.Init;