From e36183cbc8af0ccd9c09e9627ae74dab266233a6 Mon Sep 17 00:00:00 2001
From: marco <marco@freepascal.org>
Date: Fri, 30 Sep 2011 15:59:42 +0000
Subject: [PATCH]  * removing a temporary workaround in the db testsuite and a
 minor cleanup

git-svn-id: trunk@19305 -
---
 packages/fcl-db/src/base/fields.inc    | 5 +----
 packages/fcl-db/tests/testdbbasics.pas | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/packages/fcl-db/src/base/fields.inc b/packages/fcl-db/src/base/fields.inc
index c8500348c6..96aa7f4a50 100644
--- a/packages/fcl-db/src/base/fields.inc
+++ b/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;
diff --git a/packages/fcl-db/tests/testdbbasics.pas b/packages/fcl-db/tests/testdbbasics.pas
index 0c9206fd7d..d5c253e127 100644
--- a/packages/fcl-db/tests/testdbbasics.pas
+++ b/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