Browse Source

* removing a temporary workaround in the db testsuite and a minor cleanup

git-svn-id: trunk@19305 -
marco 14 years ago
parent
commit
e36183cbc8
2 changed files with 2 additions and 5 deletions
  1. 1 4
      packages/fcl-db/src/base/fields.inc
  2. 1 1
      packages/fcl-db/tests/testdbbasics.pas

+ 1 - 4
packages/fcl-db/src/base/fields.inc

@@ -1069,10 +1069,7 @@ end;
 function TStringField.GetDataSize: Integer;
 
 begin
-  if DataType=ftFixedChar then
-    Result:=Size+1
-  else
-    Result:=Size+1;
+  Result:=Size+1;
 end;
 
 function TStringField.GetDefaultWidth: Longint;

+ 1 - 1
packages/fcl-db/tests/testdbbasics.pas

@@ -2005,7 +2005,7 @@ var i          : byte;
     Fld        : TField;
 
 begin
-  TestfieldDefinition(ftFixedChar,10,ds,Fld);
+  TestfieldDefinition(ftFixedChar,11,ds,Fld);
   for i := 0 to testValuesCount-1 do
     begin
     if Fld.IsNull then // If the field is null, .AsString always returns an empty, non-padded string