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

Fix detection of VARCHAR columns as BLOBs on 4.0 servers. Workaround for shared type FIELD_TYPE_* constants should only apply to (TINY|MEDIUM|LONG)TEXT columns. Fixes issue #1588.

Browse Source
This commit is contained in:
Ansgar Becker
2010-01-11 22:24:25 +00:00
parent 8abd2d0d76
commit df6397abc7
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/mysql_connection.pas
View File

@ -1178,6 +1178,7 @@ begin
FDatatypes[i] := Datatypes[Integer(dtSet)] FDatatypes[i] := Datatypes[Integer(dtSet)]
else for j:=Low(Datatypes) to High(Datatypes) do begin else for j:=Low(Datatypes) to High(Datatypes) do begin
if Field._type = Datatypes[j].NativeType then begin if Field._type = Datatypes[j].NativeType then begin
if Datatypes[j].Index in [dtTinytext, dtText, dtMediumtext, dtLongtext] then begin
// Text and Blob types share the same constants (see FIELD_TYPEs in mysql_api) // Text and Blob types share the same constants (see FIELD_TYPEs in mysql_api)
// Some function results return binary collation up to the latest versions. Work around // Some function results return binary collation up to the latest versions. Work around
// that by checking if this field is a real table field // that by checking if this field is a real table field
@ -1186,8 +1187,9 @@ begin
IsBinary := (Field.charsetnr = COLLATION_BINARY) and (Field.org_table <> '') IsBinary := (Field.charsetnr = COLLATION_BINARY) and (Field.org_table <> '')
else else
IsBinary := (Field.flags and BINARY_FLAG) = BINARY_FLAG; IsBinary := (Field.flags and BINARY_FLAG) = BINARY_FLAG;
if IsBinary and (Datatypes[j].Category = dtcText) then if IsBinary then
continue; continue;
end;
FDatatypes[i] := Datatypes[j]; FDatatypes[i] := Datatypes[j];
break; break;
end; end;