1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00

Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/10653] Call get_row_count of base class in mysql get_estimated_row_count
  [ticket/9813] Only get posts table row count if we detected a fulltext index.
  [ticket/9813] Also use estimated row count of posts table for fulltext mysql.
  [ticket/10653] Fix parameter to substr() in unit tests. Should be 1, not -1.
  [ticket/10653] Unit tests for get_row_count() and get_estimated_row_count().
  [ticket/10653] Add ability to count table rows to database abstraction layer.
  [ticket/9813] Use table status row count only if greater than 100000 or exact.
  [ticket/9813] Use SHOW TABLE STATUS to get search stats for native on MySQL.
This commit is contained in:
Oleg Pudeyev
2012-03-08 08:44:32 -05:00
6 changed files with 203 additions and 16 deletions

View File

@@ -357,4 +357,29 @@ class phpbb_dbal_select_test extends phpbb_database_test_case
$this->assertSame(false, $row);
}
public function test_get_row_count()
{
$this->assertSame(
3,
(int) $this->new_dbal()->get_row_count('phpbb_users'),
"Failed asserting that user table has exactly 3 rows."
);
}
public function test_get_estimated_row_count()
{
$actual = $this->new_dbal()->get_estimated_row_count('phpbb_users');
if (is_string($actual) && isset($actual[0]) && $actual[0] === '~')
{
$actual = substr($actual, 1);
}
$this->assertGreaterThan(
1,
$actual,
"Failed asserting that estimated row count of user table is greater than 1."
);
}
}