[ticket/11469] Do not repeat row generation.

PHPBB3-11469
This commit is contained in:
Andreas Fischer 2013-03-27 23:33:13 +01:00
parent 873f098b6c
commit b88eb3c8e0

View file

@ -24,11 +24,7 @@ class phpbb_dbal_sql_insert_buffer_test extends phpbb_database_test_case
$this->assert_config_count($db, 2);
// This call can be buffered
$this->assertTrue($buffer->insert(array(
'config_name' => 'name1',
'config_value' => 'value1',
'is_dynamic' => '0',
)));
$this->assertTrue($buffer->insert($this->get_row(1)));
$this->assert_config_count($db, 3);
@ -52,11 +48,7 @@ class phpbb_dbal_sql_insert_buffer_test extends phpbb_database_test_case
$this->assert_config_count($db, 2);
// This call can be buffered
$this->assertFalse($buffer->insert(array(
'config_name' => 'name1',
'config_value' => 'value1',
'is_dynamic' => '0',
)));
$this->assertFalse($buffer->insert($this->get_row(1)));
$this->assert_config_count($db, 2);
@ -75,18 +67,10 @@ class phpbb_dbal_sql_insert_buffer_test extends phpbb_database_test_case
$this->assert_config_count($db, 2);
$this->assertTrue($buffer->insert(array(
'config_name' => 'name1',
'config_value' => 'value1',
'is_dynamic' => '0',
)));
$this->assertTrue($buffer->insert($this->get_row(1)));
// This call flushes the values
$this->assertTrue($buffer->insert(array(
'config_name' => 'name2',
'config_value' => 'value2',
'is_dynamic' => '0',
)));
$this->assertTrue($buffer->insert($this->get_row(2)));
$this->assert_config_count($db, 4);
}
@ -104,18 +88,10 @@ class phpbb_dbal_sql_insert_buffer_test extends phpbb_database_test_case
$this->assert_config_count($db, 2);
$this->assertFalse($buffer->insert(array(
'config_name' => 'name1',
'config_value' => 'value1',
'is_dynamic' => '0',
)));
$this->assertFalse($buffer->insert($this->get_row(1)));
// This call flushes the values
$this->assertTrue($buffer->insert(array(
'config_name' => 'name2',
'config_value' => 'value2',
'is_dynamic' => '0',
)));
$this->assertTrue($buffer->insert($this->get_row(2)));
$this->assert_config_count($db, 4);
}
@ -166,24 +142,21 @@ class phpbb_dbal_sql_insert_buffer_test extends phpbb_database_test_case
$db->sql_freeresult($result);
}
protected function get_row($rownum)
{
return array(
'config_name' => "name$rownum",
'config_value' => "value$rownum",
'is_dynamic' => '0',
);
}
protected function get_three_rows()
{
return array(
array(
'config_name' => 'name1',
'config_value' => 'value1',
'is_dynamic' => '0',
),
array(
'config_name' => 'name2',
'config_value' => 'value2',
'is_dynamic' => '0',
),
array(
'config_name' => 'name3',
'config_value' => 'value3',
'is_dynamic' => '0',
),
$this->get_row(1),
$this->get_row(2),
$this->get_row(3),
);
}
}