- Patch #394524 by Berdir, Damien Tournoud: converted to the new database abstraction layer.

1 files changed, 5 insertions, 3 deletions

diff --git a/modules/simpletest/simpletest.module b/modules/simpletest/simpletest.module
index b8a4eb676..91d82aa86 100644
--- a/modules/simpletest/simpletest.module
+++ b/modules/simpletest/simpletest.module
@@ -102,7 +102,9 @@ function _simpletest_format_summary_line($summary) {
  */
 function simpletest_run_tests($test_list, $reporter = 'drupal') {
   cache_clear_all();
-  $test_id = db_insert('simpletest_test_id')->useDefaults(array('test_id'))->execute();
+  $test_id = db_insert('simpletest_test_id')
+    ->useDefaults(array('test_id'))
+    ->execute();
 
   // Get the info for the first test being run.
   $first_test = array_shift($test_list);
@@ -325,7 +327,7 @@ function simpletest_clean_temporary_directories() {
 function simpletest_clean_results_table($test_id = NULL) {
   if (variable_get('simpletest_clear_results', TRUE)) {
     if ($test_id) {
-      $count = db_result(db_query('SELECT COUNT(test_id) FROM {simpletest_test_id} WHERE test_id = :test_id', array(':test_id' => $test_id)));
+      $count = db_query('SELECT COUNT(test_id) FROM {simpletest_test_id} WHERE test_id = :test_id', array(':test_id' => $test_id))->fetchField();
 
       db_delete("simpletest")
         ->condition('test_id', $test_id)
@@ -335,7 +337,7 @@ function simpletest_clean_results_table($test_id = NULL) {
         ->execute();
     }
     else {
-      $count = db_result(db_query('SELECT COUNT(test_id) FROM {simpletest_test_id}'));
+      $count = db_query('SELECT COUNT(test_id) FROM {simpletest_test_id}')->fetchField();
 
       // Clear test results.
       db_delete("simpletest")->execute();