+ implemented TStringField.FixedChar

 + Enabled check for FixedChar in TParam.AssignFieldValue
 + added test for the above
 + added test for TDataset.Close

git-svn-id: trunk@3548 -

fcl/db/db.pp

@@ -386,6 +386,8 @@ type
 { TStringField }
 
   TStringField = class(TField)
+  private
+    FFixedChar : boolean;
   protected
     class procedure CheckTypeSize(AValue: Longint); override;
     function GetAsBoolean: Boolean; override;
@@ -406,6 +408,7 @@ type
     procedure SetVarValue(const AValue: Variant); override;
   public
     constructor Create(AOwner: TComponent); override;
+    property FixedChar : Boolean read FFixedChar write FFixedChar;
   published
     property Size default 20;
   end;

fcl/db/dsparams.inc

@@ -765,7 +765,7 @@ begin
   If Assigned(Field) then
     begin
     // Need TField.FixedChar property.
-    if (Field.DataType = ftString) {and TStringField(Field).FixedChar} then
+    if (Field.DataType = ftString) and TStringField(Field).FixedChar then
       DataType:=ftFixedChar
     else if (Field.DataType = ftMemo) and (Field.Size > 255) then
       DataType:=ftString

fcl/db/fields.inc

@@ -960,6 +960,7 @@ constructor TStringField.Create(AOwner: TComponent);
 begin
   Inherited Create(AOwner);
   SetDataType(ftString);
+  FFixedChar := False;
   Size:=20;
 end;
 

fcl/dbtests/testdbbasics.pas

@@ -23,6 +23,9 @@ type
     procedure TearDown; override;
     procedure RunTest; override;
   published
+    procedure TestDoubleClose;
+    procedure TestAssignFieldftString;
+    procedure TestAssignFieldftFixedChar;
     procedure TestSelectQueryBasics;
     procedure TestPostOnlyInEditState;
     procedure TestMove;                    // bug 5048
@@ -268,6 +271,53 @@ begin
 //  inherited RunTest;
 end;
 
+procedure TTestDBBasics.TestDoubleClose;
+begin
+  with DBConnector.GetNDataset(1) do
+    begin
+    close;
+    close;
+    open;
+    close;
+    close;
+    end;
+end;
+
+procedure TTestDBBasics.TestAssignFieldftString;
+var AParam : TParam;
+    AField : TField;
+begin
+  AParam := TParam.Create(nil);
+
+  with DBConnector.GetNDataset(1) do
+    begin
+    open;
+    AField := fieldbyname('name');
+    (AField as tstringfield).FixedChar := true;
+    AParam.AssignField(AField);
+    AssertTrue(ftFixedChar=AParam.DataType);
+    close;
+    end;
+  AParam.Free;
+end;
+
+procedure TTestDBBasics.TestAssignFieldftFixedChar;
+var AParam : TParam;
+    AField : TField;
+begin
+  AParam := TParam.Create(nil);
+  with DBConnector.GetNDataset(1) do
+    begin
+    open;
+    AField := fieldbyname('name');
+    (AField as tstringfield).FixedChar := true;
+    AParam.AssignField(AField);
+    AssertTrue(ftFixedChar=AParam.DataType);
+    close;
+    end;
+  AParam.Free;
+end;
+
 { TSQLTestSetup }
 procedure TDBBasicsTestSetup.OneTimeSetup;
 begin