Changeset 23 for trunk/Forms

Timestamp:

Mar 26, 2018, 12:40:10 AM (6 years ago)

Author:

chronos

Message:

• Modified: More changes to implement SQL over XML file.

Location:

trunk/Forms

Files:

• UFormFields.pas (modified) (2 diffs)
• UFormTables.pas (modified) (3 diffs)

trunk/Forms/UFormFields.pas

@@ -91 +91 @@
   if FormField.ShowModal = mrOk then begin
     FormField.Save(NewField);
-    Fields.Table.DbClient.Query('INSERT INTO ModelField ( Name , TextBefore) VALUES ( ' +
-      NewField.Name + ' , ' + NewField.TextBefore + ' )');
+    Fields.Table.DbClient.Query('INSERT INTO ModelField ( Name , Caption , Model , DataType ) VALUES ( ' +
+      NewField.Name + ' , ' + NewField.TextBefore + ' , ' + TableName + ' , ' + NewField.DataType.Name + ' )');
     ReloadList;
   end else NewField.Free;
@@ -160 +160 @@
   I: Integer;
 begin
+  Fields.Clear;
   DbRows := TDbRows.Create;
   Fields.Table.DbClient.Query('SELECT * FROM ModelField WHERE Model = ' + Fields.Table.Name, DbRows);
   for I := 0 to DbRows.Count - 1 do begin
-    NewField := TField.Create;
-    NewField.Table := Fields.Table;
-    Fields.Add(NewField);
+    NewField := Fields.AddNew(DbRows[I].Values['Name'], Fields.Table.DbClient.DbManager.DataTypes.SearchByName(DbRows[I].Values['DataType']));
+    NewField.TextBefore := DbRows[I].Values['Caption'];
   end;
   DbRows.Free;

trunk/Forms/UFormTables.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ComCtrls,
-  ActnList, Menus, UDatabase;
+  ActnList, Menus, UDatabase, SpecializedDictionary;
 
 type
@@ -212 +212 @@
 procedure TFormTables.FormCreate(Sender: TObject);
 begin
-  FTables := TTables.Create(False);
+  FTables := TTables.Create;
 end;
 
@@ -232 +232 @@
 procedure TFormTables.ReloadList;
 var
+  DbRows: TDbRows;
+  NewTable: TTable;
   I: Integer;
 begin
-  if Assigned(DbClient) then DbClient.LoadTables(Tables)
-    else Tables.Clear;
+  Tables.Clear;
+  if Assigned(DbClient) then begin
+    DbRows := TDbRows.Create;
+    DbClient.Query('SELECT * FROM Model', DbRows);
+    for I := 0 to DbRows.Count - 1 do begin
+      NewTable := Tables.AddNew(TDictionaryStringString(DbRows[I]).Values['Name']);
+      NewTable.Caption := TDictionaryStringString(DbRows[I]).Values['Caption'];
+    end;
+    DbRows.Free;
+  end;
+
   for I := 0 to Tables.Count - 1 do
     TTable(Tables[I]).LoadRecordsCount;