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

[feature/dbal-tests] Follow the coding guidelines and ...

Browse source 
resolved a bug caused by a missing order-by.

PHPBB3-9625
This commit is contained in:
Joas Schilling 2010-06-17 15:57:02 +02:00 • committed by Andreas Fischer
parent e3420de295
commit ef69f22698
1 changed files with 88 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

96
tests/dbal/dbal.php
View file

@ -302,10 +302,11 @@ class phpbb_dbal_test extends phpbb_database_test_case
$db->sql_return_on_error(true); $db->sql_return_on_error(true);
} }
$result = $db->sql_query('SELECT username_clean $sql = 'SELECT username_clean
FROM phpbb_users FROM phpbb_users
WHERE ' . $db->sql_build_array('SELECT', $assoc_ary) . ' WHERE ' . $db->sql_build_array('SELECT', $assoc_ary) . '
ORDER BY user_id ASC'); ORDER BY user_id ASC';
$result = $db->sql_query($sql);
if ($catch_error) if ($catch_error)
{ {
@ -340,11 +341,13 @@ class phpbb_dbal_test extends phpbb_database_test_case
{ {
$db = $this->new_dbal(); $db = $this->new_dbal();
$result = $db->sql_query('INSERT INTO phpbb_config ' . $db->sql_build_array('INSERT', $sql_ary)); $sql = 'INSERT INTO phpbb_config ' . $db->sql_build_array('INSERT', $sql_ary);
$result = $db->sql_query($sql);
$result = $db->sql_query_limit("SELECT * $sql = "SELECT *
FROM phpbb_config FROM phpbb_config
WHERE config_name = '" . $sql_ary['config_name'] . "'", 1); WHERE config_name = '" . $sql_ary['config_name'] . "'";
$result = $db->sql_query_limit($sql, 1);
$this->assertEquals($sql_ary, $db->sql_fetchrow($result)); $this->assertEquals($sql_ary, $db->sql_fetchrow($result));
@ -354,12 +357,20 @@ class phpbb_dbal_test extends phpbb_database_test_case
public static function delete_data() public static function delete_data()
{ {
return array( return array(
array("WHERE config_name = 'test_version'", array(array( array(
"WHERE config_name = 'test_version'",
array(
array(
'config_name' => 'second config', 'config_name' => 'second config',
'config_value' => '10', 'config_value' => '10',
'is_dynamic' => 0, 'is_dynamic' => 0,
))), ),
array('', array()), ),
),
array(
'',
array(),
),
); );
} }
@ -370,11 +381,13 @@ class phpbb_dbal_test extends phpbb_database_test_case
{ {
$db = $this->new_dbal(); $db = $this->new_dbal();
$result = $db->sql_query('DELETE FROM phpbb_config $sql = 'DELETE FROM phpbb_config
' . $where); ' . $where;
$result = $db->sql_query($sql);
$result = $db->sql_query('SELECT * $sql = 'SELECT *
FROM phpbb_config'); FROM phpbb_config';
$result = $db->sql_query($sql);
$this->assertEquals($expected, $db->sql_fetchrowset($result)); $this->assertEquals($expected, $db->sql_fetchrowset($result));
@ -385,22 +398,25 @@ class phpbb_dbal_test extends phpbb_database_test_case
{ {
$db = $this->new_dbal(); $db = $this->new_dbal();
$batch_ary = array(); $batch_ary = array(
$batch_ary[] = array( array(
'config_name' => 'batch one', 'config_name' => 'batch one',
'config_value' => 'b1', 'config_value' => 'b1',
'is_dynamic' => 0, 'is_dynamic' => 0,
); ),
$batch_ary[] = array( array(
'config_name' => 'batch two', 'config_name' => 'batch two',
'config_value' => 'b2', 'config_value' => 'b2',
'is_dynamic' => 1, 'is_dynamic' => 1,
),
); );
$result = $db->sql_multi_insert('phpbb_config', $batch_ary); $result = $db->sql_multi_insert('phpbb_config', $batch_ary);
$result = $db->sql_query('SELECT * $sql = 'SELECT *
FROM phpbb_config'); FROM phpbb_config
ORDER BY config_name ASC';
$result = $db->sql_query($sql);
$this->assertEquals($batch_ary, $db->sql_fetchrowset($result)); $this->assertEquals($batch_ary, $db->sql_fetchrowset($result));
@ -410,24 +426,44 @@ class phpbb_dbal_test extends phpbb_database_test_case
public static function update_data() public static function update_data()
{ {
return array( return array(
array(array('config_value' => '20', 'is_dynamic' => 0), " WHERE config_name = 'batch one'", array(array( array(
array(
'config_value' => '20',
'is_dynamic' => 0,
),
" WHERE config_name = 'batch one'",
array(
array(
'config_name' => 'batch one', 'config_name' => 'batch one',
'config_value' => '20', 'config_value' => '20',
'is_dynamic' => 0, 'is_dynamic' => 0,
), array( ),
array(
'config_name' => 'batch two', 'config_name' => 'batch two',
'config_value' => 'b2', 'config_value' => 'b2',
'is_dynamic' => 1, 'is_dynamic' => 1,
))), ),
array(array('config_value' => '0', 'is_dynamic' => 1), '', array(array( ),
),
array(
array(
'config_value' => '0',
'is_dynamic' => 1,
),
'',
array(
array(
'config_name' => 'batch one', 'config_name' => 'batch one',
'config_value' => '0', 'config_value' => '0',
'is_dynamic' => 1, 'is_dynamic' => 1,
), array( ),
array(
'config_name' => 'batch two', 'config_name' => 'batch two',
'config_value' => '0', 'config_value' => '0',
'is_dynamic' => 1, 'is_dynamic' => 1,
))), ),
),
),
); );
} }
@ -438,15 +474,17 @@ class phpbb_dbal_test extends phpbb_database_test_case
{ {
$db = $this->new_dbal(); $db = $this->new_dbal();
$result = $db->sql_query('UPDATE phpbb_config $sql = 'UPDATE phpbb_config
SET ' . $db->sql_build_array('UPDATE', $sql_ary) . $where); SET ' . $db->sql_build_array('UPDATE', $sql_ary) . $where;
$result = $db->sql_query($sql);
$result = $db->sql_query('SELECT * $sql = 'SELECT *
FROM phpbb_config'); FROM phpbb_config
ORDER BY config_name ASC';
$result = $db->sql_query($sql);
$this->assertEquals($expected, $db->sql_fetchrowset($result)); $this->assertEquals($expected, $db->sql_fetchrowset($result));
$db->sql_freeresult($result); $db->sql_freeresult($result);
} }
} }