timw4mail/OpenSQLManager
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Convert php errors to exceptions

Browse Source
This commit is contained in:
Timothy Warren 2012-03-07 11:26:45 -05:00
parent c8c5650156
commit 80946c2575
2 changed files with 24 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sys/databases/firebird-ibase.php
View File

@ -36,6 +36,7 @@ class firebird extends DB_PDO {
// functions that would use it, I'm dumping it. // functions that would use it, I'm dumping it.
$conn = @ibase_connect($dbpath, $user, $pass, 'utf-8'); $conn = @ibase_connect($dbpath, $user, $pass, 'utf-8');
// Throw an exception to make this match other pdo classes
if ( ! is_resource($conn)) if ( ! is_resource($conn))
{ {
throw new PDOException(ibase_errmsg()); throw new PDOException(ibase_errmsg());
@ -86,11 +87,19 @@ class firebird extends DB_PDO {
if (isset($this->trans)) if (isset($this->trans))
{ {
$this->statement = ibase_query($this->trans, $sql); $this->statement = @ibase_query($this->trans, $sql);
} }
else else
{ {
$this->statement = ibase_query($sql); $this->statement = @ibase_query($sql);
}
// Throw the error as a exception
// if there is one
if ( ! is_resource($this->statement))
{
throw new PDOException(ibase_errmsg());
die();
} }
return $this->statement; return $this->statement;
@ -154,7 +163,15 @@ class firebird extends DB_PDO {
*/ */
public function prepare($query, $options=NULL) public function prepare($query, $options=NULL)
{ {
$this->statement = ibase_prepare($query); $this->statement = @ibase_prepare($query);
// Throw the error as an exception
if ( ! is_resource($this->statement))
{
throw new PDOException(ibase_errmsg());
die();
}
return $this->statement; return $this->statement;
} }

46
sys/windows/widgets/db_info_widget.php
View File

@ -249,6 +249,10 @@ class DB_Info_Widget extends GtkTable {
return; return;
} }
// Catch connection exceptions, and
// display the error message to the
// user so they can edit the db
// parameters
try try
{ {
$db = new Query_Builder($params); $db = new Query_Builder($params);
@ -264,49 +268,7 @@ class DB_Info_Widget extends GtkTable {
); );
$dialog->run(); $dialog->run();
$dialog->destroy(); $dialog->destroy();
return;
} }
// Sometimes there's not an exception,
// check for an error so as not to
// give false positive connections
$errorInfo = $db->errorInfo();
if(empty($errorInfo))
{
$dialog = new GTKMessageDialog(
NULL,
Gtk::DIALOG_MODAL,
Gtk::MESSAGE_INFO,
Gtk::BUTTONS_OK,
"Successfully connected"
);
}
else
{
$err = $db->errorInfo();
$msg = $err[count($err) - 1];
$code = $err[1];
$dialog = new GTKMessageDialog(
NULL,
Gtk::DIALOG_MODAL,
Gtk::MESSAGE_ERROR,
Gtk::BUTTONS_OK,
"Error connecting to database: \n\n" .
"Error # {$code}\n".
$msg
);
}
$dialog->run();
$dialog->destroy();
return;
} }
/** /**