paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-11-03 18:29:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

fcl-db: bufdataset: improve rev.26604. do not use Field.SetData in BlobStream constructor, because SetData also calls Validate and generates deFieldChange. Which is too early in constructor. These events must be generated after data will be written (in fact deFieldChange is called in BlobStream destructor and Validate is not called in current implementation).

Browse Source 
Instead of Field.SetData I use direct write to record buffer.
Bug #25648

git-svn-id: trunk@26611 -
This commit is contained in:
lacak 2014-01-29 09:22:37 +00:00
parent 2adfb6cdda
commit 1034503c5d
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2361,27 +2361,25 @@ procedure TCustomBufDataset.InternalPost;
Var ABuff : TRecordBuffer;
i : integer;
blobbuf : tbufblobfield;
bufblob : TBufBlobField;
NullMask : pbyte;
ABookmark : PBufBookmark;
begin
inherited InternalPost;
if assigned(FUpdateBlobBuffers) then for i:=0 to length(FUpdateBlobBuffers)-1 do
if assigned(FUpdateBlobBuffers[i]) and (FUpdateBlobBuffers[i]^.FieldNo>0) then
begin
blobbuf.BlobBuffer := FUpdateBlobBuffers[i];
ABuff := ActiveBuffer;
NullMask := PByte(ABuff);
bufblob.BlobBuffer := FUpdateBlobBuffers[i];
NullMask := PByte(ActiveBuffer);
inc(ABuff,FFieldBufPositions[blobbuf.BlobBuffer^.FieldNo-1]);
Move(blobbuf, ABuff^, GetFieldSize(FieldDefs[blobbuf.BlobBuffer^.FieldNo-1]));
if blobbuf.BlobBuffer^.Size = 0 then
SetFieldIsNull(NullMask, blobbuf.BlobBuffer^.FieldNo-1)
if bufblob.BlobBuffer^.Size = 0 then
SetFieldIsNull(NullMask, bufblob.BlobBuffer^.FieldNo-1)
else
unSetFieldIsNull(NullMask, blobbuf.BlobBuffer^.FieldNo-1);
unSetFieldIsNull(NullMask, bufblob.BlobBuffer^.FieldNo-1);
blobbuf.BlobBuffer^.FieldNo := -1;
bufblob.BlobBuffer^.FieldNo := -1;
end;
if State = dsInsert then
@ -2673,6 +2671,7 @@ end;
constructor TBufBlobStream.Create(Field: TBlobField; Mode: TBlobStreamMode);
var bufblob : TBufBlobField;
CurrBuff : TRecordBuffer;
begin
FField := Field;
@ -2699,7 +2698,9 @@ begin
FBlobBuffer^.OrgBufID := -1;
bufblob.BlobBuffer := FBlobBuffer;
// redirect pointer in current record buffer to new write blob buffer
Field.SetData(@bufblob);
CurrBuff := GetCurrentBuffer;
inc(CurrBuff, FDataSet.FFieldBufPositions[Field.FieldNo-1]);
Move(bufblob, CurrBuff^, FDataSet.GetFieldSize(FDataSet.FieldDefs[Field.FieldNo-1]));
FModified := True;
end;
end;