Skip to content
Permalink
Browse files

Issue #677:

* drop workaround for application crash on WinXP, when loading newer libmariadb (see #79)
* raise TDbLib's own exception instead of baking an own one with less details. Probably helps in debugging: https://www.heidisql.com/forum.php?t=34044
* rename EDatabaseError to EDbError, to overcome naming conflict in DB unit
* load libpq.dll always with path, which should anyway work better than without it. See http://www.heidisql.com/forum.php?t=22514
  • Loading branch information...
ansgarbecker committed Jul 8, 2019
1 parent 4f9613b commit 2a91a13b429735071d7d57d82a149d333375ae43
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: HeidiSQL\n"
"POT-Creation-Date: 2012-11-05 21:40\n"
"PO-Revision-Date: 2019-07-05 06:42+0200\n"
"PO-Revision-Date: 2019-07-08 20:21+0200\n"
"Last-Translator: Ansgar Becker <anse@heidisql.com>\n"
"Language-Team: English (http://www.transifex.com/projects/p/heidisql/language/en/)\n"
"MIME-Version: 1.0\n"
@@ -4025,6 +4025,9 @@ msgstr "Trying to load library with full path: %s"
msgid "Library error in %s: Could not find procedure address for \"%s\""
msgstr "Library error in %s: Could not find procedure address for \"%s\""

msgid "Library %s could not be loaded. Please select a different one."
msgstr "Library %s could not be loaded. Please select a different one."

#. DLL loading failed entirely
msgid "Library %s seems unusable. Please select a different one."
msgstr "Library %s seems unusable. Please select a different one."
@@ -4033,6 +4036,9 @@ msgstr "Library %s seems unusable. Please select a different one."
msgid "Cannot find a usable %s. Please launch %s from the directory where you have installed it."
msgstr "Cannot find a usable %s. Please launch %s from the directory where you have installed it."

msgid "Internal error %d: %s"
msgstr "Internal error %d: %s"

#: dbconnection.pas:1430
msgid "Login to %s:"
msgstr "Login to %s:"
@@ -2017,7 +2017,7 @@ function TDBObjectEditor.GetDefiners: TStringList;
try
FDefiners := DBObject.Connection.GetCol('SELECT CONCAT('+q('User')+', '+esc('@')+', '+q('Host')+') FROM '+
q('mysql')+'.'+q('user')+' WHERE '+q('User')+'!='+esc('')+' ORDER BY '+q('User')+', '+q('Host'));
except on E:EDatabaseError do
except on E:EDbError do
FDefiners := TStringList.Create;
end;
end;
@@ -3097,7 +3097,7 @@ procedure TQueryThread.Execute;
Inc(FRowsFound, FConnection.RowsFound);
Inc(FWarningCount, FConnection.WarningCount);
except
on E:EDatabaseError do begin
on E:EDbError do begin
if FStopOnErrors or (i = FBatch.Count - 1) then begin
FErrorMessage := E.Message;
ErrorAborted := True;
@@ -5,7 +5,7 @@ interface

uses
Windows, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, StdCtrls, extra_controls,
dbconnection, VirtualTrees, SynEdit, SynMemo, Menus, gnugettext;
dbconnection, dbstructures, VirtualTrees, SynEdit, SynMemo, Menus, gnugettext;

type
TCopyTableForm = class(TFormWithSizeGrip)
@@ -495,7 +495,7 @@ procedure TCopyTableForm.btnOKClick(Sender: TObject);
else
FConnection.ClearDbObjects(comboDatabase.Text);
except
on E:EDatabaseError do begin
on E:EDbError do begin
Screen.Cursor := crDefault;
Msg := E.Message;
if FConnection.LastErrorCode = 1075 then
@@ -4,7 +4,7 @@ interface

uses
Windows, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, StdCtrls, SynEdit, SynMemo,
dbconnection, gnugettext, SynRegExpr;
dbconnection, dbstructures, gnugettext, SynRegExpr;

type
TCreateDatabaseForm = class(TForm)
@@ -142,7 +142,7 @@ procedure TCreateDatabaseForm.btnOKClick(Sender: TObject);
// Close form
ModalResult := mrOK;
except
on E:EDatabaseError do
on E:EDbError do
ErrorDialog(f_('Creating database "%s" failed.', [editDBName.Text]), E.Message);
// Keep form open
end else try

0 comments on commit 2a91a13

Please sign in to comment.
You can’t perform that action at this time.