1
0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2026-02-10 16:01:33 +00:00

rollback current transaction before trying to report SQL query errors, properly save database error messages when logging query errors

This commit is contained in:
Andrew Dolgov
2013-08-02 16:20:39 +04:00
parent edba269b6f
commit 38f439708c
3 changed files with 15 additions and 6 deletions

View File

@@ -24,9 +24,12 @@ class Db_Mysqli implements IDb {
}
function query($query, $die_on_error = true) {
$result = mysqli_query($this->link, $query);
$result = @mysqli_query($this->link, $query);
if (!$result) {
user_error("Query $query failed: " . ($this->link ? mysqli_error($this->link) : "No connection"),
$error = @mysqli_error($this->link);
@mysqli_query($this->link, "ROLLBACK");
user_error("Query $query failed: " . ($this->link ? $error : "No connection"),
$die_on_error ? E_USER_ERROR : E_USER_WARNING);
}