public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-13 19:15:56 +00:00
Code Issues Releases Wiki Activity

reinstate error handlers; better DB error reporting on failed queries

Browse Source
This commit is contained in:
Andrew Dolgov
2013-04-17 16:05:52 +04:00
parent 404e2e3603
commit aca75cb5cb
6 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
classes/db/mysql.php
View File

@@ -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;
}

5
classes/db/pgsql.php
View File

@@ -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;
}