diff options
| author | Andrew Dolgov <[email protected]> | 2013-04-17 16:05:52 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2013-04-17 16:05:54 +0400 |
| commit | aca75cb5cb323535099c7aef46a78ea3cec082f2 (patch) | |
| tree | deed39d90fa490828cfc60dac772c9f53fee87b1 /classes/db | |
| parent | 404e2e3603c852a3f82a21c14b8888005e2b3f99 (diff) | |
reinstate error handlers; better DB error reporting on failed queries
Diffstat (limited to 'classes/db')
| -rw-r--r-- | classes/db/mysql.php | 6 | ||||
| -rw-r--r-- | classes/db/pgsql.php | 5 |
2 files changed, 4 insertions, 7 deletions
diff --git a/classes/db/mysql.php b/classes/db/mysql.php index 64c35ebdc..241d2a063 100644 --- a/classes/db/mysql.php +++ b/classes/db/mysql.php @@ -25,10 +25,8 @@ class Db_Mysql implements IDb { function query($query, $die_on_error = true) { $result = mysql_query($query, $this->link); if (!$result) { - $query = htmlspecialchars($query); - if ($die_on_error) { - die("Query <i>$query</i> failed: " . ($this->link ? mysql_error($link) : "No connection")); - } + user_error("Query $query failed: " . ($this->link ? mysql_error($this->link) : "No connection"), + $die_on_error ? E_USER_ERROR : E_USER_WARNING); } return $result; } diff --git a/classes/db/pgsql.php b/classes/db/pgsql.php index 0f38fb8cb..bafd54ab2 100644 --- a/classes/db/pgsql.php +++ b/classes/db/pgsql.php @@ -39,9 +39,8 @@ class Db_Pgsql implements IDb { if (!$result) { $query = htmlspecialchars($query); // just in case - if ($die_on_error) { - die("Query <i>$query</i> failed [$result]: " . ($this->link ? pg_last_error($this->link) : "No connection")); - } + user_error("Query $query failed: " . ($this->link ? pg_last_error($this->link) : "No connection"), + $die_on_error ? E_USER_ERROR : E_USER_WARNING); } return $result; } |