ViewVC Help
View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing
root/public/ibx/trunk/fbintf/client/2.5/FB25Blob.pas
(Generate patch)

Comparing ibx/trunk/fbintf/client/2.5/FB25Blob.pas (file contents):
Revision 46 by tony, Tue Dec 6 10:33:46 2016 UTC vs.
Revision 47 by tony, Mon Jan 9 15:31:51 2017 UTC

# Line 132 | Line 132 | var
132   begin
133    if FHasFullMetaData then Exit;
134  
135  FCharSetID := 0;
135    FSegmentSize := 80;
137  FUnconfirmedCharacterSet := false;
136    if (GetColumnName <> '') and (GetRelationName <> '') then
137    begin
138      with Firebird25ClientAPI do
139        Call(isc_blob_lookup_desc(StatusVector,@(FAttachment.Handle),
140                                              @(FTransaction.Handle),
141                  PChar(AnsiUpperCase(GetRelationName)),PChar(AnsiUpperCase(GetColumnName)),@BlobDesc,@Global));
142 <    FCharSetID := BlobDesc.blob_desc_charset;
142 >    if FUnconfirmedCharacterSet then
143 >      FCharSetID := BlobDesc.blob_desc_charset;
144      FSubType := BlobDesc.blob_desc_subtype;
145      FSegmentSize := BlobDesc.blob_desc_segment_size ;
146 <  end
148 <  else
149 <    FUnconfirmedCharacterSet := true;
146 >  end;
147  
148 <  if (FCharSetID > 1) and FAttachment.HasDefaultCharSet then
148 >  if FUnconfirmedCharacterSet and (FCharSetID > 1) and FAttachment.HasDefaultCharSet then
149    begin
150      FCharSetID := FAttachment.CharSetID;
151      FUnconfirmedCharacterSet := false;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines