opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2025-08-26 03:01:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Do not write "NULL" string in grid export formats other than SQL INSERTs/REPLACEs. Fixes issue #2733.

Browse Source
This commit is contained in:
Ansgar Becker
2012-02-28 22:26:14 +00:00
parent 867d656f0b
commit 4ef984b52d
1 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/exportgrid.pas
View File

@ -577,9 +577,6 @@ begin
case ExportFormat of case ExportFormat of
efHTML: begin efHTML: begin
// Handle nulls.
if GridData.IsNull(Col) then
Data := TEXT_NULL;
// Escape HTML control characters in data. // Escape HTML control characters in data.
Data := htmlentities(Data); Data := htmlentities(Data);
tmp := tmp + ' <td class="col' + IntToStr(Col) + '">' + Data + '</td>' + CRLF; tmp := tmp + ' <td class="col' + IntToStr(Col) + '">' + Data + '</td>' + CRLF;
@ -588,13 +585,7 @@ begin
efExcel, efCSV, efLaTeX, efWiki: begin efExcel, efCSV, efLaTeX, efWiki: begin
// Escape encloser characters inside data per de-facto CSV. // Escape encloser characters inside data per de-facto CSV.
Data := StringReplace(Data, Encloser, Encloser+Encloser, [rfReplaceAll]); Data := StringReplace(Data, Encloser, Encloser+Encloser, [rfReplaceAll]);
// Special handling for NULL (MySQL-ism, not de-facto CSV: unquote value) Data := Encloser + Data + Encloser;
if GridData.IsNull(Col) then begin
Data := 'NULL';
if ExportFormat = efWiki then
Data := '_'+Data+'_';
end else
Data := Encloser + Data + Encloser;
tmp := tmp + Data + Separator; tmp := tmp + Data + Separator;
end; end;