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

r3150 didn't fix all exceptions thrown by ListTables.OnGetText when nodes are bound to already freed TDBObjects. Do it right now - introduce a new event TMySQLConnection.OnAfterClearDBObjects for this purpose. Todo: Fix related issue #1723.

Browse Source
This commit is contained in:
Ansgar Becker
2010-03-12 22:23:09 +00:00
parent 059b7ebe56
commit 4147bbcfbc
2 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/main.pas
View File

@@ -786,6 +786,7 @@ type
procedure SaveQueryMemo(Tab: TQueryTab; Filename: String; OnlySelection: Boolean);
procedure UpdateFilterPanel(Sender: TObject);
procedure DatabaseChanged(Database: String);
procedure AfterClearDBObjects(Database: String);
function GetBlobContent(Results: TMySQLQuery; Column: Integer): String;
procedure DoSearchReplace;
procedure UpdateLineCharPanel;
@@ -1852,6 +1853,7 @@ begin
ListStatus.Tag := VTREE_NOTLOADED;
ListProcesses.Tag := VTREE_NOTLOADED;
ListCommandstats.Tag := VTREE_NOTLOADED;
ListTables.Tag := VTREE_NOTLOADED;
Application.Title := APPNAME;
end;
@@ -2535,6 +2537,7 @@ begin
ConnectionAttempt := TMySQLConnection.Create(Self);
ConnectionAttempt.OnLog := LogSQL;
ConnectionAttempt.OnDatabaseChanged := DatabaseChanged;
ConnectionAttempt.OnAfterClearDBObjects := AfterClearDBObjects;
ConnectionAttempt.ObjectNamesInSelectedDB := SynSQLSyn1.TableNames;
ConnectionAttempt.Parameters := Params;
try
@@ -3814,8 +3817,6 @@ var
begin
// DB-Properties
vt := Sender as TVirtualStringTree;
if not Connection.DbObjectsCached(ActiveDatabase) then
vt.Tag := VTREE_NOTLOADED;
if vt.Tag = VTREE_LOADED then
Exit;
@@ -6615,6 +6616,15 @@ begin
end;
procedure TMainForm.AfterClearDBObjects(Database: String);
begin
if (Database='') or (ActiveDatabase=Database) then begin
ListTables.Tag := VTREE_NOTLOADED;
ListTables.Invalidate;
end;
end;
procedure TMainForm.DBtreeDblClick(Sender: TObject);
var
Node: PVirtualNode;

10
source/mysql_connection.pas
View File

@@ -72,7 +72,7 @@ type
TMySQLLogCategory = (lcInfo, lcSQL, lcUserFiredSQL, lcError, lcDebug);
TMySQLLogEvent = procedure(Msg: String; Category: TMySQLLogCategory=lcInfo) of object;
TMySQLDatabaseChangedEvent = procedure(Database: String) of object;
TMySQLDatabaseEvent = procedure(Database: String) of object;
TMySQLQuery = class;
TMySQLConnection = class(TComponent)
@@ -85,7 +85,8 @@ type
FDatabase: String;
FLogPrefix: String;
FOnLog: TMySQLLogEvent;
FOnDatabaseChanged: TMySQLDatabaseChangedEvent;
FOnDatabaseChanged: TMySQLDatabaseEvent;
FOnAfterClearDBObjects: TMySQLDatabaseEvent;
FRowsFound: Int64;
FRowsAffected: Int64;
FServerVersionUntouched: String;
@@ -163,7 +164,8 @@ type
property LogPrefix: String read FLogPrefix write FLogPrefix;
// Events
property OnLog: TMySQLLogEvent read FOnLog write FOnLog;
property OnDatabaseChanged: TMySQLDatabaseChangedEvent read FOnDatabaseChanged write FOnDatabaseChanged;
property OnDatabaseChanged: TMySQLDatabaseEvent read FOnDatabaseChanged write FOnDatabaseChanged;
property OnAfterClearDBObjects: TMySQLDatabaseEvent read FOnAfterClearDBObjects write FOnAfterClearDBObjects;
end;
@@ -915,6 +917,8 @@ begin
TDBObjectList(FDBObjectLists.Objects[i]).Free;
FDBObjectLists.Clear;
end;
if Assigned(FOnAfterClearDBObjects) then
FOnAfterClearDBObjects(db);
end;