opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2026-03-13 09:24:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix wrong comparison of table and org_table of PMYSQL_FIELD structure, again. Reverts d512e890e0. Closes #1854

Browse Source
This commit is contained in:
Ansgar Becker
2023-09-23 12:44:42 +02:00
parent e064570a8c
commit ee6eea0d20
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
source/dbconnection.pas
View File

@@ -9667,21 +9667,29 @@ end;
function TMySQLQuery.TableName(Column: Integer): String;
var
Field: PMYSQL_FIELD;
tbl: AnsiString;
FieldDb, FieldTable, FieldOrgTable: String;
Objects: TDBObjectList;
Obj: TDBObject;
begin
Field := FConnection.Lib.mysql_fetch_field_direct(FCurrentResults, Column);
//Connection.Log(lcDebug, FColumnNames[Column]+': org_table:'+Field.org_table+ ' table:'+Field.table);
{Connection.Log(lcDebug, FColumnNames[Column]+':'+
' org_table:'+Field.org_table+
' table:'+Field.table+
' table^=org_table^:'+(Field.table^ = Field.org_table^).ToInteger.ToString+
' table=org_table:'+(Field.table = Field.org_table).ToInteger.ToString
);}
FieldDb := FConnection.DecodeAPIString(Field.db);
FieldTable := FConnection.DecodeAPIString(Field.table);
FieldOrgTable := FConnection.DecodeAPIString(Field.org_table);
if Field.table <> Field.org_table then begin
if FieldTable <> FieldOrgTable then begin
// Probably a VIEW, in which case we rely on the first column's table name.
// TODO: This is unsafe when joining a view with a table/view.
if Field.db <> '' then begin
Objects := Connection.GetDBObjects(Connection.DecodeAPIString(Field.db));
if FieldDb <> '' then begin
Objects := Connection.GetDBObjects(FieldDb);
for Obj in Objects do begin
if (Obj.Name = Connection.DecodeAPIString(Field.table)) and (Obj.NodeType = lntView) then begin
tbl := Field.table;
if (Obj.Name = FieldTable) and (Obj.NodeType = lntView) then begin
Result := FieldTable;
break;
end;
end;
@@ -9689,10 +9697,8 @@ begin
end else begin
// Normal table column
// Note: this is empty on data tab TEXT columns with LEFT(..) clause
tbl := Field.org_table;
Result := FieldOrgTable;
end;
Result := Connection.DecodeAPIString(tbl);
end;