mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-olympus' into develop

Browse Source 
* develop-olympus:
  [ticket/10307] Add a test for PHPBB3-10307
  [ticket/10307] Return false in mysqli sql_fetchrow on empty result
This commit is contained in:
Andreas Fischer
2011-10-13 23:45:04 +02:00
parent 8c7be51bcc 4e69fe6859
commit 301f9d42f7
2 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tests/dbal/select_test.php
View File

@@ -319,7 +319,7 @@ class phpbb_dbal_select_test extends phpbb_database_test_case
$db->sql_freeresult($result);
}
function test_nested_transactions()
public function test_nested_transactions()
{
$db = $this->new_dbal();
@@ -341,4 +341,20 @@ class phpbb_dbal_select_test extends phpbb_database_test_case
$this->assertEquals('1', $row['user_id']);
}
/**
* fix for PHPBB3-10307
*/
public function test_sql_fetchrow_returns_false_when_empty()
{
$db = $this->new_dbal();
$sql = 'SELECT * FROM (SELECT 1) AS TBL WHERE 1 = 0';
$result = $db->sql_query($sql);
$row = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
$this->assertSame(false, $row);
}
}