#308534 by Dave Reid: Remove stray whitespace core-wide.

1 files changed, 108 insertions, 109 deletions

diff --git a/modules/simpletest/tests/database_test.test b/modules/simpletest/tests/database_test.test
index 5ce1f8db1..17b838b71 100644
--- a/modules/simpletest/tests/database_test.test
+++ b/modules/simpletest/tests/database_test.test
@@ -7,12 +7,12 @@
  * PDO supports using a new instance of an arbitrary class for records
  * rather than just a stdClass or array.  This class is for testing that
  * functionality.  (See testQueryFetchClass() below)
- */ 
+ */
 class FakeRecord { }
 
 /**
  * Base test class for databases.
- * 
+ *
  * Because all database tests share the same test data, we can centralize that
  * here.
  */
@@ -27,10 +27,10 @@ class DatabaseTestCase extends DrupalWebTestCase {
       $schema['test_one_blob'] = drupal_get_schema('test_one_blob');
       $schema['test_two_blobs'] = drupal_get_schema('test_two_blobs');
       $schema['test_task'] = drupal_get_schema('test_task');
-  
+
       $ret = array();
-  
-      // This ends up being a test for table drop and create, too, which is 
+
+      // This ends up being a test for table drop and create, too, which is
       // nice.
       foreach ($schema as $name => $data) {
         if (db_table_exists($name)) {
@@ -38,11 +38,11 @@ class DatabaseTestCase extends DrupalWebTestCase {
         }
         db_create_table($ret, $name, $data);
       }
-  
+
       foreach ($schema as $name => $data) {
         $this->assertTrue(db_table_exists($name), t('Table @name created successfully.', array('@name' => $name)));
       }
-      
+
       $this->addSampleData();
     }
     catch (Exception $e) {
@@ -53,7 +53,7 @@ class DatabaseTestCase extends DrupalWebTestCase {
   /**
    * Setup our sample data.
    *
-   * These are added using db_query(), since we're not trying to test the 
+   * These are added using db_query(), since we're not trying to test the
    * INSERT operations here, just populate.
    */
   function addSampleData() {
@@ -69,38 +69,38 @@ class DatabaseTestCase extends DrupalWebTestCase {
     db_query("INSERT INTO {test_people} (name, age, job) VALUES ('Meredith', 30, 'Speaker')");
 
     db_query("INSERT INTO {test_task} (pid, task, priority) VALUES (:pid, :task, :priority)", array(
-      ':pid' => $john, 
-      ':task' => 'eat', 
+      ':pid' => $john,
+      ':task' => 'eat',
       ':priority' => 3,
     ));
     db_query("INSERT INTO {test_task} (pid, task, priority) VALUES (:pid, :task, :priority)", array(
-      ':pid' => $john, 
-      ':task' => 'sleep', 
+      ':pid' => $john,
+      ':task' => 'sleep',
       ':priority' => 4,
     ));
     db_query("INSERT INTO {test_task} (pid, task, priority) VALUES (:pid, :task, :priority)", array(
-      ':pid' => $john, 
-      ':task' => 'code', 
+      ':pid' => $john,
+      ':task' => 'code',
       ':priority' => 1,
     ));
     db_query("INSERT INTO {test_task} (pid, task, priority) VALUES (:pid, :task, :priority)", array(
-      ':pid' => $george, 
-      ':task' => 'sing', 
+      ':pid' => $george,
+      ':task' => 'sing',
       ':priority' => 2,
     ));
     db_query("INSERT INTO {test_task} (pid, task, priority) VALUES (:pid, :task, :priority)", array(
-      ':pid' => $george, 
-      ':task' => 'sleep', 
+      ':pid' => $george,
+      ':task' => 'sleep',
       ':priority' => 2,
     ));
     db_query("INSERT INTO {test_task} (pid, task, priority) VALUES (:pid, :task, :priority)", array(
-      ':pid' => $paul, 
-      ':task' => 'found new band', 
+      ':pid' => $paul,
+      ':task' => 'found new band',
       ':priority' => 1,
     ));
     db_query("INSERT INTO {test_task} (pid, task, priority) VALUES (:pid, :task, :priority)", array(
-      ':pid' => $paul, 
-      ':task' => 'perform at superbowl', 
+      ':pid' => $paul,
+      ':task' => 'perform at superbowl',
       ':priority' => 3,
     ));
   }
@@ -109,11 +109,11 @@ class DatabaseTestCase extends DrupalWebTestCase {
 
 /**
  * Test fetch actions, part 1.
- * 
+ *
  * We get timeout errors if we try to run too many tests at once.
  */
 class DatabaseFetchTestCase extends DatabaseTestCase {
-  
+
   function getInfo() {
     return array(
       'name' => t('Fetch tests'),
@@ -191,7 +191,7 @@ class DatabaseFetchTestCase extends DatabaseTestCase {
 
 /**
  * Test fetch actions, part 2.
- * 
+ *
  * We get timeout errors if we try to run too many tests at once.
  */
 class DatabaseFetch2TestCase extends DatabaseTestCase {
@@ -241,7 +241,7 @@ class DatabaseFetch2TestCase extends DatabaseTestCase {
 
   /**
    * Confirm that we can fetch an entire column of a result set at once.
-   */ 
+   */
   function testQueryFetchCol() {
     $records = array();
     $result = db_query("SELECT name FROM {test} WHERE age > :age", array(':age' => 25));
@@ -276,7 +276,7 @@ class DatabaseInsertTestCase extends DatabaseTestCase {
   function testSimpleInsert() {
     try {
       $num_records_before = db_query("SELECT COUNT(*) FROM {test}")->fetchField();
-  
+
       $query = db_insert('test');
       $query->fields(array(
         'name' => 'Yoko',
@@ -286,7 +286,7 @@ class DatabaseInsertTestCase extends DatabaseTestCase {
 
       $num_records_after = db_query("SELECT COUNT(*) FROM {test}")->fetchField();
       $this->assertIdentical($num_records_before + 1, (int)$num_records_after, t('Record inserts correctly.'));
-  
+
       $saved_age = db_query("SELECT age FROM {test} WHERE name = :name", array(':name' => 'Yoko'))->fetchField();
       $this->assertIdentical($saved_age, '29', t('Can retrieve after inserting.'));
     }
@@ -301,24 +301,24 @@ class DatabaseInsertTestCase extends DatabaseTestCase {
   function testMultiInsert() {
   	try {
       $num_records_before = (int) db_query("SELECT COUNT(*) FROM {test}")->fetchField();
-  
+
       $query = db_insert('test');
       $query->fields(array(
         'name' => 'Larry',
         'age' => '30',
       ));
-  
+
       // We should be able to specify values in any order if named.
       $query->values(array(
         'age' => '31',
         'name' => 'Curly',
       ));
-  
+
       // We should be able to say "use the field order".
       // This is not the recommended mechanism for most cases, but it should work.
       $query->values(array('Moe', '32'));
       $query->execute();
-  
+
       $num_records_after = (int) db_query("SELECT COUNT(*) FROM {test}")->fetchField();
       $this->assertIdentical($num_records_before + 3, $num_records_after, t('Record inserts correctly.'));
       $saved_age = db_query("SELECT age FROM {test} WHERE name = :name", array(':name' => 'Larry'))->fetchField();
@@ -339,26 +339,26 @@ class DatabaseInsertTestCase extends DatabaseTestCase {
   function testRepeatedInsert() {
     try {
       $num_records_before = db_query("SELECT COUNT(*) FROM {test}")->fetchField();
-  
+
       $query = db_insert('test');
-  
+
       $query->fields(array(
         'name' => 'Larry',
         'age' => '30',
       ));
       $query->execute();  // This should run the insert, but leave the fields intact.
-  
+
       // We should be able to specify values in any order if named.
       $query->values(array(
         'age' => '31',
         'name' => 'Curly',
       ));
       $query->execute();
-  
+
       // We should be able to say "use the field order".
       $query->values(array('Moe', '32'));
       $query->execute();
-  
+
       $num_records_after = db_query("SELECT COUNT(*) FROM {test}")->fetchField();
       $this->assertIdentical((int) $num_records_before + 3, (int) $num_records_after, t('Record inserts correctly.'));
       $saved_age = db_query("SELECT age FROM {test} WHERE name = :name", array(':name' => 'Larry'))->fetchField();
@@ -399,7 +399,7 @@ class DatabaseInsertTestCase extends DatabaseTestCase {
           'age' => '30',
         ))
         ->execute();
-      
+
       $this->assertIdentical($id, '5', t('Auto-increment ID returned successfully.'));
   	}
     catch (Exception $e) {
@@ -438,7 +438,7 @@ class DatabaseInsertLOBTestCase extends DatabaseTestCase {
    */
   function testInsertMultipleBlob() {
     $id = db_insert('test_two_blobs')->fields(array(
-      'blob1' => 'This is', 
+      'blob1' => 'This is',
       'blob2' => 'a test',
       ))
     ->execute();
@@ -460,7 +460,7 @@ class DatabaseInsertDefaultsTestCase extends DatabaseTestCase {
       'group' => t('Database'),
     );
   }
- 
+
   /**
    * Test that we can run a query that is "default values for everything".
    */
@@ -468,9 +468,9 @@ class DatabaseInsertDefaultsTestCase extends DatabaseTestCase {
     try {
       $query = db_insert('test')->useDefaults(array('job'));
       $id = $query->execute();
-      
+
       $schema = drupal_get_schema('test');
-      
+
       $job = db_query("SELECT job FROM {test} WHERE id = :id", array(':id' => $id))->fetchField();
       $this->assertEqual($job, $schema['fields']['job']['default'], t('Default field value is set.'));
     }
@@ -486,9 +486,9 @@ class DatabaseInsertDefaultsTestCase extends DatabaseTestCase {
     try {
       $query = db_insert('test')->fields(array('name' => 'Bob'))->useDefaults(array('job'));
       $id = $query->execute();
-      
+
       $schema = drupal_get_schema('test');
-      
+
       $job = db_query("SELECT job FROM {test} WHERE id = :id", array(':id' => $id))->fetchField();
       $this->assertEqual($job, $schema['fields']['job']['default'], t('Default field value is set.'));
     }
@@ -521,7 +521,7 @@ class DatabaseUpdateTestCase extends DatabaseTestCase {
     $saved_name = db_query("SELECT name FROM {test} WHERE id = :id", array(':id' => 1))->fetchField();
     $this->assertIdentical($saved_name, 'Tiffany', t('Updated name successfully.'));
   }
-  
+
   /**
    * Confirm that we can update a multiple records successfully.
    */
@@ -633,7 +633,7 @@ class DatabaseUpdateComplexTestCase extends DatabaseTestCase {
         ->condition('age', array(25, 26), 'BETWEEN')
         ->execute();
       $this->assertIdentical($num_updated, 2, t('Updated 2 records.'));
-  
+
       $num_matches = db_query("SELECT count(*) FROM {test} WHERE job = :job", array(':job' => 'Musician'))->fetchField();
       $this->assertIdentical($num_matches, '2', t('Updated fields successfully.'));
     }
@@ -668,10 +668,10 @@ class DatabaseUpdateComplexTestCase extends DatabaseTestCase {
         ->expression('age', 'age + :age',array(':age' => 4))
         ->execute();
       $this->assertIdentical($num_updated, 1, t('Updated 1 record.'));
-  
+
       $num_matches = db_query("SELECT count(*) FROM {test} WHERE job = :job", array(':job' => 'Musician'))->fetchField();
       $this->assertIdentical($num_matches, '1', t('Updated fields successfully.'));
-      
+
       $person = db_query("SELECT * FROM {test} WHERE name = :name", array(':name' => 'Ringo'))->fetch();
       $this->assertEqual($person->name, 'Ringo', t('Name set correctly.'));
       $this->assertEqual($person->age, $before_age + 4, t('Age set correctly.'));
@@ -712,13 +712,13 @@ class DatabaseUpdateLOBTestCase extends DatabaseTestCase {
     $r = db_fetch_array($res);
     $this->assertTrue($r['blob1'] === $data, t('Can update a blob: id @id, @data.', array('@id' => $id, '@data' => serialize($r))));
   }
-  
+
   /**
    * Confirm that we can update two blob columns in the same table.
    */
   function testUpdateMultipleBlob() {
     $id = db_insert('test_two_blobs')->fields(array(
-        'blob1' => 'This is', 
+        'blob1' => 'This is',
         'blob2' => 'a test')
       )
       ->execute();
@@ -782,18 +782,18 @@ class DatabaseMergeTestCase extends DatabaseTestCase {
   function testMergeInsert() {
     try{
       $num_records_before = db_query("SELECT COUNT(*) FROM {test_people}")->fetchField();
-  
+
       db_merge('test_people')
         ->key(array('job' => 'Presenter'))
         ->fields(array(
-          'age' => 31, 
+          'age' => 31,
           'name' => 'Tiffany',
         ))
         ->execute();
 
       $num_records_after = db_query("SELECT COUNT(*) FROM {test_people}")->fetchField();
       $this->assertEqual($num_records_before + 1, $num_records_after, t('Merge inserted properly.'));
-      
+
       $person = db_query("SELECT * FROM {test_people} WHERE job = :job", array(':job' => 'Presenter'))->fetch();
       $this->assertEqual($person->name, 'Tiffany', t('Name set correctly.'));
       $this->assertEqual($person->age, 31, t('Age set correctly.'));
@@ -814,7 +814,7 @@ class DatabaseMergeTestCase extends DatabaseTestCase {
 
     $num_records_after = db_query("SELECT COUNT(*) FROM {test_people}")->fetchField();
     $this->assertEqual($num_records_before, $num_records_after, t('Merge updated properly.'));
-    
+
     $person = db_query("SELECT * FROM {test_people} WHERE job = :job", array(':job' => 'Speaker'))->fetch();
     $this->assertEqual($person->name, 'Tiffany', t('Name set correctly.'));
     $this->assertEqual($person->age, 31, t('Age set correctly.'));
@@ -831,7 +831,7 @@ class DatabaseMergeTestCase extends DatabaseTestCase {
 
     $num_records_after = db_query("SELECT COUNT(*) FROM {test_people}")->fetchField();
     $this->assertEqual($num_records_before, $num_records_after, t('Merge updated properly.'));
-    
+
     $person = db_query("SELECT * FROM {test_people} WHERE job = :job", array(':job' => 'Speaker'))->fetch();
     $this->assertEqual($person->name, 'Tiffany', t('Name set correctly.'));
     $this->assertEqual($person->age, 30, t('Age skipped correctly.'));
@@ -848,7 +848,7 @@ class DatabaseMergeTestCase extends DatabaseTestCase {
 
     $num_records_after = db_query("SELECT COUNT(*) FROM {test_people}")->fetchField();
     $this->assertEqual($num_records_before, $num_records_after, t('Merge updated properly.'));
-    
+
     $person = db_query("SELECT * FROM {test_people} WHERE job = :job", array(':job' => 'Speaker'))->fetch();
     $this->assertEqual($person->name, 'Joe', t('Name set correctly.'));
     $this->assertEqual($person->age, 30, t('Age skipped correctly.'));
@@ -863,7 +863,7 @@ class DatabaseMergeTestCase extends DatabaseTestCase {
 
     $age_before = db_query("SELECT age FROM {test_people} WHERE job = 'Speaker'")->fetchField();
 
-    // This is a very contrived example, as I have no idea why you'd want to 
+    // This is a very contrived example, as I have no idea why you'd want to
     // change age this way, but that's beside the point.
     // Note that we are also double-setting age here, once as a literal and
     // once as an expression.  This test will only pass if the expression wins,
@@ -876,7 +876,7 @@ class DatabaseMergeTestCase extends DatabaseTestCase {
 
     $num_records_after = db_query("SELECT COUNT(*) FROM {test_people}")->fetchField();
     $this->assertEqual($num_records_before, $num_records_after, t('Merge updated properly.'));
-    
+
     $person = db_query("SELECT * FROM {test_people} WHERE job = :job", array(':job' => 'Speaker'))->fetch();
     $this->assertEqual($person->name, 'Tiffany', t('Name set correctly.'));
     $this->assertEqual($person->age, $age_before + 4, t('Age updated correctly.'));
@@ -907,12 +907,12 @@ class DatabaseSelectTestCase extends DatabaseTestCase {
       $name_field = $query->addField('test', 'name');
       $age_field = $query->addField('test', 'age', 'age');
       $result = $query->execute();
-      
+
       $num_records = 0;
       foreach ($result as $record) {
         $num_records++;
       }
-      
+
       $this->assertEqual($num_records, 4, t('Returned the correct number of rows.'));
     }
     catch(Exception $e) {
@@ -929,11 +929,11 @@ class DatabaseSelectTestCase extends DatabaseTestCase {
     $age_field = $query->addField('test', 'age', 'age');
     $query->condition('age', 27);
     $result = $query->execute();
-    
+
     // Check that the aliases are being created the way we want.
     $this->assertEqual($name_field, 'test_name', t('Name field alias is correct.'));
     $this->assertEqual($age_field, 'age', t('Age field alias is correct.'));
-    
+
     // Ensure that we got the right record.
     $record = $result->fetch();
     $this->assertEqual($record->$name_field, 'George', t('Fetched name is correct.'));
@@ -949,11 +949,11 @@ class DatabaseSelectTestCase extends DatabaseTestCase {
     $age_field = $query->addExpression("age*2", 'double_age');
     $query->condition('age', 27);
     $result = $query->execute();
-    
+
     // Check that the aliases are being created the way we want.
     $this->assertEqual($name_field, 'test_name', t('Name field alias is correct.'));
     $this->assertEqual($age_field, 'double_age', t('Age field alias is correct.'));
-    
+
     // Ensure that we got the right record.
     $record = $result->fetch();
     $this->assertEqual($record->$name_field, 'George', t('Fetched name is correct.'));
@@ -984,7 +984,7 @@ class DatabaseSelectOrderedTestCase extends DatabaseTestCase {
       $age_field = $query->addField('test', 'age', 'age');
       $query->orderBy($age_field);
       $result = $query->execute();
-      
+
       $num_records = 0;
       $last_age = 0;
       foreach ($result as $record) {
@@ -992,7 +992,7 @@ class DatabaseSelectOrderedTestCase extends DatabaseTestCase {
         $this->assertTrue($record->age >= $last_age, t('Results returned in correct order.'));
         $last_age = $record->age;
       }
-      
+
       $this->assertEqual($num_records, 4, t('Returned the correct number of rows.'));
     }
     catch(Exception $e) {
@@ -1012,7 +1012,7 @@ class DatabaseSelectOrderedTestCase extends DatabaseTestCase {
       $query->orderBy($job_field);
       $query->orderBy($age_field);
       $result = $query->execute();
-      
+
       $num_records = 0;
       $expected = array(
         array('Ringo', 28, 'Drummer'),
@@ -1047,7 +1047,7 @@ class DatabaseSelectOrderedTestCase extends DatabaseTestCase {
       $age_field = $query->addField('test', 'age', 'age');
       $query->orderBy($age_field, 'DESC');
       $result = $query->execute();
-      
+
       $num_records = 0;
       $last_age = 100000000;
       foreach ($result as $record) {
@@ -1055,7 +1055,7 @@ class DatabaseSelectOrderedTestCase extends DatabaseTestCase {
         $this->assertTrue($record->age <= $last_age, t('Results returned in correct order.'));
         $last_age = $record->age;
       }
-      
+
       $this->assertEqual($num_records, 4, t('Returned the correct number of rows.'));
     }
     catch(Exception $e) {
@@ -1087,10 +1087,10 @@ class DatabaseSelectComplexTestCase extends DatabaseTestCase {
       $name_field = $query->addField($people_alias, 'name', 'name');
       $task_field = $query->addField('t', 'task', 'task');
       $priority_field = $query->addField('t', 'priority', 'priority');
-      
+
       $query->orderBy($priority_field);
       $result = $query->execute();
-      
+
       $num_records = 0;
       $last_priority = 0;
       foreach ($result as $record) {
@@ -1099,7 +1099,7 @@ class DatabaseSelectComplexTestCase extends DatabaseTestCase {
         $this->assertNotEqual($record->$name_field, 'Ringo', t('Taskless person not selected.'));
         $last_priority = $record->$priority_field;
       }
-      
+
       $this->assertEqual($num_records, 7, t('Returned the correct number of rows.'));
     }
     catch(Exception $e) {
@@ -1117,19 +1117,19 @@ class DatabaseSelectComplexTestCase extends DatabaseTestCase {
       $name_field = $query->addField('p', 'name', 'name');
       $task_field = $query->addField($people_alias, 'task', 'task');
       $priority_field = $query->addField($people_alias, 'priority', 'priority');
-      
+
       $query->orderBy($name_field);
       $result = $query->execute();
-      
+
       $num_records = 0;
       $last_name = 0;
-      
+
       foreach ($result as $record) {
         $num_records++;
         $this->assertTrue(strcmp($record->$name_field, $last_name) >= 0, t('Results returned in correct order.'));
         $last_priority = $record->$name_field;
       }
-      
+
       $this->assertEqual($num_records, 8, t('Returned the correct number of rows.'));
     }
     catch(Exception $e) {
@@ -1148,7 +1148,7 @@ class DatabaseSelectComplexTestCase extends DatabaseTestCase {
       $query->orderBy($count_field);
       $query->groupBy($task_field);
       $result = $query->execute();
-      
+
       $num_records = 0;
       $last_count = 0;
       $records = array();
@@ -1158,7 +1158,7 @@ class DatabaseSelectComplexTestCase extends DatabaseTestCase {
         $last_count = $record->$count_field;
         $records[$record->$task_field] = $record->$count_field;
       }
-      
+
       $correct_results = array(
         'eat' => 1,
         'sleep' => 2,
@@ -1166,7 +1166,7 @@ class DatabaseSelectComplexTestCase extends DatabaseTestCase {
         'found new band' => 1,
         'perform at superbowl' => 1,
       );
-      
+
       foreach ($correct_results as $task => $count) {
         $this->assertEqual($records[$task], $count, t("Correct number of '@task' records found.", array('@task' => $task)));
       }
@@ -1190,7 +1190,7 @@ class DatabaseSelectComplexTestCase extends DatabaseTestCase {
       $query->groupBy($task_field);
       $query->havingCondition('COUNT(task)', 2, '>=');
       $result = $query->execute();
-      
+
       $num_records = 0;
       $last_count = 0;
       $records = array();
@@ -1201,11 +1201,11 @@ class DatabaseSelectComplexTestCase extends DatabaseTestCase {
         $last_count = $record->$count_field;
         $records[$record->$task_field] = $record->$count_field;
       }
-      
+
       $correct_results = array(
         'sleep' => 2,
       );
-      
+
       foreach ($correct_results as $task => $count) {
         $this->assertEqual($records[$task], $count, t("Correct number of '@task' records found.", array('@task' => $task)));
       }
@@ -1227,12 +1227,12 @@ class DatabaseSelectComplexTestCase extends DatabaseTestCase {
       $age_field = $query->addField('test', 'age', 'age');
       $query->range(0, 2);
       $result = $query->execute();
-      
+
       $num_records = 0;
       foreach ($result as $record) {
         $num_records++;
       }
-      
+
       $this->assertEqual($num_records, 2, t('Returned the correct number of rows.'));
     }
     catch(Exception $e) {
@@ -1249,12 +1249,12 @@ class DatabaseSelectComplexTestCase extends DatabaseTestCase {
       $task_field = $query->addField('test_task', 'task');
       $query->distinct();
       $result = $query->execute();
-      
+
       $num_records = 0;
       foreach ($result as $record) {
         $num_records++;
       }
-      
+
       $this->assertEqual($num_records, 6, t('Returned the correct number of rows.'));
     }
     catch(Exception $e) {
@@ -1271,11 +1271,11 @@ class DatabaseSelectComplexTestCase extends DatabaseTestCase {
       $name_field = $query->addField('test', 'name');
       $age_field = $query->addField('test', 'age', 'age');
       $query->orderBy('name');
-      
+
       $count = $query->countQuery()->execute()->fetchField();
-      
+
       $this->assertEqual($count, 4, t('Counted the correct number of records.'));
-      
+
       // Now make sure we didn't break the original query!  We should still have
       // all of the fields we asked for.
       $record = $query->execute()->fetch();
@@ -1290,7 +1290,7 @@ class DatabaseSelectComplexTestCase extends DatabaseTestCase {
 
 /**
  * Select tagging tests.
- * 
+ *
  * Tags are a way to flag queries for alter hooks so they know
  * what type of query it is, such as "node_access".
  */
@@ -1312,9 +1312,9 @@ class DatabaseTaggingTestCase extends DatabaseTestCase {
       $query = db_select('test');
       $query->addField('test', 'name');
       $query->addField('test', 'age', 'age');
-      
+
       $query->addTag('test');
-      
+
       $this->assertTrue($query->hasTag('test'), t('hasTag() returned true.'));
       $this->assertFalse($query->hasTag('other'), t('hasTag() returned false.'));
     }
@@ -1331,10 +1331,10 @@ class DatabaseTaggingTestCase extends DatabaseTestCase {
       $query = db_select('test');
       $query->addField('test', 'name');
       $query->addField('test', 'age', 'age');
-      
+
       $query->addTag('test');
       $query->addTag('other');
-      
+
       $this->assertTrue($query->hasAllTags('test', 'other'), t('hasAllTags() returned true.'));
       $this->assertFalse($query->hasAllTags('test', 'stuff'), t('hasAllTags() returned false.'));
     }
@@ -1351,9 +1351,9 @@ class DatabaseTaggingTestCase extends DatabaseTestCase {
       $query = db_select('test');
       $query->addField('test', 'name');
       $query->addField('test', 'age', 'age');
-      
+
       $query->addTag('test');
-      
+
       $this->assertTrue($query->hasAnyTag('test', 'other'), t('hasAnyTag() returned true.'));
       $this->assertFalse($query->hasAnyTag('other', 'stuff'), t('hasAnyTag() returned false.'));
     }
@@ -1364,7 +1364,7 @@ class DatabaseTaggingTestCase extends DatabaseTestCase {
 
   /**
    * Test that we can attach meta data to a query object.
-   * 
+   *
    * This is how we pass additional context to alter hooks.
    */
   function testMetaData() {
@@ -1372,17 +1372,17 @@ class DatabaseTaggingTestCase extends DatabaseTestCase {
       $query = db_select('test');
       $query->addField('test', 'name');
       $query->addField('test', 'age', 'age');
-      
+
       $data = array(
         'a' => 'A',
         'b' => 'B',
       );
-      
+
       $query->addMetaData('test', $data);
-      
+
       $return = $query->getMetaData('test');
       $this->assertEqual($data, $return, t('Corect metadata returned.'));
-      
+
       $return = $query->getMetaData('nothere');
       $this->assertNull($return, t('Non-existant key returned NULL.'));
     }
@@ -1394,7 +1394,7 @@ class DatabaseTaggingTestCase extends DatabaseTestCase {
 
 /**
  * Select alter tests.
- * 
+ *
  * @see database_test_query_alter().
  */
 class DatabaseAlterTestCase extends DatabaseTestCase {
@@ -1423,7 +1423,7 @@ class DatabaseAlterTestCase extends DatabaseTestCase {
       foreach ($result as $record) {
         $num_records++;
       }
-      
+
       $this->assertEqual($num_records, 2, t('Returned the correct number of rows.'));
     }
     catch(Exception $e) {
@@ -1445,9 +1445,9 @@ class DatabaseAlterTestCase extends DatabaseTestCase {
       $result = $query->execute();
 
       $records = $result->fetchAll();
-      
+
       $this->assertEqual(count($records), 2, t('Returned the correct number of rows.'));
-      
+
       $this->assertEqual($records[0]->name, 'George', t('Correct data retrieved.'));
       $this->assertEqual($records[0]->$tid_field, 4, t('Correct data retrieved.'));
       $this->assertEqual($records[0]->$task_field, 'sing', t('Correct data retrieved.'));
@@ -1493,7 +1493,7 @@ class DatabaseAlterTestCase extends DatabaseTestCase {
 
 /**
  * Select alter tests, part 2.
- * 
+ *
  * @see database_test_query_alter().
  */
 class DatabaseAlter2TestCase extends DatabaseTestCase {
@@ -1516,7 +1516,7 @@ class DatabaseAlter2TestCase extends DatabaseTestCase {
       $age_field = $query->addField('test', 'age', 'age');
       $query->orderBy('name');
       $query->addTag('database_test_alter_change_fields');
-      
+
       $record = $query->execute()->fetch();
       $this->assertEqual($record->$name_field, 'George', t('Correct data retrieved.'));
       $this->assertFalse(isset($record->$age_field), t('Age field not found, as intended.'));
@@ -1537,7 +1537,7 @@ class DatabaseAlter2TestCase extends DatabaseTestCase {
       $query->condition('age', 27);
       $query->addTag('database_test_alter_change_expressions');
       $result = $query->execute();
-      
+
       // Ensure that we got the right record.
       $record = $result->fetch();
 
@@ -1569,4 +1569,3 @@ class DatabaseAlter2TestCase extends DatabaseTestCase {
     }
   }
 }
-