opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2025-08-26 11:17:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix disabled run query button in certain cases. See http://www.heidisql.com/forum.php?t=7886

Browse Source
This commit is contained in:
Ansgar Becker
2011-04-07 21:46:24 +00:00
parent 2e44387eb2
commit 56ca6c75d9
2 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/helpers.pas
View File

@ -76,6 +76,7 @@ type
private
FConnection: TDBConnection;
FBatch: TSQLBatch;
FTabNumber: Integer;
FBatchInOneGo: Boolean;
FStopOnErrors: Boolean;
FAborted: Boolean;
@ -94,6 +95,7 @@ type
public
property Connection: TDBConnection read FConnection;
property Batch: TSQLBatch read FBatch;
property TabNumber: Integer read FTabNumber;
property BatchPosition: Integer read FBatchPosition;
property Results: TDBQueryList read FResults;
property QueriesInPacket: Integer read FQueriesInPacket;
@ -103,7 +105,7 @@ type
property RowsFound: Int64 read FRowsFound;
property Aborted: Boolean read FAborted write FAborted;
property ErrorMessage: String read FErrorMessage;
constructor Create(Connection: TDBConnection; Batch: TSQLBatch);
constructor Create(Connection: TDBConnection; Batch: TSQLBatch; TabNumber: Integer);
procedure Execute; override;
end;
@ -2889,12 +2891,13 @@ end;
{ Threading stuff }
constructor TQueryThread.Create(Connection: TDBConnection; Batch: TSQLBatch);
constructor TQueryThread.Create(Connection: TDBConnection; Batch: TSQLBatch; TabNumber: Integer);
begin
inherited Create(False);
FConnection := Connection;
FAborted := False;
FBatch := Batch;
FTabNumber := TabNumber;
FBatchPosition := 0;
FQueryTime := 0;
FQueryNetTime := 0;

42
source/main.pas
View File

@ -747,6 +747,7 @@ type
function GetMainTabAt(X, Y: Integer): Integer;
procedure FixQueryTabCloseButtons;
function ActiveQueryTab: TQueryTab;
function GetQueryTabByNumber(Number: Integer): TQueryTab;
function ActiveQueryMemo: TSynMemo;
function ActiveQueryHelpers: TVirtualStringTree;
function ActiveSynMemo: TSynMemo;
@ -899,7 +900,6 @@ type
procedure SetSnippetFilenames;
function TreeClickHistoryPrevious(MayBeNil: Boolean=False): PVirtualNode;
procedure OperationRunning(Runs: Boolean);
function FindQueryTabByThread(Thread: TQueryThread): TQueryTab;
public
AllDatabasesDetails: TDBQuery;
btnAddTab: TSpeedButton;
@ -2228,7 +2228,7 @@ begin
// Start the execution thread
Screen.Cursor := crAppStart;
Tab.QueryRunning := True;
Tab.ExecutionThread := TQueryThread.Create(ActiveConnection, Batch);
Tab.ExecutionThread := TQueryThread.Create(ActiveConnection, Batch, Tab.Number);
ValidateQueryControls(Sender);
end;
@ -2258,7 +2258,7 @@ var
begin
// Single query or query packet has finished
ShowStatusMsg('Setting up result grid(s) ...');
Tab := FindQueryTabByThread(Thread);
Tab := GetQueryTabByNumber(Thread.TabNumber);
// Create result tabs
for Results in ActiveConnection.GetLastResults do begin
@ -2330,7 +2330,7 @@ var
begin
// Find right query tab
Tab := FindQueryTabByThread(Thread);
Tab := GetQueryTabByNumber(Thread.TabNumber);
// Error handling
if IsNotEmpty(Thread.ErrorMessage) then begin
@ -2355,7 +2355,7 @@ begin
// Display query profile
if Tab.DoProfile then begin
Tab.QueryProfile := ActiveConnection.GetResults('SHOW PROFILE');
Tab.QueryProfile := Thread.Connection.GetResults('SHOW PROFILE');
Tab.ProfileTime := 0;
Tab.MaxProfileTime := 0;
while not Tab.QueryProfile.Eof do begin
@ -2367,7 +2367,7 @@ begin
ProfileNode := FindNode(Tab.treeHelpers, HELPERNODE_PROFILE, nil);
Tab.treeHelpers.ReinitNode(ProfileNode, True);
Tab.treeHelpers.InvalidateChildren(ProfileNode, True);
ActiveConnection.Query('SET profiling=0');
Thread.Connection.Query('SET profiling=0');
end;
// Clean up
@ -9177,6 +9177,21 @@ begin
end;
function TMainForm.GetQueryTabByNumber(Number: Integer): TQueryTab;
var
i: Integer;
begin
// Find right query tab
Result := nil;
for i:=0 to QueryTabs.Count-1 do begin
if QueryTabs[i].Number = Number then begin
Result := QueryTabs[i];
break;
end;
end;
end;
function TMainForm.ActiveQueryMemo: TSynMemo;
var
Tab: TQueryTab;
@ -10253,21 +10268,6 @@ begin
end;
function TMainForm.FindQueryTabByThread(Thread: TQueryThread): TQueryTab;
var
i: Integer;
begin
// Find right query tab
Result := nil;
for i:=0 to QueryTabs.Count-1 do begin
if QueryTabs[i].ExecutionThread = Thread then begin
Result := QueryTabs[i];
break;
end;
end;
end;
{ TQueryTab }