Index: modules/aggregator/aggregator.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.admin.inc,v
retrieving revision 1.16
diff -u -p -r1.16 aggregator.admin.inc
--- modules/aggregator/aggregator.admin.inc	17 Sep 2008 07:11:56 -0000	1.16
+++ modules/aggregator/aggregator.admin.inc	20 Oct 2008 10:12:20 -0000
@@ -26,7 +26,7 @@ function aggregator_view() {
 
   $header = array(t('Title'), t('Items'), t('Last update'), t('Next update'), array('data' => t('Operations'), 'colspan' => '3'));
   $rows = array();
-  while ($feed = db_fetch_object($result)) {
+  foreach ($result as $feed) {
     $rows[] = array(l($feed->title, "aggregator/sources/$feed->fid"), format_plural($feed->items, '1 item', '@count items'), ($feed->checked ? t('@time ago', array('@time' => format_interval(REQUEST_TIME - $feed->checked))) : t('never')), ($feed->checked ? t('%time left', array('%time' => format_interval($feed->checked + $feed->refresh - REQUEST_TIME))) : t('never')), l(t('edit'), "admin/content/aggregator/edit/feed/$feed->fid"), l(t('remove items'), "admin/content/aggregator/remove/$feed->fid"), l(t('update items'), "admin/content/aggregator/update/$feed->fid"));
   }
   $output .= theme('table', $header, $rows);
@@ -37,7 +37,7 @@ function aggregator_view() {
 
   $header = array(t('Title'), t('Items'), t('Operations'));
   $rows = array();
-  while ($category = db_fetch_object($result)) {
+  foreach ($result as $category) {
     $rows[] = array(l($category->title, "aggregator/categories/$category->cid"), format_plural($category->items, '1 item', '@count items'), l(t('edit'), "admin/content/aggregator/edit/category/$category->cid"));
   }
   $output .= theme('table', $header, $rows);
@@ -89,8 +89,8 @@ function aggregator_form_feed(&$form_sta
   // Handling of categories.
   $options = array();
   $values = array();
-  $categories = db_query('SELECT c.cid, c.title, f.fid FROM {aggregator_category} c LEFT JOIN {aggregator_category_feed} f ON c.cid = f.cid AND f.fid = %d ORDER BY title', $edit['fid']);
-  while ($category = db_fetch_object($categories)) {
+  $categories = db_query('SELECT c.cid, c.title, f.fid FROM {aggregator_category} c LEFT JOIN {aggregator_category_feed} f ON c.cid = f.cid AND f.fid = :fid ORDER BY title', array(':fid' => $edit['fid']));
+  foreach ($categories as $category) {
     $options[$category->cid] = check_plain($category->title);
     if ($category->fid) $values[] = $category->cid;
   }
@@ -133,12 +133,12 @@ function aggregator_form_feed_validate($
     }
     // Check for duplicate titles.
     if (isset($form_state['values']['fid'])) {
-      $result = db_query("SELECT title, url FROM {aggregator_feed} WHERE (title = '%s' OR url = '%s') AND fid <> %d", $form_state['values']['title'], $form_state['values']['url'], $form_state['values']['fid']);
+      $result = db_query("SELECT title, url FROM {aggregator_feed} WHERE (title = :title OR url = :url) AND fid <> :fid", array(':title' => $form_state['values']['title'], ':url' => $form_state['values']['url'], ':fid' => $form_state['values']['fid']));
     }
     else {
-      $result = db_query("SELECT title, url FROM {aggregator_feed} WHERE title = '%s' OR url = '%s'", $form_state['values']['title'], $form_state['values']['url']);
+      $result = db_query("SELECT title, url FROM {aggregator_feed} WHERE title = :title OR url = :url", array(':title' => $form_state['values']['title'], ':url' => $form_state['values']['url']));
     }
-    while ($feed = db_fetch_object($result)) {
+    foreach ($result as $feed) {
       if (strcasecmp($feed->title, $form_state['values']['title']) == 0) {
         form_set_error('title', t('A feed named %feed already exists. Please enter a unique title.', array('%feed' => $form_state['values']['title'])));
       }
@@ -256,11 +256,7 @@ function aggregator_form_opml(&$form_sta
   );
 
   // Handling of categories.
-  $options = array();
-  $categories = db_query('SELECT cid, title FROM {aggregator_category} ORDER BY title');
-  while ($category = db_fetch_object($categories)) {
-    $options[$category->cid] = check_plain($category->title);
-  }
+  $options = array_map('check_plain', db_query("SELECT cid, title FROM {aggregator_category} ORDER BY title")->fetchAllKeyed());
   if ($options) {
     $form['category'] = array(
       '#type' => 'checkboxes',
@@ -323,8 +319,8 @@ function aggregator_form_opml_submit($fo
     }
 
     // Check for duplicate titles or URLs.
-    $result = db_query("SELECT title, url FROM {aggregator_feed} WHERE title = '%s' OR url = '%s'", $feed['title'], $feed['url']);
-    while ($old = db_fetch_object($result)) {
+    $result = db_query("SELECT title, url FROM {aggregator_feed} WHERE title = :title OR url = :url", array(':title' => $feed['title'], ':url' => $feed['url']));
+    foreach ($result as $old) {
       if (strcasecmp($old->title, $feed['title']) == 0) {
         drupal_set_message(t('A feed named %title already exists.', array('%title' => $old->title)), 'warning');
         continue 2;
@@ -458,10 +454,10 @@ function aggregator_form_category_valida
   if ($form_state['values']['op'] == t('Save')) {
     // Check for duplicate titles
     if (isset($form_state['values']['cid'])) {
-      $category = db_fetch_object(db_query("SELECT cid FROM {aggregator_category} WHERE title = '%s' AND cid <> %d", $form_state['values']['title'], $form_state['values']['cid']));
+      $category = db_query("SELECT cid FROM {aggregator_category} WHERE title = :title AND cid <> :cid", array(':title' => $form_state['values']['title'], ':cid' => $form_state['values']['cid']))->fetchObject();
     }
     else {
-      $category = db_fetch_object(db_query("SELECT cid FROM {aggregator_category} WHERE title = '%s'", $form_state['values']['title']));
+      $category = db_query("SELECT cid FROM {aggregator_category} WHERE title = :title", array(':title' => $form_state['values']['title']))->fetchObject();
     }
     if ($category) {
       form_set_error('title', t('A category named %category already exists. Please enter a unique title.', array('%category' => $form_state['values']['title'])));
Index: modules/aggregator/aggregator.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.module,v
retrieving revision 1.395
diff -u -p -r1.395 aggregator.module
--- modules/aggregator/aggregator.module	12 Oct 2008 04:30:05 -0000	1.395
+++ modules/aggregator/aggregator.module	20 Oct 2008 10:12:21 -0000
@@ -262,7 +262,7 @@ function aggregator_init() {
  *   TRUE if there is at least one category and the user has access to them, FALSE otherwise.
  */
 function _aggregator_has_categories() {
-  return user_access('access news feeds') && db_result(db_query('SELECT COUNT(*) FROM {aggregator_category}'));
+  return user_access('access news feeds') && db_query('SELECT COUNT(*) FROM {aggregator_category}')->fetchField();
 }
 
 /**
@@ -287,9 +287,9 @@ function aggregator_perm() {
  * Checks news feeds for updates once their refresh interval has elapsed.
  */
 function aggregator_cron() {
-  $result = db_query('SELECT * FROM {aggregator_feed} WHERE checked + refresh < %d', REQUEST_TIME);
-  while ($feed = db_fetch_array($result)) {
-    aggregator_refresh($feed);
+  $result = db_query('SELECT * FROM {aggregator_feed} WHERE checked + refresh < :time', array(':time' => REQUEST_TIME));
+  foreach ($result as $feed) {
+    aggregator_refresh((array)$feed);
   }
 }
 
@@ -302,18 +302,18 @@ function aggregator_block($op = 'list', 
   if (user_access('access news feeds')) {
     if ($op == 'list') {
       $result = db_query('SELECT cid, title FROM {aggregator_category} ORDER BY title');
-      while ($category = db_fetch_object($result)) {
+      foreach ($result as $category) {
         $block['category-' . $category->cid]['info'] = t('!title category latest items', array('!title' => $category->title));
       }
       $result = db_query('SELECT fid, title FROM {aggregator_feed} WHERE block <> 0 ORDER BY fid');
-      while ($feed = db_fetch_object($result)) {
+      foreach ($result as $feed) {
         $block['feed-' . $feed->fid]['info'] = t('!title feed latest items', array('!title' => $feed->title));
       }
     }
     elseif ($op == 'configure') {
       list($type, $id) = explode('-', $delta);
       if ($type == 'category') {
-        $value = db_result(db_query('SELECT block FROM {aggregator_category} WHERE cid = %d', $id));
+        $value = db_query('SELECT block FROM {aggregator_category} WHERE cid = :cid', array(':cid' => $id))->fetchField();
         $form['block'] = array(
           '#type' => 'select',
           '#title' => t('Number of news items in block'),
@@ -326,30 +326,33 @@ function aggregator_block($op = 'list', 
     elseif ($op == 'save') {
       list($type, $id) = explode('-', $delta);
       if ($type == 'category') {
-        $value = db_query('UPDATE {aggregator_category} SET block = %d WHERE cid = %d', $edit['block'], $id);
+        db_merge('aggregator_category')
+          ->key(array('cid' => $id))
+          ->fields(array('block' => $edit['block']))
+          ->execute();
       }
     }
     elseif ($op == 'view') {
       list($type, $id) = explode('-', $delta);
       switch ($type) {
         case 'feed':
-          if ($feed = db_fetch_object(db_query('SELECT fid, title, block FROM {aggregator_feed} WHERE block <> 0 AND fid = %d', $id))) {
+          if ($feed = db_query('SELECT fid, title, block FROM {aggregator_feed} WHERE block <> 0 AND fid = :fid', array(':fid' => $id))->fetchObject()) {
             $block['subject'] = check_plain($feed->title);
-            $result = db_query_range('SELECT * FROM {aggregator_item} WHERE fid = %d ORDER BY timestamp DESC, iid DESC', $feed->fid, 0, $feed->block);
+            $result = db_query_range("SELECT * FROM {aggregator_item} WHERE fid = :fid ORDER BY timestamp DESC, iid DESC", array(':fid' => $id), 0, $feed->block);
             $read_more = theme('more_link', url('aggregator/sources/' . $feed->fid), t("View this feed's recent news."));
           }
           break;
 
         case 'category':
-          if ($category = db_fetch_object(db_query('SELECT cid, title, block FROM {aggregator_category} WHERE cid = %d', $id))) {
+          if ($category = db_query('SELECT cid, title, block FROM {aggregator_category} WHERE cid = :cid', array(':cid' => $id))->fetchObject()) {
             $block['subject'] = check_plain($category->title);
-            $result = db_query_range('SELECT i.* FROM {aggregator_category_item} ci LEFT JOIN {aggregator_item} i ON ci.iid = i.iid WHERE ci.cid = %d ORDER BY i.timestamp DESC, i.iid DESC', $category->cid, 0, $category->block);
+            $result = db_query_range('SELECT i.* FROM {aggregator_category_item} ci LEFT JOIN {aggregator_item} i ON ci.iid = i.iid WHERE ci.cid = :cid ORDER BY i.timestamp DESC, i.iid DESC', array(':cid' => $category->cid), 0, $category->block);
             $read_more = theme('more_link', url('aggregator/categories/' . $category->cid), t("View this category's recent news."));
           }
           break;
       }
       $items = array();
-      while ($item = db_fetch_object($result)) {
+      foreach ($result as $item) {
         $items[] = theme('aggregator_block_item', $item);
       }
 
@@ -375,21 +378,36 @@ function aggregator_save_category($edit)
   if (!empty($edit['cid'])) {
     $link_path .= $edit['cid'];
     if (!empty($edit['title'])) {
-      db_query("UPDATE {aggregator_category} SET title = '%s', description = '%s' WHERE cid = %d", $edit['title'], $edit['description'], $edit['cid']);
+      db_merge('aggregator_category')
+        ->key(array('cid' => $edit['cid']))
+        ->fields(array(
+          'title' => $edit['title'],
+          'description' => $edit['description'],
+        ))
+        ->execute();
       $op = 'update';
     }
     else {
-      db_query('DELETE FROM {aggregator_category} WHERE cid = %d', $edit['cid']);
+      db_delete('aggregator_category')
+        ->condition('cid', $edit['cid'])
+        ->execute();
       // Make sure there is no active block for this category.
-      db_query("DELETE FROM {blocks} WHERE module = '%s' AND delta = '%s'", 'aggregator', 'category-' . $edit['cid']);
+      db_delete('blocks')
+        ->condition('module', 'aggregator')
+        ->condition('delta', 'category-' . $edit['cid'])
+        ->execute();
       $edit['title'] = '';
       $op = 'delete';
     }
   }
   elseif (!empty($edit['title'])) {
     // A single unique id for bundles and feeds, to use in blocks.
-    db_query("INSERT INTO {aggregator_category} (title, description, block) VALUES ('%s', '%s', 5)", $edit['title'], $edit['description']);
-    $link_path .= db_last_insert_id('aggregator_category', 'cid');
+    $link_path .= db_insert('aggregator_category')
+      ->fields(array(
+        'title' => $edit['title'],
+        'description' => $edit['description'],
+      ))
+      ->execute();
     $op = 'insert';
   }
   if (isset($op)) {
@@ -406,36 +424,64 @@ function aggregator_save_category($edit)
 function aggregator_save_feed($edit) {
   if (!empty($edit['fid'])) {
     // An existing feed is being modified, delete the category listings.
-    db_query('DELETE FROM {aggregator_category_feed} WHERE fid = %d', $edit['fid']);
+    db_delete('aggregator_category_feed')
+      ->condition('fid', $edit['fid'])
+      ->execute();
   }
   if (!empty($edit['fid']) && !empty($edit['title'])) {
-    db_query("UPDATE {aggregator_feed} SET title = '%s', url = '%s', refresh = %d, block = %d WHERE fid = %d", $edit['title'], $edit['url'], $edit['refresh'], $edit['block'], $edit['fid']);
+    db_update('aggregator_feed')
+      ->condition('fid', $edit['fid'])
+      ->fields(array(
+        'title' => $edit['title'],
+        'url' => $edit['url'],
+        'refresh' => $edit['refresh'],
+        'block' => $edit['block'],
+      ))
+      ->execute();
   }
   elseif (!empty($edit['fid'])) {
-    $items = array();
-    $result = db_query('SELECT iid FROM {aggregator_item} WHERE fid = %d', $edit['fid']);
-    while ($item = db_fetch_object($result)) {
-      $items[] = "iid = $item->iid";
-    }
-    if (!empty($items)) {
-      db_query('DELETE FROM {aggregator_category_item} WHERE ' . implode(' OR ', $items));
-    }
-    db_query('DELETE FROM {aggregator_feed} WHERE fid = %d', $edit['fid']);
-    db_query('DELETE FROM {aggregator_item} WHERE fid = %d', $edit['fid']);
+    $iids = db_query('SELECT iid FROM {aggregator_item} WHERE fid = :fid', array(':fid' => $edit['fid']))->fetchCol();
+    if ($iids) {
+      db_delete('aggregator_category_item')
+        ->condition('iid', $iids, 'IN')
+        ->execute();
+    }
+    db_delete('aggregator_feed')->
+      condition('fid', $edit['fid'])
+      ->execute();
+    db_delete('aggregator_item')
+      ->condition('fid', $edit['fid'])
+      ->execute();
     // Make sure there is no active block for this feed.
-    db_query("DELETE FROM {blocks} WHERE module = '%s' AND delta = '%s'", 'aggregator', 'feed-' . $edit['fid']);
+    db_delete('blocks')
+      ->condition('module', 'aggregator')
+      ->condition('delta', 'feed-' . $edit['fid'])
+      ->execute();
   }
   elseif (!empty($edit['title'])) {
-    db_query("INSERT INTO {aggregator_feed} (title, url, refresh, block, description, image) VALUES ('%s', '%s', %d, %d, '', '')", $edit['title'], $edit['url'], $edit['refresh'], $edit['block']);
-    // A single unique ID for bundles and feeds, to use in blocks.
-    $edit['fid'] = db_last_insert_id('aggregator_feed', 'fid');
+    $edit['fid'] = db_insert('aggregator_feed')
+      ->fields(array(
+        'title' => $edit['title'],
+        'url' => $edit['url'],
+        'refresh' => $edit['refresh'],
+        'block' => $edit['block'],
+        'description' => '',
+        'image' => '',
+      ))
+      ->execute();
+    
   }
   if (!empty($edit['title'])) {
     // The feed is being saved, save the categories as well.
     if (!empty($edit['category'])) {
       foreach ($edit['category'] as $cid => $value) {
         if ($value) {
-          db_query('INSERT INTO {aggregator_category_feed} (fid, cid) VALUES (%d, %d)', $edit['fid'], $cid);
+          db_merge('aggregator_category_feed')
+            ->fields(array(
+              'fid' => $edit['fid'],
+              'cid' => $cid,
+            ))
+            ->execute();
         }
       }
     }
@@ -449,15 +495,26 @@ function aggregator_save_feed($edit) {
  *   An associative array describing the feed to be cleared.
  */
 function aggregator_remove($feed) {
-  $result = db_query('SELECT iid FROM {aggregator_item} WHERE fid = %d', $feed['fid']);
-  while ($item = db_fetch_object($result)) {
-    $items[] = "iid = $item->iid";
-  }
-  if (!empty($items)) {
-    db_query('DELETE FROM {aggregator_category_item} WHERE ' . implode(' OR ', $items));
-  }
-  db_query('DELETE FROM {aggregator_item} WHERE fid = %d', $feed['fid']);
-  db_query("UPDATE {aggregator_feed} SET checked = 0, hash = '', etag = '', modified = 0 WHERE fid = %d", $feed['fid']);
+  $iids = db_query('SELECT iid FROM {aggregator_item} WHERE fid = :fid', array(':fid' => $feed['fid']))->fetchCol();
+  if ($iids) {
+    db_delete('aggregator_category_item')
+      ->condition('iid', $iids, 'IN')
+      ->execute();
+  }
+  
+  db_delete('aggregator_item')
+    ->condition('fid', $feed['fid'])
+    ->execute();
+  db_merge('aggregator_feed')
+    ->key(array('fid' => $feed['fid']))
+    ->fields(array(
+      'checked' => 0,
+      'hash' => '',
+      'modified' => 0,
+      'description' => $feed['description'],
+      'image' => $feed['image'],
+    ))
+    ->execute();
   drupal_set_message(t('The news items from %site have been removed.', array('%site' => $feed['title'])));
 }
 
@@ -598,7 +655,10 @@ function aggregator_refresh($feed) {
   // Process HTTP response code.
   switch ($result->code) {
     case 304:
-      db_query('UPDATE {aggregator_feed} SET checked = %d WHERE fid = %d', REQUEST_TIME, $feed['fid']);
+      db_update('aggregator_feed')
+        ->fields(array('checked' => REQUEST_TIME))
+        ->condition('fid', $feed['fid'])
+        ->execute();
       drupal_set_message(t('There is no new syndicated content from %site.', array('%site' => $feed['title'])));
       break;
     case 301:
@@ -612,7 +672,10 @@ function aggregator_refresh($feed) {
       // data. If both are equal we say that feed is not updated.
       $md5 = md5($result->data);
       if ($feed['hash'] == $md5) {
-        db_query('UPDATE {aggregator_feed} SET checked = %d WHERE fid = %d', REQUEST_TIME, $feed['fid']);
+        db_update('aggregator_feed')
+          ->condition('fid', $feed['fid'])
+          ->fields(array('checked' => REQUEST_TIME))
+          ->execute();
         drupal_set_message(t('There is no new syndicated content from %site.', array('%site' => $feed['title'])));
         break;
       }
@@ -642,7 +705,19 @@ function aggregator_refresh($feed) {
 
         $etag = empty($result->headers['ETag']) ? '' : $result->headers['ETag'];
         // Update the feed data.
-        db_query("UPDATE {aggregator_feed} SET url = '%s', checked = %d, link = '%s', description = '%s', image = '%s', hash = '%s', etag = '%s', modified = %d WHERE fid = %d", $feed['url'], REQUEST_TIME, $channel['LINK'], $channel['DESCRIPTION'], $image, $md5, $etag, $modified, $feed['fid']);
+        db_merge('aggregator_feed')
+          ->key(array('fid' => $feed['fid']))
+          ->fields(array(
+            'url' => $feed['url'],
+            'checked' => REQUEST_TIME,
+            'link' => $channel['LINK'],
+            'description' => $channel['DESCRIPTION'],
+            'image' => $image,
+            'hash' => $md5,
+            'etag' => $etag,
+            'modified' => $modified,
+          ))
+          ->execute();
 
         // Clear the cache.
         cache_clear_all();
@@ -799,13 +874,13 @@ function aggregator_parse_feed(&$data, $
     // we find a duplicate entry, we resolve it and pass along its ID is such
     // that we can update it if needed.
     if (!empty($guid)) {
-      $entry = db_fetch_object(db_query("SELECT iid, timestamp FROM {aggregator_item} WHERE fid = %d AND guid = '%s'", $feed['fid'], $guid));
+      $entry = db_query("SELECT iid, timestamp FROM {aggregator_item} WHERE fid = :fid AND guid = :guid", array(':fid' => $feed['fid'], ':guid' => $guid))->fetchObject();
     }
     elseif ($link && $link != $feed['link'] && $link != $feed['url']) {
-      $entry = db_fetch_object(db_query("SELECT iid, timestamp FROM {aggregator_item} WHERE fid = %d AND link = '%s'", $feed['fid'], $link));
+      $entry = db_query("SELECT iid, timestamp FROM {aggregator_item} WHERE fid = :fid AND link = :link", array(':fid' => $feed['fid'], ':link' => $link))->fetchObject();
     }
     else {
-      $entry = db_fetch_object(db_query("SELECT iid, timestamp FROM {aggregator_item} WHERE fid = %d AND title = '%s'", $feed['fid'], $title));
+      $entry = db_query("SELECT iid, timestamp FROM {aggregator_item} WHERE fid = :fid AND title = :title", array(':fid' => $feed['fid'], ':title' => $title))->fetchObject();
     }
 
     if (!$timestamp) {
@@ -817,17 +892,14 @@ function aggregator_parse_feed(&$data, $
 
   // Remove all items that are older than flush item timer.
   $age = REQUEST_TIME - variable_get('aggregator_clear', 9676800);
-  $result = db_query('SELECT iid FROM {aggregator_item} WHERE fid = %d AND timestamp < %d', $feed['fid'], $age);
-
-  $items = array();
-  $num_rows = FALSE;
-  while ($item = db_fetch_object($result)) {
-    $items[] = $item->iid;
-    $num_rows = TRUE;
-  }
-  if ($num_rows) {
-    db_query('DELETE FROM {aggregator_category_item} WHERE iid IN (' . implode(', ', $items) . ')');
-    db_query('DELETE FROM {aggregator_item} WHERE fid = %d AND timestamp < %d', $feed['fid'], $age);
+  $iids = db_query('SELECT iid FROM {aggregator_item} WHERE fid = :fid AND timestamp < :timestamp', array(':fid' => $feed['fid'], ':timestamp' => $age))->fetchCol();
+  if ($iids) {
+    db_delete('aggregator_category_item')
+      ->condition('iid', $iids, 'IN')
+      ->execute();
+    db_delete('aggregator_item')
+      ->condition('iid', $iids, 'IN')
+      ->execute();
   }
 
   return TRUE;
@@ -840,20 +912,37 @@ function aggregator_parse_feed(&$data, $
  *   An associative array describing the item to be added/edited/deleted.
  */
 function aggregator_save_item($edit) {
-  if ($edit['iid'] && $edit['title']) {
-    db_query("UPDATE {aggregator_item} SET title = '%s', link = '%s', author = '%s', description = '%s', guid = '%s', timestamp = %d WHERE iid = %d", $edit['title'], $edit['link'], $edit['author'], $edit['description'], $edit['guid'], $edit['timestamp'], $edit['iid']);
-  }
-  elseif ($edit['iid']) {
-    db_query('DELETE FROM {aggregator_item} WHERE iid = %d', $edit['iid']);
-    db_query('DELETE FROM {aggregator_category_item} WHERE iid = %d', $edit['iid']);
+  if ($edit['title'] && empty($edit['iid'])) {
+    $edit['iid'] = db_insert('aggregator_item')
+      ->fields(array(
+        'title' => $edit['title'],
+        'link' => $edit['link'],
+        'author' => $edit['author'],
+        'description' => $edit['description'],
+        'guid' => $edit['guid'],
+        'timestamp' => $edit['timestamp'],
+        'fid' => $edit['fid'],
+      ))
+      ->execute();
+  }
+  if ($edit['iid'] && !$edit['title']) {
+    db_delete('aggregator_item')
+      ->condition('iid', $edit['iid'])
+      ->execute();
+    db_delete('aggregator_category_item')
+      ->condition('iid', $edit['iid'])
+      ->execute();
   }
   elseif ($edit['title'] && $edit['link']) {
-    db_query("INSERT INTO {aggregator_item} (fid, title, link, author, description, timestamp, guid) VALUES (%d, '%s', '%s', '%s', '%s', %d, '%s')", $edit['fid'], $edit['title'], $edit['link'], $edit['author'], $edit['description'], $edit['timestamp'], $edit['guid']);
-    $edit['iid'] = db_last_insert_id('aggregator_item', 'iid');
     // file the items in the categories indicated by the feed
-    $categories = db_query('SELECT cid FROM {aggregator_category_feed} WHERE fid = %d', $edit['fid']);
-    while ($category = db_fetch_object($categories)) {
-      db_query('INSERT INTO {aggregator_category_item} (cid, iid) VALUES (%d, %d)', $category->cid, $edit['iid']);
+    $result = db_query('SELECT cid FROM {aggregator_category_feed} WHERE fid = :fid', array(':fid' => $edit['fid']));
+    foreach ($result as $category) {
+      db_merge('aggregator_category_item')
+        ->fields(array(
+          'cid' => $category->cid,
+          'iid' => $edit['iid'],
+        ))
+        ->execute();
     }
   }
 }
@@ -869,7 +958,7 @@ function aggregator_save_item($edit) {
 function aggregator_feed_load($fid) {
   static $feeds;
   if (!isset($feeds[$fid])) {
-    $feeds[$fid] = db_fetch_array(db_query('SELECT * FROM {aggregator_feed} WHERE fid = %d', $fid));
+    $feeds[$fid] = db_query('SELECT * FROM {aggregator_feed} WHERE fid = :fid', array(':fid' => $fid))->fetchAssoc();
   }
 
   return $feeds[$fid];
@@ -886,7 +975,7 @@ function aggregator_feed_load($fid) {
 function aggregator_category_load($cid) {
   static $categories;
   if (!isset($categories[$cid])) {
-    $categories[$cid] = db_fetch_array(db_query('SELECT * FROM {aggregator_category} WHERE cid = %d', $cid));
+    $categories[$cid] = db_query('SELECT * FROM {aggregator_category} WHERE cid = :cid', array(':cid' => $cid))->fetchAssoc();
   }
 
   return $categories[$cid];
Index: modules/aggregator/aggregator.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.pages.inc,v
retrieving revision 1.21
diff -u -p -r1.21 aggregator.pages.inc
--- modules/aggregator/aggregator.pages.inc	13 Oct 2008 00:33:01 -0000	1.21
+++ modules/aggregator/aggregator.pages.inc	20 Oct 2008 10:12:22 -0000
@@ -15,7 +15,7 @@
 function aggregator_page_last() {
   drupal_add_feed(url('aggregator/rss'), variable_get('site_name', 'Drupal') . ' ' . t('aggregator'));
 
-  $items = aggregator_feed_items_load('SELECT i.*, f.title AS ftitle, f.link AS flink FROM {aggregator_item} i INNER JOIN {aggregator_feed} f ON i.fid = f.fid ORDER BY i.timestamp DESC, i.iid DESC');
+  $items = aggregator_feed_items_load('sum');
 
   return _aggregator_page_list($items, arg(1));
 }
@@ -42,7 +42,7 @@ function aggregator_page_source($arg1, $
 
   // It is safe to include the fid in the query because it's loaded from the
   // database by aggregator_feed_load.
-  $items = aggregator_feed_items_load('SELECT * FROM {aggregator_item} WHERE fid = ' . $feed->fid . ' ORDER BY timestamp DESC, iid DESC');
+  $items = aggregator_feed_items_load('source', $feed);
 
   return _aggregator_page_list($items, arg(3), $feed_source);
 }
@@ -68,31 +68,39 @@ function aggregator_page_category($arg1,
 
   // It is safe to include the cid in the query because it's loaded from the
   // database by aggregator_category_load.
-  $items = aggregator_feed_items_load('SELECT i.*, f.title AS ftitle, f.link AS flink FROM {aggregator_category_item} c LEFT JOIN {aggregator_item} i ON c.iid = i.iid LEFT JOIN {aggregator_feed} f ON i.fid = f.fid WHERE cid = ' . $category['cid'] . ' ORDER BY timestamp DESC, i.iid DESC');
+  $items = aggregator_feed_items_load('category', $category);
 
   return _aggregator_page_list($items, arg(3));
 }
 
 /**
- * Load feed items by passing a SQL query.
+ * Load feed items
  *
- * @param $sql
- *   The query to be executed.
+ * @param $type
+ *   The filter for the items. Possible values: 'sum', 'source', 'category'
+ * @param $data
+ *   Feed or category data for filtering
  * @return
  *   An array of the feed items.
  */
-function aggregator_feed_items_load($sql) {
+function aggregator_feed_items_load($type, $data = NULL) {
   $items = array();
-  if (isset($sql)) {
-    $result = pager_query($sql, 20);
-    while ($item = db_fetch_object($result)) {
-      $result_category = db_query('SELECT c.title, c.cid FROM {aggregator_category_item} ci LEFT JOIN {aggregator_category} c ON ci.cid = c.cid WHERE ci.iid = %d ORDER BY c.title', $item->iid);
-      $item->categories = array();
-      while ($item_categories = db_fetch_object($result_category)) {
-        $item->categories[] = $item_categories;
-      }
-      $items[$item->iid] = $item;
-    }
+  $range_limit = 20;
+  switch ($type) {
+    case 'sum':
+      $result = db_query_range('SELECT i.*, f.title AS ftitle, f.link AS flink FROM {aggregator_item} i INNER JOIN {aggregator_feed} f ON i.fid = f.fid ORDER BY i.timestamp DESC, i.iid DESC', 0, $range_limit);
+      break;
+    case 'source':
+      $result = db_query_range('SELECT * FROM {aggregator_item} WHERE fid = :fid ORDER BY timestamp DESC, iid DESC', array(':fid' => $data->fid), 0, $range_limit);
+      break;
+    case 'category':
+      $result = db_query_range('SELECT i.*, f.title AS ftitle, f.link AS flink FROM {aggregator_category_item} c LEFT JOIN {aggregator_item} i ON c.iid = i.iid LEFT JOIN {aggregator_feed} f ON i.fid = f.fid WHERE cid = :cid ORDER BY timestamp DESC, i.iid DESC', array(':cid' => $data['cid']), 0, $range_limit);
+      break;
+  }
+
+  foreach ($result as $item) {
+    $item->categories = db_query('SELECT c.title, c.cid FROM {aggregator_category_item} ci LEFT JOIN {aggregator_category} c ON ci.cid = c.cid WHERE ci.iid = :iid ORDER BY c.title', array(':iid' => $item->iid))->fetchAll();
+    $items[] = $item;
   }
 
   return $items;
@@ -158,9 +166,9 @@ function aggregator_categorize_items($it
   foreach ($items as $item) {
     $form['items'][$item->iid] = array('#markup' => theme('aggregator_item', $item));
     $form['categories'][$item->iid] = array();
-    $categories_result = db_query('SELECT c.cid, c.title, ci.iid FROM {aggregator_category} c LEFT JOIN {aggregator_category_item} ci ON c.cid = ci.cid AND ci.iid = %d', $item->iid);
+    $categories_result = db_query('SELECT c.cid, c.title, ci.iid FROM {aggregator_category} c LEFT JOIN {aggregator_category_item} ci ON c.cid = ci.cid AND ci.iid = :iid', array(':iid' => $item->iid));
     $selected = array();
-    while ($category = db_fetch_object($categories_result)) {
+    foreach ($categories_result as $category) {
       if (!$done) {
         $categories[$category->cid] = check_plain($category->title);
       }
@@ -197,12 +205,23 @@ function aggregator_categorize_items_val
 function aggregator_categorize_items_submit($form, &$form_state) {
   if (!empty($form_state['values']['categories'])) {
     foreach ($form_state['values']['categories'] as $iid => $selection) {
-      db_query('DELETE FROM {aggregator_category_item} WHERE iid = %d', $iid);
+      db_delete('aggregator_category_item')
+        ->condition('iid', $iid)
+        ->execute();
+      $insert = db_insert('aggregator_category_item')->fields(array('iid', 'cid'));
+      $has_values = FALSE;
       foreach ($selection as $cid) {
-        if ($cid) {
-          db_query('INSERT INTO {aggregator_category_item} (cid, iid) VALUES (%d, %d)', $cid, $iid);
+        if ($cid && $iid) {
+          $has_values = TRUE;
+          $insert->values(array(
+            'iid' => $iid,
+            'cid' => $cid,
+          ));
         }
       }
+      if ($has_values) {
+        $insert->execute();
+      }
     }
   }
   drupal_set_message(t('The categories have been saved.'));
@@ -284,12 +303,12 @@ function aggregator_page_sources() {
   $result = db_query('SELECT f.fid, f.title, f.description, f.image, MAX(i.timestamp) AS last FROM {aggregator_feed} f LEFT JOIN {aggregator_item} i ON f.fid = i.fid GROUP BY f.fid, f.title, f.description, f.image ORDER BY last DESC, f.title');
 
   $output = '';
-  while ($feed = db_fetch_object($result)) {
+  foreach ($result as $feed) {
     // Most recent items:
     $summary_items = array();
     if (variable_get('aggregator_summary_items', 3)) {
-      $items = db_query_range('SELECT i.title, i.timestamp, i.link FROM {aggregator_item} i WHERE i.fid = %d ORDER BY i.timestamp DESC', $feed->fid, 0, variable_get('aggregator_summary_items', 3));
-      while ($item = db_fetch_object($items)) {
+      $items = db_query_range('SELECT i.title, i.timestamp, i.link FROM {aggregator_item} i WHERE i.fid = :fid ORDER BY i.timestamp DESC', array(':fid' => $feed->fid), 0, variable_get('aggregator_summary_items', 3));
+      foreach ($items as $item) {
         $summary_items[] = theme('aggregator_summary_item', $item);
       }
     }
@@ -308,11 +327,11 @@ function aggregator_page_categories() {
   $result = db_query('SELECT c.cid, c.title, c.description FROM {aggregator_category} c LEFT JOIN {aggregator_category_item} ci ON c.cid = ci.cid LEFT JOIN {aggregator_item} i ON ci.iid = i.iid GROUP BY c.cid, c.title, c.description');
 
   $output = '';
-  while ($category = db_fetch_object($result)) {
+  foreach ($result as $category) {
     if (variable_get('aggregator_summary_items', 3)) {
       $summary_items = array();
-      $items = db_query_range('SELECT i.title, i.timestamp, i.link, f.title as feed_title, f.link as feed_link FROM {aggregator_category_item} ci LEFT JOIN {aggregator_item} i ON i.iid = ci.iid LEFT JOIN {aggregator_feed} f ON i.fid = f.fid WHERE ci.cid = %d ORDER BY i.timestamp DESC', $category->cid, 0, variable_get('aggregator_summary_items', 3));
-      while ($item = db_fetch_object($items)) {
+      $items = db_query_range('SELECT i.title, i.timestamp, i.link, f.title as feed_title, f.link as feed_link FROM {aggregator_category_item} ci LEFT JOIN {aggregator_item} i ON i.iid = ci.iid LEFT JOIN {aggregator_feed} f ON i.fid = f.fid WHERE ci.cid = :cid ORDER BY i.timestamp DESC', array(':cid' => $category->cid), 0, variable_get('aggregator_summary_items', 3));
+      foreach ($items as $item) {
         $summary_items[] = theme('aggregator_summary_item', $item);
       }
     }
@@ -330,22 +349,16 @@ function aggregator_page_rss() {
   $result = NULL;
   // arg(2) is the passed cid, only select for that category.
   if (arg(2)) {
-    $category = db_fetch_object(db_query('SELECT cid, title FROM {aggregator_category} WHERE cid = %d', arg(2)));
-    $sql = 'SELECT i.*, f.title AS ftitle, f.link AS flink FROM {aggregator_category_item} c LEFT JOIN {aggregator_item} i ON c.iid = i.iid LEFT JOIN {aggregator_feed} f ON i.fid = f.fid WHERE cid = %d ORDER BY timestamp DESC, i.iid DESC';
-    $result = db_query_range($sql, $category->cid, 0, variable_get('feed_default_items', 10));
+    $category = db_query('SELECT cid, title FROM {aggregator_category} WHERE cid = :cid', array(':cid' => arg(2)))->fetchObject();
+    $result = db_query_range('SELECT i.*, f.title AS ftitle, f.link AS flink FROM {aggregator_category_item} c LEFT JOIN {aggregator_item} i ON c.iid = i.iid LEFT JOIN {aggregator_feed} f ON i.fid = f.fid WHERE cid = :cid ORDER BY timestamp DESC, i.iid DESC', array(':cid' => $category->cid), 0, variable_get('feed_default_items', 10));
   }
   // Or, get the default aggregator items.
   else {
     $category = NULL;
-    $sql = 'SELECT i.*, f.title AS ftitle, f.link AS flink FROM {aggregator_item} i INNER JOIN {aggregator_feed} f ON i.fid = f.fid ORDER BY i.timestamp DESC, i.iid DESC';
-    $result = db_query_range($sql, 0, variable_get('feed_default_items', 10));
-  }
-
-  $feeds = array();
-  while ($item = db_fetch_object($result)) {
-    $feeds[] = $item;
+    $result = db_query_range('SELECT i.*, f.title AS ftitle, f.link AS flink FROM {aggregator_item} i INNER JOIN {aggregator_feed} f ON i.fid = f.fid ORDER BY i.timestamp DESC, i.iid DESC', 0, variable_get('feed_default_items', 10));
   }
 
+  $feeds = $result->fetchAll();
   return theme('aggregator_page_rss', $feeds, $category);
 }
 
@@ -401,17 +414,13 @@ function theme_aggregator_page_rss($feed
  */
 function aggregator_page_opml($cid = NULL) {
   if ($cid) {
-    $result = db_query('SELECT f.title, f.url FROM {aggregator_feed} f LEFT JOIN {aggregator_category_feed} c on f.fid = c.fid WHERE c.cid = %d ORDER BY title', $cid);
+    $result = db_query('SELECT f.title, f.url FROM {aggregator_feed} f LEFT JOIN {aggregator_category_feed} c on f.fid = c.fid WHERE c.cid = :cid ORDER BY title', array(':cid' => $cid));
   }
   else {
     $result = db_query('SELECT * FROM {aggregator_feed} ORDER BY title');
   }
 
-  $feeds = array();
-  while ($item = db_fetch_object($result)) {
-    $feeds[] = $item;
-  }
-
+  $feeds = $result->fetchAll();
   return theme('aggregator_page_opml', $feeds);
 }
 
Index: modules/aggregator/aggregator.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.test,v
retrieving revision 1.9
diff -u -p -r1.9 aggregator.test
--- modules/aggregator/aggregator.test	9 Oct 2008 00:02:28 -0000	1.9
+++ modules/aggregator/aggregator.test	20 Oct 2008 10:12:23 -0000
@@ -23,7 +23,7 @@ class AggregatorTestCase extends DrupalW
     $this->drupalPost('admin/content/aggregator/add/feed', $edit, t('Save'));
     $this->assertRaw(t('The feed %name has been added.', array('%name' => $edit['title'])), t('The feed !name has been added.', array('!name' => $edit['title'])));
 
-    $feed = db_fetch_object(db_query("SELECT *  FROM {aggregator_feed} WHERE title = '%s' AND url='%s'", $edit['title'], $edit['url']));
+    $feed = db_query("SELECT *  FROM {aggregator_feed} WHERE title = :title AND url = :url", array(':title' => $edit['title'], ':url' => $edit['url']))->fetch();
     $this->assertTrue(!empty($feed), t('The feed found in database.'));
     return $feed;
   }
@@ -65,17 +65,18 @@ class AggregatorTestCase extends DrupalW
     $this->assertResponse(200, t('rss.xml is reachable.'));
 
     // Our tests are based off of rss.xml, so let's find out how many elements should be related.
-    $feed_count = db_result(db_query_range(db_rewrite_sql('SELECT COUNT(*) FROM {node} n WHERE n.promote = 1 AND n.status = 1'), 0, variable_get('feed_default_items', 10)));
+    // @todo: remove db_rewrite_sql() when possible
+    $feed_count = db_query_range(db_rewrite_sql('SELECT COUNT(*) FROM {node} n WHERE n.promote = 1 AND n.status = 1'), 0, variable_get('feed_default_items', 10))->fetchField();
     $feed_count = $feed_count > 10 ? 10 : $feed_count;
 
     // Refresh the feed (simulated link click).
     $this->drupalGet('admin/content/aggregator/update/' . $feed->fid);
 
     // Ensure we have the right number of items.
-    $result = db_query('SELECT iid FROM {aggregator_item} WHERE fid = %d', $feed->fid);
+    $result = db_query('SELECT iid FROM {aggregator_item} WHERE fid = :fid', array(':fid' => $feed->fid));
     $items = array();
     $feed->items = array();
-    while ($item = db_fetch_object($result)) {
+    foreach ($result as $item) {
       $feed->items[] = $item->iid;
     }
     $feed->item_count = count($feed->items);
@@ -99,8 +100,8 @@ class AggregatorTestCase extends DrupalW
    */
   function getFeedCategories($feed) {
     // add the categories to the feed so we can use them
-    $result = db_query('SELECT cid FROM {aggregator_category_feed} WHERE fid = %d', $feed->fid);
-    while ($category = db_fetch_object($result)) {
+    $result = db_query('SELECT cid FROM {aggregator_category_feed} WHERE fid = :fid', array(':fid' => $feed->fid));
+    foreach ($result as $category) {
       $feed->categories[] = $category->cid;
     }
   }
@@ -113,7 +114,7 @@ class AggregatorTestCase extends DrupalW
    * @return boolean Feed is unique.
    */
   function uniqueFeed($feed_name, $feed_url) {
-    $result = db_result(db_query("SELECT count(*) FROM {aggregator_feed} WHERE title = '%s' AND url='%s'", $feed_name, $feed_url));
+    $result = db_query("SELECT COUNT(*) FROM {aggregator_feed} WHERE title = :title AND url = :url", array(':title' => $feed_name, ':url' => $feed_url))->fetchField();
     return (1 == $result);
   }
 
@@ -324,7 +325,7 @@ class RemoveFeedTestCase extends Aggrega
     $this->assertResponse(404, t('Deleted feed source does not exists.'));
 
     // Check database for feed.
-    $result = db_result(db_query("SELECT count(*) FROM {aggregator_feed} WHERE title = '%s' AND url='%s'", $feed->title, $feed->url));
+    $result = db_query("SELECT COUNT(*) FROM {aggregator_feed} WHERE title = :title AND url = :url", array(':title' => $feed->title, ':url' => $feed->url))->fetchField();
     $this->assertFalse($result, t('Feed not found in database'));
   }
 }
@@ -366,17 +367,25 @@ class UpdateFeedItemTestCase extends Agg
     $this->drupalPost('admin/content/aggregator/add/feed', $edit, t('Save'));
     $this->assertRaw(t('The feed %name has been added.', array('%name' => $edit['title'])), t('The feed !name has been added.', array('!name' => $edit['title'])));
 
-    $feed = db_fetch_object(db_query("SELECT * FROM {aggregator_feed} WHERE url = '%s'", $edit['url']));
+    $feed = db_query("SELECT * FROM {aggregator_feed} WHERE url = '%s'", array($edit['url']))->fetchObject();
     $this->drupalGet('admin/content/aggregator/update/' . $feed->fid);
 
-    $before = db_result(db_query('SELECT timestamp FROM {aggregator_item} WHERE fid = %d', $feed->fid));
+    $before = db_query('SELECT timestamp FROM {aggregator_item} WHERE fid = :fid', array(':fid' => $feed->fid))->fetchField();
 
     // Sleep for 3 second.
     sleep(3);
-    db_query("UPDATE {aggregator_feed} SET checked = 0, hash = '', etag = '', modified = 0 WHERE fid = %d", $feed->fid);
+    db_update('aggregator_feed')
+      ->condition('fid', $feed->fid)
+      ->fields(array(
+        'checked' => 0,
+        'hash' => '',
+        'etag' => '',
+        'modified' => 0,
+      ))
+      ->execute();
     $this->drupalGet('admin/content/aggregator/update/' . $feed->fid);
 
-    $after = db_result(db_query('SELECT timestamp FROM {aggregator_item} WHERE fid = %d', $feed->fid));
+    $after = db_query('SELECT timestamp FROM {aggregator_item} WHERE fid = :fid', array(':fid' => $feed->fid))->fetchField();
 
     $this->assertTrue($before === $after, t('Publish timestamp of feed item was not updated (!before === !after)', array('!before' => $before, '!after' => $after)));
   }
@@ -403,7 +412,7 @@ class RemoveFeedItemTestCase extends Agg
     // Add and remove feed items and ensure that the count is zero.
     $this->updateFeedItems($feed);
     $this->removeFeedItems($feed);
-    $count = db_result(db_query('SELECT COUNT(*) FROM {aggregator_item} WHERE fid = %d', $feed->fid));
+    $count = db_query('SELECT COUNT(*) FROM {aggregator_item} WHERE fid = :fid', array(':fid' => $feed->fid))->fetchField();
     $this->assertTrue($count == 0);
 
     // Delete feed.
@@ -434,11 +443,11 @@ class CategorizeFeedItemTestCase extends
     $this->drupalPost('admin/content/aggregator/add/category', $edit, t('Save'));
     $this->assertRaw(t('The category %title has been added.', array('%title' => $edit['title'])), t('The category %title has been added.', array('%title' => $edit['title'])));
 
-    $category = db_fetch_object(db_query("SELECT * FROM {aggregator_category} WHERE title = '%s'", $edit['title']));
+    $category = db_query("SELECT * FROM {aggregator_category} WHERE title = :title", array(':title' => $edit['title']))->fetch();
     $this->assertTrue(!empty($category), t('The category found in database.'));
 
     $link_path = 'aggregator/categories/' . $category->cid;
-    $menu_link = db_fetch_object(db_query("SELECT * FROM {menu_links} WHERE link_path = '%s'", $link_path));
+    $menu_link = db_query("SELECT * FROM {menu_links} WHERE link_path = :link_path", array(':link_path' => $link_path))->fetch();
     $this->assertTrue(!empty($menu_link), t('The menu link associated with the category found in database.'));
 
     // TODO: Need to add categories to the feed on creation.
@@ -449,8 +458,12 @@ class CategorizeFeedItemTestCase extends
     // For each category of a feed, ensure feed items have that category, too.
     if (!empty($feed->categories) && !empty($feed->items)) {
       foreach ($feed->categories as $category) {
-        $items_str = implode(', ', $feed->items);
-        $categorized_count = db_result(db_query('SELECT COUNT(*) FROM {aggregator_category_item} WHERE iid IN (' . $items_str . ')'));
+        $categorized_count = db_select('aggregator_category_item')
+          ->condition('iid', $feed->items, 'IN')
+          ->countQuery()
+          ->execute()
+          ->fetchField();
+        
         $this->assertEqual($feed->item_count, $categorized_count, t('Total items in feed equal to the total categorized feed items in database'));
       }
     }
@@ -478,10 +491,16 @@ class ImportOPMLTestCase extends Aggrega
    * Open OPML import form.
    */
   function openImportForm() {
-    db_query('DELETE FROM {aggregator_category}');
+    db_delete('aggregator_category')->execute();
 
     $category = $this->randomName(10, self::$prefix);
-    db_query("INSERT INTO {aggregator_category} (cid, title, description) VALUES (%d, '%s', '%s')", 1, $category, '');
+    db_insert('aggregator_category')
+      ->fields(array(
+        'cid' => 1,
+        'title' => $category,
+        'description' => '',
+      ))
+      ->execute();
 
     $this->drupalGet('admin/content/aggregator/add/opml');
     $this->assertText('A single OPML document may contain a collection of many feeds.', t('Looking for help text.'));
@@ -495,7 +514,7 @@ class ImportOPMLTestCase extends Aggrega
    * Submit form filled with invalid fields.
    */
   function validateImportFormFields() {
-    $before = db_result(db_query('SELECT COUNT(*) FROM {aggregator_feed}'));
+    $before = db_query('SELECT COUNT(*) FROM {aggregator_feed}')->fetchField();
 
     $form = array();
     $this->drupalPost('admin/content/aggregator/add/opml', $form, t('Import'));
@@ -513,7 +532,7 @@ class ImportOPMLTestCase extends Aggrega
     $this->drupalPost('admin/content/aggregator/add/opml', $form, t('Import'));
     $this->assertText(t('This URL is not valid.'), t('Error if the URL is invalid.'));
 
-    $after = db_result(db_query('SELECT COUNT(*) FROM {aggregator_feed}'));
+    $after = db_query('SELECT COUNT(*) FROM {aggregator_feed}')->fetchField();
     $this->assertEqual($before, $after, t('No feeds were added during the three last form submissions.'));
   }
 
@@ -521,7 +540,7 @@ class ImportOPMLTestCase extends Aggrega
    * Submit form with invalid, empty and valid OPML files.
    */
   function submitImportForm() {
-    $before = db_result(db_query('SELECT COUNT(*) FROM {aggregator_feed}'));
+    $before = db_query('SELECT COUNT(*) FROM {aggregator_feed}')->fetchField();
 
     $form['files[upload]'] = $this->getInvalidOpml();
     $this->drupalPost('admin/content/aggregator/add/opml', $form, t('Import'));
@@ -531,15 +550,21 @@ class ImportOPMLTestCase extends Aggrega
     $this->drupalPost('admin/content/aggregator/add/opml', $form, t('Import'));
     $this->assertText(t('No new feed has been added.'), t('Attempting to load empty OPML from remote URL.'));
 
-    $after = db_result(db_query('SELECT COUNT(*) FROM {aggregator_feed}'));
+    $after = db_query('SELECT COUNT(*) FROM {aggregator_feed}')->fetchField();
     $this->assertEqual($before, $after, t('No feeds were added during the two last form submissions.'));
 
-    db_query('DELETE FROM {aggregator_feed}');
-    db_query('DELETE FROM {aggregator_category}');
-    db_query('DELETE FROM {aggregator_category_feed}');
+    db_delete('aggregator_feed')->execute();
+    db_delete('aggregator_category')->execute();
+    db_delete('aggregator_category_feed')->execute();
 
     $category = $this->randomName(10, self::$prefix);
-    db_query("INSERT INTO {aggregator_category} (cid, title, description) VALUES (%d, '%s', '%s')", 1, $category, '');
+    db_insert('aggregator_category')
+      ->fields(array(
+        'cid' => 1,
+        'title' => $category,
+        'description' => '',
+      ))
+      ->execute();
 
     $feeds[0] = $this->getFeedEditArray();
     $feeds[1] = $this->getFeedEditArray();
@@ -553,16 +578,16 @@ class ImportOPMLTestCase extends Aggrega
     $this->assertRaw(t('A feed with the URL %url already exists.', array('%url' => $feeds[0]['url'])), t('Verifying that a duplicate URL was identified'));
     $this->assertRaw(t('A feed named %title already exists.', array('%title' => $feeds[1]['title'])), t('Verifying that a duplicate title was identified'));
 
-    $after = db_result(db_query('SELECT COUNT(*) FROM {aggregator_feed}'));
+    $after = db_query('SELECT COUNT(*) FROM {aggregator_feed}')->fetchField();
     $this->assertEqual($after, 2, t('Verifying that two distinct feeds were added.'));
 
     $feeds_from_db = db_query("SELECT f.title, f.url, f.refresh, cf.cid FROM {aggregator_feed} f LEFT JOIN {aggregator_category_feed} cf ON f.fid = cf.fid");
     $refresh = $category = TRUE;
-    while ($feed = db_fetch_array($feeds_from_db)) {
-      $title[$feed['url']] = $feed['title'];
-      $url[$feed['title']] = $feed['url'];
-      $category = $category && $feed['cid'] == 1;
-      $refresh = $refresh && $feed['refresh'] == 900;
+    foreach ($feeds_from_db as $feed) {
+      $title[$feed->url] = $feed->title;
+      $url[$feed->title] = $feed->url;
+      $category = $category && $feed->cid == 1;
+      $refresh = $refresh && $feed->refresh == 900;
     }
 
     $this->assertEqual($title[$feeds[0]['url']], $feeds[0]['title'], t('First feed was added correctly.'));