Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Patch #652420 by sun: fixed some problems in the tests.

merge-requests/26/head
Dries Buytaert 2009-12-09 15:30:48 +00:00
parent 3254e88fde
commit 13dba19e6a
1 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
modules/simpletest/tests/database_test.test
View File

@ -1882,6 +1882,34 @@ class DatabaseSelectComplexTestCase extends DatabaseTestCase {
$this->assertEqual($count, 4, t('Counted the correct number of records.'));
}
/**
* Test that countQuery properly removes 'all_fields' statements and
* ordering clauses.
*/
function testCountQueryRemovals() {
$query = db_select('test');
$query->fields('test');
$query->orderBy('name');
$count = $query->countQuery();
// Check that the 'all_fields' statement is handled properly.
$tables = $query->getTables();
$this->assertEqual($tables['test']['all_fields'], 1, t('Query correctly sets \'all_fields\' statement.'));
$tables = $count->getTables();
$this->assertFalse(isset($tables['test']['all_fields']), t('Count query correctly unsets \'all_fields\' statement.'));
// Check that the ordering clause is handled properly.
$orderby = $query->getOrderBy();
$this->assertEqual($orderby['name'], 'ASC', t('Query correctly sets ordering clause.'));
$orderby = $count->getOrderBy();
$this->assertFalse(isset($orderby['name']), t('Count query correctly unsets ordering caluse.'));
// Make sure that the count query works.
$count = $count->execute()->fetchField();
$this->assertEqual($count, 4, t('Counted the correct number of records.'));
}
/**
* Confirm that we can properly nest conditional clauses.
*/