Changeset 14 for trunk/DbEngines

Timestamp:

Mar 22, 2018, 7:59:13 PM (7 years ago)

Author:

chronos

Message:

• Added: Support for item references.
• Added: Data and Time value types.

File:

• trunk/DbEngines/UEngineMySQL.pas (modified) (4 diffs)

trunk/DbEngines/UEngineMySQL.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, UDatabase, USqlDatabase, UHtmlClasses, SpecializedDictionary;
+  Classes, Dialogs, SysUtils, UDatabase, USqlDatabase, UHtmlClasses, SpecializedDictionary;
 
 type
@@ -32 +32 @@
 var
   DbRows: TDbRows;
+  DbRows2: TDbRows;
   NewField: TField;
   I: Integer;
   DataType: Integer;
+  TypeName: string;
 begin
   DbRows := TDbRows.Create;
+  DbRows2 := TDbRows.Create;
   try
     SqlDatabase.Query(DbRows, 'SELECT * FROM `ModelField` WHERE `Model` = ' + IntToStr(Table.Id) + '');
@@ -44 +47 @@
       NewField.Name := TDictionaryStringString(DbRows[I]).Values['Name'];
       NewField.TextBefore := TDictionaryStringString(DbRows[I]).Values['Title'];
-      DataType := StrToInt(TDictionaryStringString(DbRows[I]).Values['DataType']);
-      NewField.DataType := Table.Database.Engine.DataTypes.FindByType(TFieldType(DataType));
-      if not Assigned(NewField.DataType) then
+      DataType := StrToInt(TDictionaryStringString(DbRows[I]).Values['Type']);
+      SqlDatabase.Query(DbRows2, 'SELECT * FROM `DataType` WHERE `Id` = ' + IntToStr(DataType) + '');
+      if DbRows2.Count > 0 then begin
+        TypeName := TDictionaryStringString(DbRows2[0]).Values['Name'];
+        NewField.DataType := Table.Database.Engine.DataTypes.FindByName(TypeName);
+        if not Assigned(NewField.DataType) then
+          NewField.DataType := Table.Database.Engine.DataTypes.FindByType(ftString);
+      end else begin
+        // Use string as default
         NewField.DataType := Table.Database.Engine.DataTypes.FindByType(ftString);
+      end;
       Table.Fields.Add(NewField);
     end;
   finally
     DbRows.Free;
+    DbRows2.Free;
   end;
 end;
@@ -72 +83 @@
       NewTable.Caption := TDictionaryStringString(DbRows[I]).Values['Title'];
       LoadFields(NewTable);
-      DbRows2 := TDbRows.Create;
-      try
-        SqlDatabase.Query(DbRows2, 'SELECT COUNT(*) FROM `' + NewTable.Name + '`');
-        if DbRows2.Count = 1 then
-          NewTable.RecordsCount := StrToInt(DbRows2[0].Values['COUNT(*)']);
-      finally
-        DbRows2.Free;
-      end;
       Database.Tables.Add(NewTable);
     end;