Index: modules/simpletest/tests/database_test.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/database_test.test,v
retrieving revision 1.73
diff -u -p -r1.73 database_test.test
--- modules/simpletest/tests/database_test.test	23 Nov 2009 22:31:42 -0000	1.73
+++ modules/simpletest/tests/database_test.test	4 Dec 2009 21:56:06 -0000
@@ -1852,6 +1852,28 @@ class DatabaseSelectComplexTestCase exte
     $record = $query->execute()->fetch();
     $this->assertEqual($record->$name_field, 'George', t('Correct data retrieved.'));
     $this->assertEqual($record->$age_field, 27, t('Correct data retrieved.'));
+    
+    // We also want to test that countQuery properly removes 'all_fields'
+    // statements and ordering clauses.
+    $query = db_select('test');
+    $query->fields('test');
+    $query->orderBy('name');
+    $count = $query->countQuery();
+    
+    $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.'));  
+
+    $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 the count query works.
+    $count = $count->execute()->fetchField();
+
+    $this->assertEqual($count, 4, t('Counted the correct number of records.'));
   }
 
   /**