Browse Source

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).
Instead of Field.SetData I use direct write to record buffer.
Bug #25648

git-svn-id: trunk@26611 -

lacak 11 years ago
parent
commit
1034503c5d
1 changed files with 13 additions and 12 deletions
  1. 13 12
      packages/fcl-db/src/base/bufdataset.pas

+ 13 - 12
packages/fcl-db/src/base/bufdataset.pas

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