paweld/pas2js
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/pas2js.git synced 2025-08-27 21:10:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Fix for destroying nested datasets, patch by Henrique Werlang (issue 38749)

Browse Source
This commit is contained in:
michael 2021-04-13 07:07:07 +00:00
parent 58971dc918
commit 6ea1e42c5c
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
packages/fcl-db/db.pas
View File

@ -736,6 +736,8 @@ type
procedure Bind(Binding: Boolean); override; procedure Bind(Binding: Boolean); override;
public public
constructor Create(AOwner: TComponent); override; constructor Create(AOwner: TComponent); override;
destructor Destroy; override;
end; end;
{ TIndexDef } { TIndexDef }
@ -2371,6 +2373,9 @@ var
begin begin
Active:=False; Active:=False;
SetDataSetField(nil);
FFieldDefs.Free; FFieldDefs.Free;
FFieldList.Free; FFieldList.Free;
FNestedDataSets.Free; FNestedDataSets.Free;
@ -9120,14 +9125,18 @@ begin
if Assigned(DataSet) then if Assigned(DataSet) then
DataSet.NestedDataSets.Remove(FNestedDataSet); DataSet.NestedDataSets.Remove(FNestedDataSet);
end; end;
if Assigned(Value) then if Assigned(Value) then
begin
DataSet.NestedDataSets.Add(Value); DataSet.NestedDataSets.Add(Value);
FFields := Value.Fields;
end
else
FFields := nil;
FNestedDataSet := Value; FNestedDataSet := Value;
end; end;
destructor TDataSetField.Destroy;
begin
AssignNestedDataSet(nil);
inherited;
end;
end. end.