paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-06 00:47:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Bind fields when needed in InternalOpen. Fixes issue #40450

Browse Source
This commit is contained in:
Michaël Van Canneyt 2023-10-12 08:32:59 +02:00
parent 5307ef07c4
commit ac5b96a0c9
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
packages/fcl-db/src/base/bufdataset.pas
View File

@ -1407,6 +1407,7 @@ var
i : integer;
aPacketReader : TDataPacketReader;
aStream : TFileStream;
doBind : boolean;
begin
aPacketReader:=Nil;
@ -1421,8 +1422,23 @@ begin
aPacketReader := GetPacketReader(dfDefault, aStream);
end;
IntLoadFieldDefsFromPacket(aPacketReader);
end
else
begin
// Issue 40450: At design time, create a dataset, set to active.
// At runtime, open is called, but fields are not bound (this happens in createdataset)
// So we check for unbound fields and bind them if needed.
// Do not call bindfields unconditonally, because descendants may have called it.
I:=0;
DoBind:=False;
While (Not DoBind) and (I<Fields.Count) do
begin
DoBind:=Fields[i].FieldNo=0;
Inc(I);
end;
if DoBind then
BindFields(True);
end;
// This checks if the dataset is actually created (by calling CreateDataset,
// or reading from a stream in some other way implemented by a descendent)
// If there are less fields than FieldDefs we know for sure that the dataset
@ -1436,7 +1452,6 @@ begin
// if Fields.Count<FieldDefs.Count then
if (Fields.Count = 0) or (FieldDefs.Count=0) then
DatabaseError(SErrNoDataset);
// search for autoinc field
FAutoIncField:=nil;
if FAutoIncValue>-1 then
@ -3676,17 +3691,15 @@ var
begin
CheckInactive;
if ((Fields.Count=0) and (FieldDefs.Count=0)) then
raise Exception.Create(SErrNoFieldsDefined);
if ((Fields.Count=0) or (FieldDefs.Count=0)) then
begin
if (FieldDefs.Count>0) then
CreateFields
else if (Fields.Count>0) then
begin
InitFieldDefsFromFields;
BindFields(True);
end
else
raise Exception.Create(SErrNoFieldsDefined);
BindFields(True);
end;
if FAutoIncValue<0 then
FAutoIncValue:=1;