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

No need to check server version on each key pressing. Also this is obviously causing a call to ActiveConnection when at some points this is not set. Fixes issue #2376.

Browse Source
This commit is contained in:
Ansgar Becker
2011-04-13 20:07:37 +00:00
parent 2160643759
commit 6bee759971
1 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
source/main.pas
View File

@@ -804,7 +804,6 @@ type
procedure tabsetQueryMouseMove(Sender: TObject; Shift: TShiftState; X, Y: Integer);
procedure tabsetQueryMouseLeave(Sender: TObject);
procedure StatusBarDrawPanel(StatusBar: TStatusBar; Panel: TStatusPanel; const Rect: TRect);
procedure UpdateServerPanel;
procedure StatusBarMouseMove(Sender: TObject; Shift: TShiftState; X, Y: Integer);
procedure StatusBarMouseLeave(Sender: TObject);
procedure AnyGridStartOperation(Sender: TBaseVirtualTree; OperationKind: TVTOperationKind);
@@ -1109,14 +1108,6 @@ begin
end;
procedure TMainForm.UpdateServerPanel;
begin
// Display server vendor and version. Also required on reconnects.
if Assigned(FActiveDbObj) then
ShowStatusMsg(FActiveDbObj.Connection.Parameters.NetTypeName(FActiveDbObj.Connection.Parameters.NetType, False)+' '+FActiveDbObj.Connection.ServerVersionStr, 3);
end;
procedure TMainForm.StatusBarMouseMove(Sender: TObject; Shift: TShiftState; X, Y: Integer);
var
MouseP: TPoint;
@@ -3257,9 +3248,6 @@ var
Tree: TVirtualStringTree;
begin
// Call SQL Help from various places
if ActiveConnection.ServerVersionInt < 40100 then
exit;
keyword := '';
// Query-Tab
@@ -4451,9 +4439,6 @@ begin
inDataOrQueryTabNotEmpty := inDataOrQueryTab and Assigned(Grid) and (Grid.RootNodeCount > 0);
inGrid := Assigned(Grid) and (ActiveControl = Grid);
actSQLhelp.Enabled := ActiveConnection.ServerVersionInt >= 40100;
actImportCSV.Enabled := ActiveConnection.ServerVersionInt >= 32206;
actDataInsert.Enabled := inGrid and Assigned(Results);
actDataDuplicateRow.Enabled := inGrid and inDataOrQueryTabNotEmpty and Assigned(Grid.FocusedNode);
actDataDelete.Enabled := inGrid and (Grid.SelectedCount > 0);
@@ -6913,7 +6898,7 @@ begin
LogSQL('Connection switch!', lcDebug);
TimerConnected.OnTimer(Sender);
TimerHostUptime.OnTimer(Sender);
UpdateServerPanel;
DBObj.Connection.OnConnected(DBObj.Connection, DBObj.Connection.Database);
DBTree.Color := GetRegValue(REGNAME_TREEBACKGROUND, clWindow, DBObj.Connection.SessionName);
case DBObj.Connection.Parameters.NetTypeGroup of
ngMySQL:
@@ -7027,7 +7012,10 @@ end;
procedure TMainForm.ConnectionReady(Connection: TDBConnection; Database: String);
begin
UpdateServerPanel;
// Display server vendor and version. Also required on reconnects.
ShowStatusMsg(Connection.Parameters.NetTypeName(Connection.Parameters.NetType, False)+' '+Connection.ServerVersionStr, 3);
actSQLhelp.Enabled := Connection.ServerVersionInt >= 40100;
actImportCSV.Enabled := Connection.ServerVersionInt >= 32206;
end;