From ceea302738392a36cbf5e325c2469137f009d968 Mon Sep 17 00:00:00 2001
From: lacak <lacak@idefix.freepascal.org>
Date: Tue, 27 Oct 2020 13:34:43 +0000
Subject: [PATCH] fcl-db: base: TShortintField + TByteField

git-svn-id: trunk@47221 -
(cherry picked from commit 54f85eec5676bd47db3d9d5a605f28611c589c0f)
---
 packages/fcl-db/src/base/db.pas     | 22 +++++++++++--
 packages/fcl-db/src/base/fields.inc | 51 +++++++++++++++++++++++------
 2 files changed, 61 insertions(+), 12 deletions(-)

diff --git a/packages/fcl-db/src/base/db.pas b/packages/fcl-db/src/base/db.pas
index 6bd330ab23..98c6a47980 100644
--- a/packages/fcl-db/src/base/db.pas
+++ b/packages/fcl-db/src/base/db.pas
@@ -604,6 +604,24 @@ type
   end;
   TIntegerField = Class(TLongintField);
 
+{ TShortintField }
+
+  TShortintField = class(TLongintField)
+  protected
+    function GetDataSize: Integer; override;
+  public
+    constructor Create(AOwner: TComponent); override;
+  end;
+
+{ TByteField }
+
+  TByteField = class(TLongintField)
+  protected
+    function GetDataSize: Integer; override;
+  public
+    constructor Create(AOwner: TComponent); override;
+  end;
+
 { TSmallintField }
 
   TSmallintField = class(TLongintField)
@@ -2297,8 +2315,8 @@ const
       { ftOraTimeStamp} nil,
       { ftOraInterval} nil,
       { ftLongWord} TLongWordField,
-      { ftShortint} {TShortintField}nil,
-      { ftByte} {TByteField}nil,
+      { ftShortint} TShortintField,
+      { ftByte} TByteField,
       { ftExtended} nil
     );
 
diff --git a/packages/fcl-db/src/base/fields.inc b/packages/fcl-db/src/base/fields.inc
index 57fc179b45..df8458b718 100644
--- a/packages/fcl-db/src/base/fields.inc
+++ b/packages/fcl-db/src/base/fields.inc
@@ -1587,7 +1587,7 @@ begin
   SetDataType(ftInteger);
   FMinRange:=Low(LongInt);
   FMaxRange:=High(LongInt);
-  FValidchars:=['+','-','0'..'9'];
+  FValidChars:=['+','-','0'..'9'];
 end;
 
 function TLongintField.GetAsFloat: Double;
@@ -1662,17 +1662,17 @@ end;
 function TLongintField.GetValue(var AValue: Longint): Boolean;
 
 var L : Longint;
-    P : PLongint;
 
 begin
   L:=0;
-  P:=@L;
-  Result:=GetData(P);
+  Result:=GetData(@L);
   If Result then
     Case DataType of
-      ftInteger,ftAutoInc  : AValue:=PLongint(P)^;
-      ftWord               : AValue:=PWord(P)^;
-      ftSmallint           : AValue:=PSmallint(P)^;
+      ftInteger,ftAutoInc  : AValue:=PLongint(@L)^;
+      ftSmallint           : AValue:=PSmallint(@L)^;
+      ftWord               : AValue:=PWord(@L)^;
+      ftShortint           : AValue:=PShortint(@L)^;
+      ftByte               : AValue:=PByte(@L)^;
     end;
 end;
 
@@ -1755,6 +1755,37 @@ begin
     RangeError(AValue,FMinRange,FMaxRange);
 end;
 
+{ TShortintField }
+
+function TShortintField.GetDataSize: Integer;
+begin
+  Result:=SizeOf(Shortint);
+end;
+
+constructor TShortintField.Create(AOwner: TComponent);
+begin
+  inherited Create(AOwner);
+  SetDataType(ftShortInt);
+  FMinRange:=Low(ShortInt);
+  FMaxRange:=High(ShortInt);
+end;
+
+{ TByteField }
+
+function TByteField.GetDataSize: Integer;
+begin
+  Result:=SizeOf(Byte);
+end;
+
+constructor TByteField.Create(AOwner: TComponent);
+begin
+  inherited Create(AOwner);
+  SetDataType(ftByte);
+  FMinRange:=Low(Byte);
+  FMaxRange:=High(Byte);
+  FValidChars:=['+','0'..'9'];
+end;
+
 { TSmallintField }
 
 function TSmallintField.GetDataSize: Integer;
@@ -1788,7 +1819,7 @@ begin
   SetDataType(ftWord);
   FMinRange:=0;
   FMaxRange:=65535;
-  FValidchars:=['+','0'..'9'];
+  FValidChars:=['+','0'..'9'];
 end;
 
 { TAutoIncField }
@@ -1819,7 +1850,7 @@ constructor TLongWordField.Create(AOwner: TComponent);
 begin
   Inherited Create(AOwner);
   SetDataType(ftLongWord);
-  FValidchars:=['+','-','0'..'9'];
+  FValidChars:=['+','0'..'9'];
 end;
 
 function TLongWordField.CheckRange(AValue: LargeInt): Boolean;
@@ -1955,7 +1986,7 @@ begin
   SetDataType(ftLargeint);
   FMinRange:=Low(Largeint);
   FMaxRange:=High(Largeint);
-  FValidchars:=['+','-','0'..'9'];
+  FValidChars:=['+','-','0'..'9'];
 end;
 
 function TLargeintField.GetAsFloat: Double;