fcl-db: implement setter and getter for TStringField.AsLargeInt

git-svn-id: trunk@29624 -

packages/fcl-db/src/base/db.pas

@@ -22,7 +22,7 @@ unit db;
 
 interface
 
-uses Classes,Sysutils,Variants,FmtBCD,MaskUtils;
+uses Classes,SysUtils,Variants,FmtBCD,MaskUtils;
 
 const
 
@@ -328,7 +328,7 @@ type
     function GetAsBoolean: Boolean; virtual;
     function GetAsBytes: TBytes; virtual;
     function GetAsCurrency: Currency; virtual;
-    function GetAsLargeInt: LargeInt; virtual;
+    function GetAsLargeInt: Largeint; virtual;
     function GetAsDateTime: TDateTime; virtual;
     function GetAsFloat: Double; virtual;
     function GetAsLongint: Longint; virtual;
@@ -359,7 +359,7 @@ type
     procedure SetAsFloat(AValue: Double); virtual;
     procedure SetAsLongint(AValue: Longint); virtual;
     procedure SetAsInteger(AValue: Longint); virtual;
-    procedure SetAsLargeint(AValue: Largeint); virtual;
+    procedure SetAsLargeInt(AValue: Largeint); virtual;
     procedure SetAsVariant(const AValue: variant); virtual;
     procedure SetAsString(const AValue: string); virtual;
     procedure SetAsWideString(const AValue: WideString); virtual;
@@ -462,6 +462,7 @@ type
     function GetAsDateTime: TDateTime; override;
     function GetAsFloat: Double; override;
     function GetAsInteger: Longint; override;
+    function GetAsLargeInt: Largeint; override;
     function GetAsString: string; override;
     function GetAsVariant: variant; override;
     function GetDataSize: Integer; override;
@@ -472,6 +473,7 @@ type
     procedure SetAsDateTime(AValue: TDateTime); override;
     procedure SetAsFloat(AValue: Double); override;
     procedure SetAsInteger(AValue: Longint); override;
+    procedure SetAsLargeInt(AValue: Largeint); override;
     procedure SetAsString(const AValue: string); override;
     procedure SetVarValue(const AValue: Variant); override;
   public
@@ -552,8 +554,8 @@ type
     procedure SetAsInteger(AValue: Longint); override;
     procedure SetAsString(const AValue: string); override;
     procedure SetVarValue(const AValue: Variant); override;
-    function GetAsLargeint: Largeint; override;
-    procedure SetAsLargeint(AValue: Largeint); override;
+    function GetAsLargeInt: Largeint; override;
+    procedure SetAsLargeInt(AValue: Largeint); override;
   public
     constructor Create(AOwner: TComponent); override;
     Function CheckRange(AValue : Longint) : Boolean;
@@ -577,7 +579,7 @@ type
   protected
     function GetAsFloat: Double; override;
     function GetAsInteger: Longint; override;
-    function GetAsLargeint: Largeint; override;
+    function GetAsLargeInt: Largeint; override;
     function GetAsString: string; override;
     function GetAsVariant: variant; override;
     function GetDataSize: Integer; override;
@@ -585,13 +587,13 @@ type
     function GetValue(var AValue: Largeint): Boolean;
     procedure SetAsFloat(AValue: Double); override;
     procedure SetAsInteger(AValue: Longint); override;
-    procedure SetAsLargeint(AValue: Largeint); override;
+    procedure SetAsLargeInt(AValue: Largeint); override;
     procedure SetAsString(const AValue: string); override;
     procedure SetVarValue(const AValue: Variant); override;
   public
     constructor Create(AOwner: TComponent); override;
-    Function CheckRange(AValue : largeint) : Boolean;
-    property Value: Largeint read GetAsLargeint write SetAsLargeint;
+    Function CheckRange(AValue : Largeint) : Boolean;
+    property Value: Largeint read GetAsLargeInt write SetAsLargeInt;
   published
     property MaxValue: Largeint read FMaxValue write SetMaxValue default 0;
     property MinValue: Largeint read FMinValue write SetMinValue default 0;

packages/fcl-db/src/base/fields.inc

@@ -814,7 +814,7 @@ begin
   raise AccessError(SInteger);
 end;
 
-procedure TField.SetAsLargeint(AValue: Largeint);
+procedure TField.SetAsLargeInt(AValue: Largeint);
 begin
   Raise AccessError(SLargeInt);
 end;
@@ -1068,6 +1068,12 @@ begin
   Result:=StrToInt(GetAsString);
 end;
 
+function TStringField.GetAsLargeInt: Largeint;
+
+begin
+  Result:=StrToInt64(GetAsString);
+end;
+
 function TStringField.GetAsString: string;
 
 begin
@@ -1169,7 +1175,13 @@ end;
 procedure TStringField.SetAsInteger(AValue: Longint);
 
 begin
-  SetAsString(intToStr(AValue));
+  SetAsString(IntToStr(AValue));
+end;
+
+procedure TStringField.SetAsLargeInt(AValue: Largeint);
+
+begin
+  SetAsString(IntToStr(AValue));
 end;
 
 procedure TStringField.SetAsString(const AValue: string);
@@ -1385,7 +1397,7 @@ begin
   Result:=GetAsInteger;
 end;
 
-function TLongintField.GetAsLargeint: Largeint;
+function TLongintField.GetAsLargeInt: Largeint;
 begin
   Result:=GetAsInteger;
 end;
@@ -1459,7 +1471,7 @@ begin
     end;
 end;
 
-procedure TLongintField.SetAsLargeint(AValue: Largeint);
+procedure TLongintField.SetAsLargeInt(AValue: Largeint);
 begin
   if (AValue>=FMinRange) and (AValue<=FMaxRange) then
     SetAsInteger(AValue)
@@ -1552,10 +1564,10 @@ end;
 function TLargeintField.GetAsFloat: Double;
 
 begin
-  Result:=GetAsLargeint;
+  Result:=GetAsLargeInt;
 end;
 
-function TLargeintField.GetAsLargeint: Largeint;
+function TLargeintField.GetAsLargeInt: Largeint;
 
 begin
   If Not GetValue(Result) then
@@ -1576,7 +1588,7 @@ end;
 function TLargeintField.GetAsInteger: Longint;
 
 begin
-  Result:=GetAsLargeint;
+  Result:=GetAsLargeInt;
 end;
 
 function TLargeintField.GetAsString: string;
@@ -1598,7 +1610,7 @@ end;
 
 procedure TLargeintField.GetText(var AText: string; ADisplayText: Boolean);
 
-var l : largeint;
+var l : Largeint;
     fmt : string;
 
 begin
@@ -1616,9 +1628,6 @@ end;
 
 function TLargeintField.GetValue(var AValue: Largeint): Boolean;
 
-type
-  PLargeint = ^Largeint;
-
 var P : PLargeint;
 
 begin
@@ -1629,10 +1638,10 @@ end;
 procedure TLargeintField.SetAsFloat(AValue: Double);
 
 begin
-  SetAsLargeint(Round(AValue));
+  SetAsLargeInt(Round(AValue));
 end;
 
-procedure TLargeintField.SetAsLargeint(AValue: Largeint);
+procedure TLargeintField.SetAsLargeInt(AValue: Largeint);
 
 begin
   If CheckRange(AValue) then
@@ -1644,13 +1653,13 @@ end;
 procedure TLargeintField.SetAsInteger(AValue: Longint);
 
 begin
-  SetAsLargeint(AValue);
+  SetAsLargeInt(AValue);
 end;
 
 procedure TLargeintField.SetAsString(const AValue: string);
 
-var L     : largeint;
-    code  : longint;
+var L     : Largeint;
+    code  : Longint;
 
 begin
   If length(AValue)=0 then
@@ -1659,7 +1668,7 @@ begin
     begin
     Val(AValue,L,Code);
     If Code=0 then
-      SetAsLargeint(L)
+      SetAsLargeInt(L)
     else
       DatabaseErrorFmt(SNotAnInteger,[AValue]);
     end;
@@ -1667,10 +1676,10 @@ end;
 
 procedure TLargeintField.SetVarValue(const AValue: Variant);
 begin
-  SetAsLargeint(AValue);
+  SetAsLargeInt(AValue);
 end;
 
-Function TLargeintField.CheckRange(AValue : largeint) : Boolean;
+Function TLargeintField.CheckRange(AValue : Largeint) : Boolean;
 
 begin
   if (FMinValue<>0) or (FMaxValue<>0) then
@@ -1679,7 +1688,7 @@ begin
     Result := (AValue>=FMinRange) and (AValue<=FMaxRange);
 end;
 
-Procedure TLargeintField.SetMaxValue (AValue : largeint);
+Procedure TLargeintField.SetMaxValue (AValue : Largeint);
 
 begin
   If (AValue>=FMinRange) and (AValue<=FMaxRange) then
@@ -1688,7 +1697,7 @@ begin
     RangeError(AValue,FMinRange,FMaxRange);
 end;
 
-Procedure TLargeintField.SetMinValue (AValue : largeint);
+Procedure TLargeintField.SetMinValue (AValue : Largeint);
 
 begin
   If (AValue>=FMinRange) and (AValue<=FMaxRange) then