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

Reimplement readable error messages for InnoDB's cryptic messages, as in r2593. Broken in r2678.

Browse Source
This commit is contained in:
Ansgar Becker
2009-10-30 16:46:59 +00:00
parent f3ff47313c
commit d2a6f27fba
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/mysql_connection.pas
View File

@ -5,7 +5,7 @@ unit mysql_connection;
interface
uses
Classes, SysUtils, windows, mysql_api, mysql_structures, WideStrings, WideStrUtils, cUnicodeCodecs;
Classes, SysUtils, windows, mysql_api, mysql_structures, WideStrings, WideStrUtils, cUnicodeCodecs, SynRegExpr;
type
@ -369,8 +369,21 @@ end;
Return the last error nicely formatted
}
function TMySQLConnection.GetLastError: WideString;
var
Msg, Additional: WideString;
rx: TRegExpr;
begin
Result := WideFormat('SQL Error (%d): %s', [mysql_errno(FHandle), Utf8Decode(mysql_error(FHandle))]);
Msg := Utf8Decode(mysql_error(FHandle));
// Find "(errno: 123)" in message and add more meaningful message from perror.exe
rx := TRegExpr.Create;
rx.Expression := '.+\(errno\:\s+(\d+)\)';
if rx.Exec(Msg) then begin
Additional := MySQLErrorCodes.Values[rx.Match[1]];
if Additional <> '' then
Msg := Msg + CRLF + CRLF + Additional;
end;
rx.Free;
Result := WideFormat('SQL Error (%d): %s', [mysql_errno(FHandle), Msg]);
end;