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

Fixing #327

Browse Source
This commit is contained in:
nummacway
2020-04-15 15:57:50 +02:00
committed by Ansgar Becker
parent 91b012a996
commit dc054cc481
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/loaddata.pas
View File

@ -460,6 +460,8 @@ var
var var
i: Integer; i: Integer;
LowPrio: String; LowPrio: String;
ColumnIndex: Integer;
ValuesCounted: Integer;
begin begin
Inc(ValueCount); Inc(ValueCount);
if ValueCount <= ColumnCount then begin if ValueCount <= ColumnCount then begin
@ -484,8 +486,20 @@ var
SetLength(SQL, Length(SQL)-2); SetLength(SQL, Length(SQL)-2);
SQL := SQL + ') VALUES ('; SQL := SQL + ') VALUES (';
end; end;
// Bugfix for #327: Determine column to retrieve the type from by counting the number of columns before the current one INCLUDING the omitted ones
ColumnIndex := 0;
ValuesCounted := 0;
for i:=0 to chkListColumns.Items.Count-1 do
begin
if chkListColumns.Checked[i] then // column was already counted
Inc(ValuesCounted); // increase number of counted columns
if ValuesCounted = ValueCount then // did we count all included columns up to the current column?
Break;
Inc(ColumnIndex); // if all columns (until the current column) are checked, ColumnIndex is ValueCount-1, like before this patch
end;
if Value <> 'NULL' then begin if Value <> 'NULL' then begin
if chkLocalNumbers.Checked and (Columns[ValueCount-1].DataType.Category in [dtcInteger, dtcReal]) then if chkLocalNumbers.Checked and (Columns[ColumnIndex].DataType.Category in [dtcInteger, dtcReal]) then
Value := UnformatNumber(Value) Value := UnformatNumber(Value)
else else
Value := esc(Value); Value := esc(Value);