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

Make code for setting icon indexes at key-columns more compact and stable: Do the loop over the ListItems *outside* the IFs, not the IFs first and for each IF a redundant loop.

Browse Source 
Fixes a bug in applying the iconindex for a column which is part of a fulltext key (was always shown as normal index).
This commit is contained in:
Ansgar Becker
2007-08-03 18:42:11 +00:00
parent de5d74f295
commit 79c7234f67
1 changed files with 24 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
source/childwin.pas
View File

@@ -2205,63 +2205,36 @@ begin
ds := GetResults( 'SHOW KEYS FROM ' + mask(ActualTable) );
for i:=1 to ds.RecordCount do
begin
// primary key
if ds.FieldByName('Key_name').AsString = 'PRIMARY' then
// Search for the column name in listColumns
for j:=0 to ListColumns.Items.Count-1 do
begin
for j:=0 to ListColumns.Items.Count-1 do
if ds.FieldByName('Column_name').AsString = ListColumns.Items[j].Caption then
begin
if ds.FieldByName('Column_name').AsString = ListColumns.Items[j].Caption then
begin
ListColumns.Items[j].ImageIndex := ICONINDEX_PRIMARYKEY;
// Only apply a new icon if it was not already changed
if ListColumns.Items[j].ImageIndex <> ICONINDEX_FIELD then
break;
end;
end;
end;
// index
if (ds.FieldByName('Key_name').AsString <> 'PRIMARY')
and (ds.FieldByName('Non_unique').AsString = '1') then
begin
for j:=0 to ListColumns.Items.Count-1 do
begin
if ds.FieldByName('Column_name').AsString = ListColumns.Items[j].Caption then
begin
if ListColumns.Items[j].ImageIndex = ICONINDEX_FIELD then // Only apply if it's the default image
ListColumns.Items[j].ImageIndex := ICONINDEX_INDEXKEY;
break;
end;
end;
end;
// Check if column is part of a fulltext key
if mysql_version < 40002 then
isFulltext := (ds.FieldByName('Comment').AsString = 'FULLTEXT')
else
isFulltext := (ds.FieldByName('Index_type').AsString = 'FULLTEXT');
// unique
if (ds.FieldByName('Key_name').AsString <> 'PRIMARY') and (ds.FieldByName('Non_unique').AsString = '0') then
begin
for j:=0 to ListColumns.Items.Count-1 do
begin
if ds.FieldByName('Column_name').AsString = ListColumns.Items[j].Caption then
begin
if ListColumns.Items[j].ImageIndex = ICONINDEX_FIELD then // Only apply if it's the default image
ListColumns.Items[j].ImageIndex := ICONINDEX_UNIQUEKEY;
break;
end;
end;
end;
// Primary key
if ds.FieldByName('Key_name').AsString = 'PRIMARY' then
ListColumns.Items[j].ImageIndex := ICONINDEX_PRIMARYKEY
// Fulltext index
else if isFullText then
ListColumns.Items[j].ImageIndex := ICONINDEX_FULLTEXTKEY
// Unique index
else if ds.FieldByName('Non_unique').AsString = '0' then
ListColumns.Items[j].ImageIndex := ICONINDEX_UNIQUEKEY
// Normal index
else
ListColumns.Items[j].ImageIndex := ICONINDEX_INDEXKEY;
// column is part of a fulltext key, available since 3.23.xx
if mysql_version < 40002 then
isFulltext := (ds.FieldByName('Comment').AsString = 'FULLTEXT')
else
isFulltext := (ds.FieldByName('Index_type').AsString = 'FULLTEXT');
if (ds.FieldByName('Key_name').AsString <> 'PRIMARY') and isFulltext then
begin
for j:=0 to ListColumns.Items.Count-1 do
begin
if ds.FieldByName('Column_name').AsString = ListColumns.Items[j].Caption then
begin
if ListColumns.Items[j].ImageIndex = ICONINDEX_FIELD then // Only apply if it's the default image
ListColumns.Items[j].ImageIndex := ICONINDEX_FULLTEXTKEY;
break;
end;
// Column was found and processed
break;
end;
end;
ds.Next;