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

Nuke ExpectResultSet. Opted not to disable the mysql driver exceptions in zeos, instead used Anse's TZConnection.GetAffectedRowsFromLastPost().

Browse Source 
(Messing with the internals here, please test...)
This commit is contained in:
rosenfield
2007-10-05 18:52:38 +00:00
parent 0f7015bf61
commit d33be19be0
3 changed files with 20 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
source/mysqlquerythread.pas
View File

@ -4,6 +4,7 @@ interface
uses
Windows, Messages, Forms, Db, Classes, ZConnection, ZDataSet, StdCtrls, SysUtils,
ZMessages,
HeidiComp;
{$IFDEF EXAMPLE_APP}
@ -232,14 +233,12 @@ begin
end;
end else begin
try
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);
r := RunDataQuery (FSql,TDataSet(q),ex,FCallback);
if r then begin
//if q.State=dsBrowse then begin
// WTF?
//end;
end;
TMysqlQuery(FOwner).SetMysqlDataset(q);
if r then SetState (MQR_SUCCESS,'SUCCESS')
@ -336,11 +335,12 @@ begin
q.Active := True;
Result := True;
except
on E: Exception do
begin
AExceptionData := GetExceptionData(E);
end;
// EZSQLException
on E: Exception do begin
if E.Message = SCanNotOpenResultSet then begin
Result := true;
ADataset := nil;
end else AExceptionData := GetExceptionData(E);
end;
end;
end;