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

Do not truncate contents of column contents if it contains NUL chars. Fixes issue #1731.

Browse Source
This commit is contained in:
Ansgar Becker
2010-02-27 15:10:43 +00:00
parent 243b9bbe17
commit 15d698dfdb
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
source/mysql_connection.pas
View File

@ -3,7 +3,7 @@ unit mysql_connection;
interface interface
uses uses
Classes, SysUtils, windows, mysql_api, mysql_structures, SynRegExpr, Contnrs, Generics.Collections, DateUtils; Classes, SysUtils, windows, mysql_api, mysql_structures, SynRegExpr, Contnrs, Generics.Collections, DateUtils, Types;
type type
{ TDBObjectList and friends } { TDBObjectList and friends }
@ -172,6 +172,7 @@ type
FRecNo, FRecNo,
FRecordCount: Int64; FRecordCount: Int64;
FColumnNames: TStringList; FColumnNames: TStringList;
FColumnLengths: TIntegerDynArray;
FLastResult: PMYSQL_RES; FLastResult: PMYSQL_RES;
FCurrentRow: PMYSQL_ROW; FCurrentRow: PMYSQL_ROW;
FEof: Boolean; FEof: Boolean;
@ -1166,6 +1167,7 @@ begin
if HasResult then begin if HasResult then begin
NumFields := mysql_num_fields(FLastResult); NumFields := mysql_num_fields(FLastResult);
SetLength(FDatatypes, NumFields); SetLength(FDatatypes, NumFields);
SetLength(FColumnLengths, NumFields);
FColumnNames.Clear; FColumnNames.Clear;
for i:=0 to NumFields-1 do begin for i:=0 to NumFields-1 do begin
Field := mysql_fetch_field_direct(FLastResult, i); Field := mysql_fetch_field_direct(FLastResult, i);
@ -1196,8 +1198,10 @@ begin
end; end;
end; end;
RecNo := 0; RecNo := 0;
end else end else begin
SetLength(FDatatypes, 0); SetLength(FDatatypes, 0);
SetLength(FColumnLengths, 0);
end;
end; end;
@ -1214,6 +1218,9 @@ end;
procedure TMySQLQuery.SetRecNo(Value: Int64); procedure TMySQLQuery.SetRecNo(Value: Int64);
var
LengthPointer: PLongInt;
i: Integer;
begin begin
if Value >= RecordCount then begin if Value >= RecordCount then begin
FRecNo := RecordCount; FRecNo := RecordCount;
@ -1224,6 +1231,10 @@ begin
FRecNo := Value; FRecNo := Value;
FEof := False; FEof := False;
FCurrentRow := mysql_fetch_row(FLastResult); FCurrentRow := mysql_fetch_row(FLastResult);
// Remember length of column contents. Important for Col() so contents of cells with #0 chars are not cut off
LengthPointer := mysql_fetch_lengths(FLastResult);
for i:=Low(FColumnLengths) to High(FColumnLengths) do
FColumnLengths[i] := PInteger(Integer(LengthPointer) + i * SizeOf(Integer))^;
end; end;
end; end;
@ -1235,12 +1246,15 @@ end;
function TMySQLQuery.Col(Column: Integer; IgnoreErrors: Boolean=False): String; function TMySQLQuery.Col(Column: Integer; IgnoreErrors: Boolean=False): String;
var
AnsiStr: AnsiString;
begin begin
if (Column > -1) and (Column < ColumnCount) then begin if (Column > -1) and (Column < ColumnCount) then begin
SetString(AnsiStr, FCurrentRow[Column], FColumnLengths[Column]);
if Connection.IsUnicode then if Connection.IsUnicode then
Result := UTF8ToString(FCurrentRow[Column]) Result := UTF8ToString(AnsiStr)
else else
Result := String(FCurrentRow[Column]); Result := String(AnsiStr);
end else if not IgnoreErrors then end else if not IgnoreErrors then
Raise Exception.CreateFmt('Column #%d not available. Query returned %d columns and %d rows.', [Column, ColumnCount, RecordCount]); Raise Exception.CreateFmt('Column #%d not available. Query returned %d columns and %d rows.', [Column, ColumnCount, RecordCount]);
end; end;