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

Fix bug #1827494 import csv file field terminated by not working

Browse Source
This commit is contained in:
Ansgar Becker
2007-11-07 19:01:02 +00:00
parent 95125c1861
commit c8d8712a89
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/loaddata.pas
View File

@ -202,6 +202,14 @@ var
col : TStringList;
i : Integer;
reg : TRegistry;
// Correctly escape field-terminator, line-terminator or encloser
// and take care of already escaped characters like \t
// See bug 1827494
function escOptionString( str: String ): String;
begin
Result := '''' + StringReplace(str, '''', '\''', [rfReplaceAll]) + '''';
end;
begin
// Save settings
@ -239,19 +247,19 @@ begin
if (editFieldTerminator.Text <> '') or (editFieldEncloser.Text <> '') or (editFieldEscaper.Text <> '') then
query := query + 'FIELDS ';
if editFieldTerminator.Text <> '' then
query := query + 'TERMINATED BY ' + esc(editFieldTerminator.Text) + ' ';
query := query + 'TERMINATED BY ' + escOptionString(editFieldTerminator.Text) + ' ';
if editFieldEncloser.Text <> '' then
begin
if chkFieldsEnclosedOptionally.Checked then
query := query + 'OPTIONALLY ';
query := query + 'ENCLOSED BY ' + esc(editFieldEncloser.Text) + ' ';
query := query + 'ENCLOSED BY ' + escOptionString(editFieldEncloser.Text) + ' ';
end;
if editFieldEscaper.Text <> '' then
query := query + 'ESCAPED BY ' + esc(editFieldEscaper.Text) + ' ';
query := query + 'ESCAPED BY ' + escOptionString(editFieldEscaper.Text) + ' ';
// Lines:
if editLineTerminator.Text <> '' then
query := query + 'LINES TERMINATED BY ''' + editLineTerminator.Text + ''' ';
query := query + 'LINES TERMINATED BY ' + escOptionString(editLineTerminator.Text) + ' ';
if updownIgnoreLines.Position > 0 then
query := query + 'IGNORE ' + inttostr(updownIgnoreLines.Position) + ' LINES ';