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

* Bugfix: Properly propagate exception when editing forbidden (access denied) data in a grid.

Browse Source 
* Cosmetic: Fix haywire indentation in TMysqlQueryThread.Execute.
This commit is contained in:
rosenfield
2007-08-29 01:48:28 +00:00
parent bf401df253
commit 996de281d7
3 changed files with 44 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
source/mysqlquerythread.pas
View File

@ -195,10 +195,8 @@ var
qr : TThreadResult;
begin
debug(Format('qry: Setting result and posting status %d via WM_MYSQL_THREAD_NOTIFY message', [AEvent]));
if self.FPostDataSet = nil then begin
qr := AssembleResult();
TMysqlQuery(FOwner).SetThreadResult(qr);
end;
qr := AssembleResult();
TMysqlQuery(FOwner).SetThreadResult(qr);
PostMessage(FNotifyWndHandle,WM_MYSQL_THREAD_NOTIFY,Integer(FOwner),AEvent);
end;
@ -206,52 +204,47 @@ procedure TMysqlQueryThread.Execute;
var
q : TDeferDataSet;
r : Boolean;
e : TExceptionData;
ex : TExceptionData;
begin
debug(Format('qry: Thread %d running...', [ThreadID]));
NotifyStatus(MQE_INITED);
try
if not FMysqlConn.Connected then
FMysqlConn.Connect();
if not FMysqlConn.Connected then FMysqlConn.Connect();
except
on E: Exception do
begin
SetState (MQR_CONNECT_FAIL,Format('%s',[E.Message]));
end;
on E: Exception do begin
SetState (MQR_CONNECT_FAIL,Format('%s',[E.Message]));
end;
end;
if FMysqlConn.Connected then
begin
NotifyStatus (MQE_STARTED);
q := nil;
if FPostDataSet <> nil then FPostDataSet.DoAsync
else begin
if ExpectResultSet(FSql) then
begin
r := RunDataQuery (FSql,TDataSet(q),e,FCallback);
if r then
begin
if q.State=dsBrowse then
begin
// WTF?
end;
end;
end
else
r := RunUpdateQuery (FSql,TDataSet(q),e,FCallBack);
TMysqlQuery(FOwner).SetMysqlDataset(q);
if r then
SetState (MQR_SUCCESS,'SUCCESS')
else
SetState (MQR_QUERY_FAIL,e.Msg);
if FMysqlConn.Connected then begin
NotifyStatus (MQE_STARTED);
q := nil;
if FPostDataSet <> nil then begin
try
FPostDataSet.DoAsync;
SetState (MQR_SUCCESS,'SUCCESS')
except
on E: Exception do begin
SetState (MQR_QUERY_FAIL,Format('%s', [E.Message]));
end;
end;
end else begin
if ExpectResultSet(FSql) then begin
r := RunDataQuery (FSql,TDataSet(q),ex,FCallback);
if r then begin
if q.State=dsBrowse then begin
// WTF?
end;
end;
end else r := RunUpdateQuery (FSql,TDataSet(q),ex,FCallBack);
TMysqlQuery(FOwner).SetMysqlDataset(q);
if r then SetState (MQR_SUCCESS,'SUCCESS')
else SetState (MQR_QUERY_FAIL,ex.Msg);
end;
end;
NotifyStatus (MQE_FINISHED);
NotifyStatus (MQE_FREED);