--- Merging r20756 into 'packages/fcl-db/src':

U    packages/fcl-db/src/base/bufdataset.pas
--- Merging r20853 into 'packages/fcl-db/src':
U    packages/fcl-db/src/base/db.pas
--- Merging r20866 into 'packages/fcl-db/src':
U    packages/fcl-db/src/base/dataset.inc
G    packages/fcl-db/src/base/db.pas
--- Merging r20881 into 'packages/fcl-db/src':
G    packages/fcl-db/src/base/dataset.inc
G    packages/fcl-db/src/base/db.pas

# revisions: 20756,20853,20866,20881
r20756 | marco | 2012-04-08 15:00:42 +0200 (Sun, 08 Apr 2012) | 2 lines
Changed paths:
   M /trunk/packages/fcl-db/src/base/bufdataset.pas

 * renamed foldstate to fsavedstate. Mantis #19542
r20853 | michael | 2012-04-12 09:10:31 +0200 (Thu, 12 Apr 2012) | 1 line
Changed paths:
   M /trunk/packages/fcl-db/src/base/db.pas

* Dataset.Modified should be read-only
r20866 | michael | 2012-04-14 16:49:01 +0200 (Sat, 14 Apr 2012) | 1 line
Changed paths:
   M /trunk/packages/fcl-db/src/base/dataset.inc
   M /trunk/packages/fcl-db/src/base/db.pas

* Applied cleanup patch from Luiz Americo
r20881 | michael | 2012-04-15 11:34:09 +0200 (Sun, 15 Apr 2012) | 1 line
Changed paths:
   M /trunk/packages/fcl-db/src/base/dataset.inc
   M /trunk/packages/fcl-db/src/base/db.pas

* Fix checkconstraints initialization and property setter (by Luiz Americo)

git-svn-id: branches/fixes_2_6@21377 -

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

@@ -408,7 +408,7 @@ type
     FFilterBuffer   : TRecordBuffer;
     FBRecordCount   : integer;
 
-    FOldState          : TDatasetState;
+    FSavedState     : TDatasetState;
     FPacketRecords  : integer;
     FRecordSize     : Integer;
     FNullmaskSize   : byte;
@@ -1820,7 +1820,7 @@ begin
   Result := False;
   if State = dsOldValue then
   begin
-    if FOldState = dsInsert then
+    if FSavedState = dsInsert then
       CurrBuff := nil // old values = null
     else if GetActiveRecordUpdateBuffer then
       CurrBuff := FUpdateBuffer[FCurrentUpdateBuffer].OldValuesBuffer
@@ -2916,7 +2916,7 @@ procedure TCustomBufDataset.DataEvent(Event: TDataEvent; Info: Ptrint);
 begin
   if Event = deUpdateState then
     // Save DataSet.State set by DataSet.SetState (filter out State set by DataSet.SetTempState)
-    FOldState := State;
+    FSavedState := State;
   inherited;
 end;
 

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

@@ -1311,11 +1311,6 @@ begin
   FFiltered := value;
 end;
 
-Procedure TDataset.SetFound(const Value: Boolean);
-
-begin
-  FFound := Value;
-end;
 
 Procedure TDataset.SetModified(Value: Boolean);
 
@@ -1325,7 +1320,7 @@ end;
 
 Procedure TDataset.SetName(const Value: TComponentName);
 
-function CheckName(FieldName: string): string;
+function CheckName(const FieldName: string): string;
 var i,j: integer;
 begin
   Result := FieldName;
@@ -2229,6 +2224,11 @@ begin
   //!! To be implemented
 end;
 
+procedure TDataSet.SetConstraints(Value: TCheckConstraints);
+begin
+  FConstraints.Assign(Value);
+end;
+
 Function TDataset.Getfieldcount : Longint;
 
 begin

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

@@ -1399,6 +1399,7 @@ type
     Function  GetField (Index : Longint) : TField;
     Procedure RegisterDataSource(ADatasource : TDataSource);
     Procedure RemoveField (Field : TField);
+    procedure SetConstraints(Value: TCheckConstraints);
     Procedure SetField (Index : Longint;Value : TField);
     Procedure ShiftBuffersForward;
     Procedure ShiftBuffersBackward;
@@ -1485,7 +1486,6 @@ type
     procedure SetFiltered(Value: Boolean); virtual;
     procedure SetFilterOptions(Value: TFilterOptions); virtual;
     procedure SetFilterText(const Value: string); virtual;
-    procedure SetFound(const Value: Boolean);
     procedure SetFieldValues(const fieldname: string; Value: Variant); virtual;
     procedure SetModified(Value: Boolean);
     procedure SetName(const Value: TComponentName); override;
@@ -1504,7 +1504,7 @@ type
     property CalcBuffer: TRecordBuffer read FCalcBuffer;
     property CalcFieldsSize: Longint read FCalcFieldsSize;
     property InternalCalcFields: Boolean read FInternalCalcFields;
-    property Constraints: TCheckConstraints read FConstraints write FConstraints;
+    property Constraints: TCheckConstraints read FConstraints write SetConstraints;
     function AllocRecordBuffer: TRecordBuffer; virtual;
     procedure FreeRecordBuffer(var Buffer: TRecordBuffer); virtual;
     procedure GetBookmarkData(Buffer: TRecordBuffer; Data: Pointer); virtual;
@@ -1623,7 +1623,7 @@ type
     property FieldDefs: TFieldDefs read FFieldDefs write SetFieldDefs;
 //    property Fields[Index: Longint]: TField read GetField write SetField;
     property Found: Boolean read FFound;
-    property Modified: Boolean read FModified write SetModified;
+    property Modified: Boolean read FModified;
     property IsUniDirectional: Boolean read FIsUniDirectional default False;
     property RecordCount: Longint read GetRecordCount;
     property RecNo: Longint read GetRecNo write SetRecNo;
@@ -2420,6 +2420,7 @@ Function TCheckConstraints.GetItem(Index : Longint) : TCheckConstraint;
 
 begin
   //!! To be implemented
+  Result := nil;
 end;
 
 
@@ -2434,6 +2435,7 @@ function TCheckConstraints.GetOwner: TPersistent;
 
 begin
   //!! To be implemented
+  Result := nil;
 end;
 
 
@@ -2441,6 +2443,7 @@ constructor TCheckConstraints.Create(AOwner: TPersistent);
 
 begin
   //!! To be implemented
+  inherited Create(TCheckConstraint);
 end;
 
 
@@ -2448,6 +2451,7 @@ function TCheckConstraints.Add: TCheckConstraint;
 
 begin
   //!! To be implemented
+  Result := nil;
 end;
 
 { TLookupList }