Changeset 14 for trunk/UDatabase.pas

Timestamp:

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

Author:

chronos

Message:

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

File:

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

trunk/UDatabase.pas

@@ -17 +17 @@
 
   TFieldType = (ftString, ftInteger, ftDateTime, ftBoolean, ftFloat, ftImage,
-    ftDate, ftTime, ftMapPosition);
+    ftDate, ftTime, ftMapPosition, ftReference);
 
   { TValue }
@@ -24 +24 @@
     procedure Assign(Source: TValue); virtual;
     function GetString: string; virtual;
-    function SetString(Value: string): string; virtual;
+    procedure SetString(Value: string); virtual;
+    function GetStringSQL: string; virtual;
+    procedure SetStringSQL(Value: string); virtual;
   end;
 
@@ -151 +153 @@
     Id: Integer;
     Name: string;
+    Title: string;
     FieldType: TFieldType;
     FieldTypeClass: TFieldTypeSpecificClass;
@@ -158 +161 @@
 
   TDataTypes = class(TObjectList)
-    function RegisterType(Id: Integer; Name: string; FieldType: TFieldType; FieldTypeClass: TFieldTypeSpecificClass): TDataType;
+    function RegisterType(Id: Integer; Name, Title: string;
+      FieldType: TFieldType; FieldTypeClass: TFieldTypeSpecificClass): TDataType;
     function FindByType(FieldType: TFieldType): TDataType;
+    function FindByName(Name: string): TDataType;
   end;
 
@@ -272 +277 @@
 { TDataTypes }
 
-function TDataTypes.RegisterType(Id: Integer; Name: string; FieldType: TFieldType;
-  FieldTypeClass: TFieldTypeSpecificClass): TDataType;
+function TDataTypes.RegisterType(Id: Integer; Name, Title: string;
+  FieldType: TFieldType; FieldTypeClass: TFieldTypeSpecificClass): TDataType;
 begin
   Result := TDataType.Create;
   Result.Id := Id;
   Result.Name := Name;
+  Result.Title := Title;
   Result.FieldType := FieldType;
   Result.FieldTypeClass := FieldTypeClass;
@@ -289 +295 @@
   I := 0;
   while (I < Count) and (TDataType(Items[I]).FieldType <> FieldType) do Inc(I);
+  if I < Count then Result := TDataType(Items[I])
+    else Result := nil;
+end;
+
+function TDataTypes.FindByName(Name: string): TDataType;
+var
+  I: Integer;
+begin
+  I := 0;
+  while (I < Count) and (TDataType(Items[I]).Name <> Name) do Inc(I);
   if I < Count then Result := TDataType(Items[I])
     else Result := nil;
@@ -408 +424 @@
 end;
 
-function TValue.SetString(Value: string): string;
-begin
-
+procedure TValue.SetString(Value: string);
+begin
+
+end;
+
+function TValue.GetStringSQL: string;
+begin
+  Result := '';
+end;
+
+procedure TValue.SetStringSQL(Value: string);
+begin
 end;
 
@@ -470 +495 @@
   NewRecord: TRecord;
   NewValue: TValue;
+  Index: Integer;
 begin
   Records.Clear;
@@ -478 +504 @@
     for F := 0 to Fields.Count - 1 do begin
       NewValue := TField(Fields[F]).GetValueClass.Create;
-      NewValue.SetString(TDictionaryStringString(DbRows[I]).Values[TField(Fields[F]).Name]);
-      NewRecord.Values.Add(NewValue);
+      Index := TDictionaryStringString(DbRows[I]).SearchKey(TField(Fields[F]).Name);
+      if Index <> -1 then begin
+        NewValue.SetString(TDictionaryStringString(DbRows[I]).Values[TField(Fields[F]).Name]);
+        NewRecord.Values.Add(NewValue);
+      end else begin
+        //NewValue.SetString('');
+        NewRecord.Values.Add(NewValue);
+      end;
     end;
     Records.Add(NewRecord);