mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-21 16:22:22 +02:00
Code Issues Releases Wiki Activity

Merge pull request #6637 from rxu/ticket/17337

Browse Source 
[ticket/17337] Fix mysqli driver is missing transaction begin statement - 3.3.x
This commit is contained in:
Marc Alexander 2024-06-24 20:35:00 +02:00
commit 3647cf2cfe
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995
3 changed files with 65 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/phpbb/db/driver/mysqli.php
View File

@ -155,7 +155,9 @@ class mysqli extends \phpbb\db\driver\mysql_base
switch ($status)
{
case 'begin':
return @mysqli_autocommit($this->db_connect_id, false);
@mysqli_autocommit($this->db_connect_id, false);
$result = @mysqli_begin_transaction($this->db_connect_id);
return $result;
break;
case 'commit':

61
tests/dbal/write_test.php
View File

@ -73,6 +73,67 @@ class phpbb_dbal_write_test extends phpbb_database_test_case
$db->sql_freeresult($result);
}
public function test_delete_rollback()
{
$db = $this->new_dbal();
$is_myisam = false;
if ($db->get_sql_layer() === 'mysqli')
{
$table_status = $db->get_table_status('phpbb_config');
$is_myisam = isset($table_status['Engine']) && $table_status['Engine'] === 'MyISAM';
}
$db->sql_transaction('begin');
$sql = "DELETE FROM phpbb_config
WHERE config_name = 'config1'";
$db->sql_query($sql);
// Rollback and check that nothing was changed
$db->sql_transaction('rollback');
$sql = 'SELECT *
FROM phpbb_config';
$result = $db->sql_query($sql);
$rows = $db->sql_fetchrowset($result);
$db->sql_freeresult($result);
if (!$is_myisam)
{
$this->assertEquals(2, count($rows));
$this->assertEquals('config1', $rows[0]['config_name']);
}
else
{
// Rollback does not work on MyISAM
$this->assertEquals(1, count($rows));
$this->assertEquals('config2', $rows[0]['config_name']);
// Restore deleted config value on MyISAM
$sql = "INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('config1', 'foo', 0)";
$db->sql_query($sql);
}
$db->sql_transaction('begin');
$sql = "DELETE FROM phpbb_config
WHERE config_name = 'config1'";
$db->sql_query($sql);
// Commit and check that data was actually changed
$db->sql_transaction('commit');
$sql = 'SELECT *
FROM phpbb_config';
$result = $db->sql_query($sql);
$rows = $db->sql_fetchrowset($result);
$db->sql_freeresult($result);
$this->assertEquals(1, count($rows));
$this->assertEquals('config2', $rows[0]['config_name']);
}
public function test_multiple_insert()
{
$db = $this->new_dbal();

2
tests/test_framework/phpbb_database_test_case.php
View File

@ -285,7 +285,7 @@ abstract class phpbb_database_test_case extends TestCase
return $this->createDefaultDBConnection($manager->get_pdo(), 'testdb');
}
public function new_dbal()
public function new_dbal() : \phpbb\db\driver\driver_interface
{
$config = $this->get_database_config();