Skip to content

Commit 8098296

Browse files
committed
fix: forgotten files in c01a439
Refs #2250
1 parent 5560454 commit 8098296

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

source/loaddata.pas

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -527,17 +527,17 @@ procedure Tloaddataform.ClientParse(Sender: TObject);
527527
for i:=0 to chkListColumns.Items.Count-1 do
528528
begin
529529
if chkListColumns.Checked[i] then // column was already counted
530-
Inc(ValuesCounted); // increase number of counted columns
530+
Inc(ValuesCounted); // increase number of counted columns
531531
if ValuesCounted = ValueCount then // did we count all included columns up to the current column?
532-
Break;
532+
Break;
533533
Inc(ColumnIndex); // if all columns (until the current column) are checked, ColumnIndex is ValueCount-1, like before this patch
534534
end;
535535

536536
if Value <> 'NULL' then begin
537537
if chkLocalNumbers.Checked and (FColumns[ColumnIndex].DataType.Category in [dtcInteger, dtcReal]) then
538538
Value := UnformatNumber(Value)
539539
else
540-
Value := FConnection.EscapeString(Value);
540+
Value := FConnection.EscapeString(Value, FColumns[ColumnIndex].DataType);
541541
end;
542542
SQL := SQL + Value + ', ';
543543
end;

source/tabletools.pas

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2103,7 +2103,7 @@ procedure TfrmTableTools.DoExport(DBObj: TDBObject);
21032103
else
21042104
Row := Row + Quoter.EscapeString('');
21052105
end;
2106-
else Row := Row + Quoter.EscapeString(Data.Col(i));
2106+
else Row := Row + Quoter.EscapeString(Data.Col(i), Data.DataType(i));
21072107
end;
21082108
Row := Row + ', ';
21092109
end;

0 commit comments

Comments
 (0)