Do not generate "_binary 0x" for empty blobs. Fixes issue #1610.

This commit is contained in:
Ansgar Becker
2010-01-19 00:55:04 +00:00
parent b1a7e7780f
commit 4b91154d6e

View File

@ -893,7 +893,7 @@ end;
procedure TfrmTableTools.DoExport(DBObj: TDBObject); procedure TfrmTableTools.DoExport(DBObj: TDBObject);
var var
ToFile, ToDir, ToDb, ToServer, IsLastRowInChunk, NeedsDBStructure: Boolean; ToFile, ToDir, ToDb, ToServer, IsLastRowInChunk, NeedsDBStructure: Boolean;
Struc, Header, FinalDbName, BaseInsert, Row, TargetDbAndObject: String; Struc, Header, FinalDbName, BaseInsert, Row, TargetDbAndObject, BinContent: String;
LogRow, MultiSQL: TStringList; LogRow, MultiSQL: TStringList;
i: Integer; i: Integer;
RowCount, MaxRowsInChunk, RowsInChunk, Limit, Offset, ResultCount: Int64; RowCount, MaxRowsInChunk, RowsInChunk, Limit, Offset, ResultCount: Int64;
@ -1128,7 +1128,13 @@ begin
Row := Row + 'NULL' Row := Row + 'NULL'
else case Data.DataType(i).Category of else case Data.DataType(i).Category of
dtcInteger, dtcReal: Row := Row + Data.Col(i); dtcInteger, dtcReal: Row := Row + Data.Col(i);
dtcBinary: Row := Row + '_binary 0x' + Data.BinColAsHex(i); dtcBinary: begin
BinContent := Data.BinColAsHex(i);
if Length(BinContent) > 0 then
Row := Row + '_binary 0x' + BinContent
else
Row := Row + esc('');
end;
else Row := Row + esc(Data.Col(i)); else Row := Row + esc(Data.Col(i));
end; end;
if i<Data.ColumnCount-1 then if i<Data.ColumnCount-1 then