Skip to content

Commit 8f34f5f

Browse files
fix: fetch MS SQL binary column values via TBlobField stream in GetColBinData
Fixes wrong hex display of varbinary/binary values in the data grid, caused by the string conversion in TSqlSrvQuery.Col corrupting raw bytes. Refs #1980 Co-authored-by: ansgarbecker <ansgarbecker@users.noreply.github.com>
1 parent 2b64345 commit 8f34f5f

1 file changed

Lines changed: 22 additions & 0 deletions

File tree

‎source/dbconnection.pas‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -939,6 +939,7 @@ TSqlSrvQuery = class(TDBQuery)
939939
constructor Create(AOwner: TComponent); override;
940940
destructor Destroy; override;
941941
procedure Execute(AddResult: Boolean=False; UseRawResult: Integer=-1); override;
942+
function GetColBinData(Column: Integer; var baData: TBytes): Boolean; override;
942943
function Col(Column: Integer; IgnoreErrors: Boolean=False): String; overload; override;
943944
function ColIsPrimaryKeyPart(Column: Integer): Boolean; override;
944945
function ColIsUniqueKeyPart(Column: Integer): Boolean; override;
@@ -8974,6 +8975,27 @@ function TMySQLQuery.Col(Column: Integer; IgnoreErrors: Boolean=False): String;
89748975
end;
89758976

89768977
{$IFDEF HASMSSQL}
8978+
function TSqlSrvQuery.GetColBinData(Column: Integer; var baData: TBytes): Boolean;
8979+
var
8980+
Stream: TStream;
8981+
begin
8982+
Result := False;
8983+
if ColumnExists(Column) and (not IsNull(Column)) then begin
8984+
if FCurrentResults.Fields[Column] is TBlobField then begin
8985+
Stream := TBlobField(FCurrentResults.Fields[Column]).DataStream;
8986+
try
8987+
SetLength(baData, Stream.Size);
8988+
if Stream.Size > 0 then
8989+
Stream.ReadBuffer(baData[0], Stream.Size);
8990+
Result := True;
8991+
finally
8992+
Stream.Free;
8993+
end;
8994+
end else
8995+
Raise EDbError.Create(SNotImplemented);
8996+
end;
8997+
end;
8998+
89778999
function TSqlSrvQuery.Col(Column: Integer; IgnoreErrors: Boolean=False): String;
89789000
begin
89799001
if ColumnExists(Column) then begin

0 commit comments

Comments
 (0)