makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/14044] Automatically trigger rollback on insert in transaction

Browse source 
This will cause the sqlite3 driver to automatically rollback transactions
if an insert fails during a transaction. Other dbms trigger a rollback
inside the sql_error() function with a rollback command. However,
this manual rollback command might fail on sqlite3 due to ongoing queries.

With this change, sqlite3 itself will abort any ongoing queries and
initiate the rollback automatically. Since manually triggered rollbacks
will fail after the rollback was started automatically, we catch
exceptions output by the exec() command during rollback and any exception
that might be thrown by fetchArray() due to aborted queries.

PHPBB3-14044
This commit is contained in:
Marc Alexander 2015-10-23 16:34:01 +02:00 • committed by Mate Bartus
parent d34d6378bc
commit df53d40922
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
phpBB/phpbb/db/driver/sqlite3.php
View file

@ -102,7 +102,7 @@ class sqlite3 extends \phpbb\db\driver\driver
break; break;
case 'rollback': case 'rollback':
return $this->dbo->exec('ROLLBACK'); return @$this->dbo->exec('ROLLBACK');
break; break;
} }
@ -134,6 +134,11 @@ class sqlite3 extends \phpbb\db\driver\driver
if ($this->query_result === false) if ($this->query_result === false)
{ {
if ($this->transaction === true && strpos($query, 'INSERT') === 0)
{
$query = preg_replace('/^INSERT INTO/', 'INSERT OR ROLLBACK INTO', $query);
}
if (($this->query_result = @$this->dbo->query($query)) === false) if (($this->query_result = @$this->dbo->query($query)) === false)
{ {
// Try to recover a lost database connection // Try to recover a lost database connection
@ -225,6 +230,7 @@ class sqlite3 extends \phpbb\db\driver\driver
if ($query_id === false) if ($query_id === false)
{ {
/** @var \SQLite3Result $query_id */
$query_id = $this->query_result; $query_id = $this->query_result;
} }
@ -233,7 +239,7 @@ class sqlite3 extends \phpbb\db\driver\driver
return $cache->sql_fetchrow($query_id); return $cache->sql_fetchrow($query_id);
} }
return is_object($query_id) ? $query_id->fetchArray(SQLITE3_ASSOC) : false; return is_object($query_id) ? @$query_id->fetchArray(SQLITE3_ASSOC) : false;
} }
/** /**

10
phpBB/phpbb/search/fulltext_native.php
View file

@ -1478,7 +1478,10 @@ class fulltext_native extends \phpbb\search\base
$this->db->sql_return_on_error(false); $this->db->sql_return_on_error(false);
} }
unset($new_words, $sql_ary); unset($new_words, $sql_ary);
$this->db->sql_transaction('commit'); }
else
{
$this->db->sql_transaction('begin');
} }
// now update the search match table, remove links to removed words and add links to new words // now update the search match table, remove links to removed words and add links to new words
@ -1510,11 +1513,6 @@ class fulltext_native extends \phpbb\search\base
} }
} }
if (empty($unique_add_words))
{
$this->db->sql_transaction('begin');
}
$this->db->sql_return_on_error(true); $this->db->sql_return_on_error(true);
foreach ($words['add'] as $word_in => $word_ary) foreach ($words['add'] as $word_in => $word_ary)
{ {