Changeset 14 for trunk/UDataTypes.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/UDataTypes.pas (modified) (15 diffs)

trunk/UDataTypes.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, UDatabase, Contnrs;
+  Classes, SysUtils, UDatabase, Contnrs, USqlDatabase;
 
 type
@@ -15 +15 @@
     procedure Assign(Source: TValue); override;
     function GetString: string; override;
-    function SetString(Value: string): string; override;
+    procedure SetString(Value: string); override;
   end;
 
@@ -24 +24 @@
     procedure Assign(Source: TValue); override;
     function GetString: string; override;
-    function SetString(Value: string): string; override;
+    procedure SetString(Value: string); override;
   end;
 
@@ -33 +33 @@
     procedure Assign(Source: TValue); override;
     function GetString: string; override;
-    function SetString(Value: string): string; override;
+    procedure SetString(Value: string); override;
+  end;
+
+  { TValueDate }
+
+  TValueDate = class(TValueDateTime)
+  end;
+
+  { TValueTime }
+
+  TValueTime = class(TValueDateTime)
   end;
 
@@ -42 +52 @@
     procedure Assign(Source: TValue); override;
     function GetString: string; override;
-    function SetString(Value: string): string; override;
+    procedure SetString(Value: string); override;
   end;
 
@@ -51 +61 @@
     procedure Assign(Source: TValue); override;
     function GetString: string; override;
-    function SetString(Value: string): string; override;
+    procedure SetString(Value: string); override;
+  end;
+
+  { TValueReference }
+
+  TValueReference = class(TValueInteger)
   end;
 
@@ -94 +109 @@
     Min: TDate;
     Max: TDate;
-  end;
+    procedure Assign(Source: TFieldTypeSpecific); override;
+    function GetValueClass: TValueClass; override;
+  end;
+
+  { TFieldTime }
 
   TFieldTime = class(TFieldTypeSpecific)
     Min: TTime;
     Max: TTime;
+    procedure Assign(Source: TFieldTypeSpecific); override;
+    function GetValueClass: TValueClass; override;
   end;
 
@@ -106 +127 @@
   end;
 
+  { TFieldReference }
+
+  TFieldReference = class(TFieldTypeSpecific)
+    TableName: string;
+    Id: Integer;
+    procedure Assign(Source: TFieldTypeSpecific); override;
+    function GetValueClass: TValueClass; override;
+  end;
+
   { TFieldBoolean }
 
@@ -120 +150 @@
 implementation
 
+{ TFieldReference }
+
+procedure TFieldReference.Assign(Source: TFieldTypeSpecific);
+begin
+  if Source is TFieldReference then begin
+    Id := TFieldReference(Source).Id;
+    TableName := TFieldReference(Source).TableName;
+  end;
+end;
+
+function TFieldReference.GetValueClass: TValueClass;
+begin
+  Result := TValueReference;
+end;
+
+{ TFieldTime }
+
+procedure TFieldTime.Assign(Source: TFieldTypeSpecific);
+begin
+  if Source is TFieldTime then begin
+    Min := TFieldTime(Source).Min;
+    Max := TFieldTime(Source).Max;
+  end;
+end;
+
+function TFieldTime.GetValueClass: TValueClass;
+begin
+  Result := TValueTime;
+end;
+
+{ TFieldDate }
+
+procedure TFieldDate.Assign(Source: TFieldTypeSpecific);
+begin
+  if Source is TFieldDate then begin
+    Min := TFieldDate(Source).Min;
+    Max := TFieldDate(Source).Max;
+  end;
+end;
+
+function TFieldDate.GetValueClass: TValueClass;
+begin
+  Result := TValueDate;
+end;
+
 
 { TValueFloat }
@@ -134 +209 @@
 end;
 
-function TValueFloat.SetString(Value: string): string;
+procedure TValueFloat.SetString(Value: string);
 begin
   Self.Value := StrToFloat(Value);
@@ -198 +273 @@
 end;
 
-function TValueBoolean.SetString(Value: string): string;
+procedure TValueBoolean.SetString(Value: string);
 begin
   Self.Value := StrToBool(Value);
@@ -216 +291 @@
 end;
 
-function TValueInteger.SetString(Value: string): string;
-begin
-  Self.Value := StrToInt(Value);
+procedure TValueInteger.SetString(Value: string);
+var
+  IntVal: Integer;
+begin
+  if TryStrToInt(Value, IntVal) then Self.Value := IntVal;
 end;
 
@@ -225 +302 @@
 procedure TFieldDateTime.Assign(Source: TFieldTypeSpecific);
 begin
-  if Source is TFieldDate then begin
-    Min := TFieldDate(Source).Min;
-    Max := TFieldDate(Source).Max;
+  if Source is TFieldDateTime then begin
+    Min := TFieldDateTime(Source).Min;
+    Max := TFieldDateTime(Source).Max;
   end;
 end;
@@ -249 +326 @@
 end;
 
-function TValueDateTime.SetString(Value: string): string;
-begin
-  Self.Value := StrToDateTime(Value);
+procedure TValueDateTime.SetString(Value: string);
+begin
+  Self.Value := SQLToDateTime(Value);
+//  if not TryStrToDateTime(Value, Self.Value) then begin
+//  end;
 end;
 
@@ -267 +346 @@
 end;
 
-function TValueString.SetString(Value: string): string;
+procedure TValueString.SetString(Value: string);
 begin
   Self.Value := Value;