Changeset 29 for trunk/UDatabase.pas

Timestamp:

Sep 10, 2022, 10:54:56 PM (2 years ago)

Author:

chronos

Message:

• Fixed: Load table fields in records list and record edit form.
• Fixed: Record add needs to insert new row into database.

File:

• trunk/UDatabase.pas (modified) (12 diffs)

trunk/UDatabase.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils, ExtCtrls, dialogs, USqlDatabase, URegistry, UGenerics,
+  Classes, SysUtils, ExtCtrls, Dialogs, USqlDatabase, URegistry, UGenerics,
   Generics.Collections;
 
@@ -76 +76 @@
     procedure Assign(Source: TFields);
     function AddNew(Name: string; DataType: TDataType): TField;
+    procedure Load;
   end;
 
@@ -81 +82 @@
 
   TRecord = class
-    Parent: TTable;
+    Table: TTable;
     Values: TValues;
     function Match(AValues: TStrings): Boolean;
@@ -93 +94 @@
 
   TRecords = class(TObjectList<TRecord>)
-    Parent: TTable;
+    Table: TTable;
     procedure Assign(Source: TRecords);
     function SearchByValue(Name, Value: string): TRecord;
     function SearchByValues(Values: TStrings): TRecord;
     function AddNew: TRecord;
+    procedure Load;
   end;
 
@@ -110 +112 @@
     DbClient: TDbClient;
     RecordsCount: Integer;
-    procedure LoadRecords;
     procedure LoadRecordsCount;
     procedure Assign(Source: TTable);
@@ -594 +595 @@
 begin
   Result := nil;
-  Field := Parent.Fields.SearchByName(Name);
+  Field := Table.Fields.SearchByName(Name);
   if Assigned(Field) then begin
-    FieldIndex := Parent.Fields.IndexOf(Field);
+    FieldIndex := Table.Fields.IndexOf(Field);
     I := 0;
     while (I < Count) and (Items[I].Values[FieldIndex].GetString <> Value) do Inc(I);
@@ -618 +619 @@
 begin
   Result := TRecord.Create;
-  Result.Parent := Parent;
+  Result.Table := Table;
   Result.InitValues;
   Add(Result);
+end;
+
+procedure TRecords.Load;
+var
+  DbRows: TDbRows;
+  I: Integer;
+  F: Integer;
+  NewRecord: TRecord;
+  NewValue: TValue;
+  Value: string;
+begin
+  Clear;
+  DbRows := TDbRows.Create;
+  try
+    Table.DbClient.Query('SELECT * FROM ' + Table.Name, DbRows);
+    for I := 0 to DbRows.Count - 1 do begin
+      NewRecord := TRecord.Create;
+      for F := 0 to Table.Fields.Count - 1 do begin
+        NewValue := Table.Fields[F].GetValueClass.Create;
+        if DbRows[I].TryGetValue(Table.Fields[F].Name, Value) then begin
+          NewValue.SetString(Value);
+          NewRecord.Values.Add(NewValue);
+        end else begin
+          //NewValue.SetString('');
+          NewRecord.Values.Add(NewValue);
+        end;
+      end;
+      Add(NewRecord);
+    end;
+  finally
+    DbRows.Free;
+  end;
 end;
 
@@ -658 +691 @@
 end;
 
+procedure TFields.Load;
+var
+  DbRows: TDbRows;
+  NewField: TField;
+  I: Integer;
+begin
+  Clear;
+  DbRows := TDbRows.Create;
+  try
+    Table.DbClient.Query('SELECT * FROM ModelField WHERE Model = ' + Table.Name, DbRows);
+    for I := 0 to DbRows.Count - 1 do begin
+      NewField := AddNew(DbRows[I].Items['Name'],
+        Table.DbClient.DbManager.DataTypes.SearchByName(DbRows[I].Items['DataType']));
+      NewField.TextBefore := DbRows[I].Items['Caption'];
+    end;
+  finally
+    DbRows.Free;
+  end;
+end;
+
 { TRecord }
 
@@ -668 +721 @@
   Result := True;
   for I := 0 to aValues.Count - 1 do begin
-    Field := Parent.Fields.SearchByName(AValues.Names[I]);
-    FieldIndex := Parent.Fields.IndexOf(Field);
+    Field := Table.Fields.SearchByName(AValues.Names[I]);
+    FieldIndex := Table.Fields.IndexOf(Field);
     if Assigned(Field) then begin
       if Values[FieldIndex].GetString <> AValues.ValueFromIndex[I] then begin
@@ -684 +737 @@
 begin
   Values.Clear;
-  for I := 0 to Parent.Fields.Count - 1 do
-    Values.Add(Parent.Fields[I].GetValueClass.Create);
+  for I := 0 to Table.Fields.Count - 1 do
+    Values.Add(Table.Fields[I].GetValueClass.Create);
 end;
 
@@ -781 +834 @@
 end;
 
-{ TTable }
-
-procedure TTable.LoadRecords;
-var
-  DbRows: TDbRows;
-  I: Integer;
-  F: Integer;
-  NewRecord: TRecord;
-  NewValue: TValue;
-  Value: string;
-begin
-  Records.Clear;
-  DbRows := TDbRows.Create;
-  try
-    DbClient.Query('SELECT * FROM ' + Name, DbRows);
-    for I := 0 to DbRows.Count - 1 do begin
-      NewRecord := TRecord.Create;
-      for F := 0 to Fields.Count - 1 do begin
-        NewValue := Fields[F].GetValueClass.Create;
-        if DbRows[I].TryGetValue(Fields[F].Name, Value) then begin
-          NewValue.SetString(Value);
-          NewRecord.Values.Add(NewValue);
-        end else begin
-          //NewValue.SetString('');
-          NewRecord.Values.Add(NewValue);
-        end;
-      end;
-      Records.Add(NewRecord);
-    end;
-  finally
-    DbRows.Free;
-  end;
-end;
-
 procedure TTable.LoadRecordsCount;
 var
@@ -842 +861 @@
 begin
   Records := TRecords.Create;
-  Records.Parent := Self;
+  Records.Table := Self;
   Fields := TFields.Create;
   Fields.Table := Self;