1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-08 08:35:31 +02:00

[ticket/11469] Use method to check config count, instead of repeating it

PHPBB3-11469
This commit is contained in:
Joas Schilling 2013-03-27 14:09:04 +01:00
parent bf6f2c5875
commit af9f30cd52

View File

@ -14,6 +14,15 @@ class phpbb_dbal_sql_insert_buffer_test extends phpbb_database_test_case
return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/config.xml'); return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/config.xml');
} }
protected function assert_config_count($db, $num_configs)
{
$sql = 'SELECT COUNT(*) AS num_configs
FROM phpbb_config';
$result = $db->sql_query($sql);
$this->assertEquals($num_configs, $db->sql_fetchfield('num_configs'));
$db->sql_freeresult($result);
}
public function insert_buffer_data() public function insert_buffer_data()
{ {
$db = $this->new_dbal(); $db = $this->new_dbal();
@ -45,11 +54,7 @@ class phpbb_dbal_sql_insert_buffer_test extends phpbb_database_test_case
$buffer = new phpbb_db_sql_insert_buffer($db, 'phpbb_config', 2); $buffer = new phpbb_db_sql_insert_buffer($db, 'phpbb_config', 2);
$sql = 'SELECT COUNT(*) AS num_configs $this->assert_config_count($db, 2);
FROM phpbb_config';
$result = $db->sql_query_limit($sql, 1);
$this->assertEquals(2, $db->sql_fetchfield('num_configs'));
$db->sql_freeresult($result);
// This call can be buffered // This call can be buffered
$buffer->insert(array( $buffer->insert(array(
@ -60,29 +65,17 @@ class phpbb_dbal_sql_insert_buffer_test extends phpbb_database_test_case
if ($db->multi_insert) if ($db->multi_insert)
{ {
$sql = 'SELECT COUNT(*) AS num_configs $this->assert_config_count($db, 2);
FROM phpbb_config';
$result = $db->sql_query_limit($sql, 1);
$this->assertEquals(2, $db->sql_fetchfield('num_configs'));
$db->sql_freeresult($result);
} }
else else
{ {
$sql = 'SELECT COUNT(*) AS num_configs $this->assert_config_count($db, 3);
FROM phpbb_config';
$result = $db->sql_query_limit($sql, 1);
$this->assertEquals(3, $db->sql_fetchfield('num_configs'));
$db->sql_freeresult($result);
} }
// Manually flush // Manually flush
$buffer->flush(); $buffer->flush();
$sql = 'SELECT COUNT(*) AS num_configs $this->assert_config_count($db, 3);
FROM phpbb_config';
$result = $db->sql_query_limit($sql, 1);
$this->assertEquals(3, $db->sql_fetchfield('num_configs'));
$db->sql_freeresult($result);
} }
/** /**
@ -95,11 +88,7 @@ class phpbb_dbal_sql_insert_buffer_test extends phpbb_database_test_case
$buffer = new phpbb_db_sql_insert_buffer($db, 'phpbb_config', 2); $buffer = new phpbb_db_sql_insert_buffer($db, 'phpbb_config', 2);
$sql = 'SELECT COUNT(*) AS num_configs $this->assert_config_count($db, 2);
FROM phpbb_config';
$result = $db->sql_query_limit($sql, 1);
$this->assertEquals(2, $db->sql_fetchfield('num_configs'));
$db->sql_freeresult($result);
$buffer->insert(array( $buffer->insert(array(
'config_name' => 'name1', 'config_name' => 'name1',
@ -114,11 +103,7 @@ class phpbb_dbal_sql_insert_buffer_test extends phpbb_database_test_case
'is_dynamic' => '0', 'is_dynamic' => '0',
)); ));
$sql = 'SELECT COUNT(*) AS num_configs $this->assert_config_count($db, 4);
FROM phpbb_config';
$result = $db->sql_query_limit($sql, 1);
$this->assertEquals(4, $db->sql_fetchfield('num_configs'));
$db->sql_freeresult($result);
} }
/** /**
@ -131,11 +116,7 @@ class phpbb_dbal_sql_insert_buffer_test extends phpbb_database_test_case
$buffer = new phpbb_db_sql_insert_buffer($db, 'phpbb_config', 2); $buffer = new phpbb_db_sql_insert_buffer($db, 'phpbb_config', 2);
$sql = 'SELECT COUNT(*) AS num_configs $this->assert_config_count($db, 2);
FROM phpbb_config';
$result = $db->sql_query_limit($sql, 1);
$this->assertEquals(2, $db->sql_fetchfield('num_configs'));
$db->sql_freeresult($result);
$buffer->insert_all(array( $buffer->insert_all(array(
array( array(
@ -157,20 +138,12 @@ class phpbb_dbal_sql_insert_buffer_test extends phpbb_database_test_case
if ($db->multi_insert) if ($db->multi_insert)
{ {
$sql = 'SELECT COUNT(*) AS num_configs $this->assert_config_count($db, 4);
FROM phpbb_config';
$result = $db->sql_query_limit($sql, 1);
$this->assertEquals(4, $db->sql_fetchfield('num_configs'));
$db->sql_freeresult($result);
// Manually flush // Manually flush
$buffer->flush(); $buffer->flush();
} }
$sql = 'SELECT COUNT(*) AS num_configs $this->assert_config_count($db, 5);
FROM phpbb_config';
$result = $db->sql_query_limit($sql, 1);
$this->assertEquals(5, $db->sql_fetchfield('num_configs'));
$db->sql_freeresult($result);
} }
} }