Index: modules/user/user.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.admin.inc,v
retrieving revision 1.44
diff -u -p -r1.44 user.admin.inc
--- modules/user/user.admin.inc	29 Apr 2009 08:04:24 -0000	1.44
+++ modules/user/user.admin.inc	29 Apr 2009 23:57:06 -0000
@@ -132,7 +132,6 @@ function user_filter_form_submit($form, 
  * @see user_admin_account_submit()
  */
 function user_admin_account() {
-  $filter = user_build_filter_query();
 
   $header = array(
     array(),
@@ -145,13 +144,20 @@ function user_admin_account() {
   );
 
   $query = db_select('users', 'u');
-  $query->fields('u', array('uid', 'name', 'status', 'created', 'access'));
-  $sql = 'SELECT DISTINCT u.uid, u.name, u.status, u.created, u.access FROM {users} u
-          LEFT JOIN {users_roles} ur ON u.uid = ur.uid ' . $filter['join'] . '
-          WHERE u.uid != 0 ' . $filter['where'];
-  $sql .= tablesort_sql($header);
-  $query_count = 'SELECT COUNT(DISTINCT u.uid) FROM {users} u LEFT JOIN {users_roles} ur ON u.uid = ur.uid ' . $filter['join'] . ' WHERE u.uid != 0 ' . $filter['where'];
-  $result = pager_query($sql, 50, 0, $query_count, $filter['args']);
+  $query->leftJoin('users_roles', 'ur', 'u.uid = ur.uid');
+  $query->condition('u.uid', 0, '<>');
+  user_build_filter_query($query);
+  
+  $count_query = clone $query;
+  $count_query->addExpression('COUNT(DISTINCT u.uid)');
+
+  $query = $query->extend('PagerDefault')->extend('TableSort');
+  $query
+    ->fields('u', array('uid', 'name', 'status', 'created', 'access'))
+    ->limit(50)
+    ->setHeader($header)
+    ->setCountQuery($count_query);
+  $result = $query->execute();
 
   $form['options'] = array(
     '#type' => 'fieldset',
@@ -605,15 +611,17 @@ function user_admin_perm_submit($form, &
   foreach ($form_state['values']['role_names'] as $rid => $name) {
     $checked = array_filter($form_state['values'][$rid]);
     // Delete existing permissions for the role. This handles "unchecking" checkboxes.
-    db_delete('role_permission')->condition('rid', $rid)->execute();
+    db_delete('role_permission')
+      ->condition('rid', $rid)
+      ->execute();
+    $query = db_insert('role_permission')->fields(array('rid', 'permission'));
     foreach ($checked as $permission) {
-      db_insert('role_permission')
-        ->fields(array(
-          'rid' => $rid,
-          'permission' => $permission,
-        ))
-        ->execute();
+      $query->values(array(
+        'rid' => $rid,
+        'permission' => $permission,
+      ));
     }
+    $query->execute();
   }
 
   drupal_set_message(t('The changes have been saved.'));
@@ -743,23 +751,29 @@ function user_admin_role_validate($form,
 function user_admin_role_submit($form, &$form_state) {
   if ($form_state['values']['op'] == t('Save role')) {
     db_update('role')
-      ->fields(array(
-        'name' => $form_state['values']['name'],
-      ))
+      ->fields(array('name' => $form_state['values']['name']))
       ->condition('rid', $form_state['values']['rid'])
       ->execute();
     drupal_set_message(t('The role has been renamed.'));
   }
   elseif ($form_state['values']['op'] == t('Delete role')) {
-    db_delete('role')->condition('rid', $form_state['values']['rid'])->execute();
-    db_delete('role_permission')->condition('rid', $form_state['values']['rid'])->execute();
+    db_delete('role')
+      ->condition('rid', $form_state['values']['rid'])
+      ->execute();
+    db_delete('role_permission')
+      ->condition('rid', $form_state['values']['rid'])
+      ->execute();
     // Update the users who have this role set:
-    db_delete('users_roles')->condition('rid', $form_state['values']['rid'])->execute();
+    db_delete('users_roles')
+      ->condition('rid', $form_state['values']['rid'])
+      ->execute();
 
     drupal_set_message(t('The role has been deleted.'));
   }
   elseif ($form_state['values']['op'] == t('Add role')) {
-    db_insert('role')->fields(array('name' => $form_state['values']['name']))->execute();
+    db_insert('role')
+      ->fields(array('name' => $form_state['values']['name']))
+      ->execute();
     drupal_set_message(t('The role has been added.'));
   }
   $form_state['redirect'] = 'admin/user/roles';
Index: modules/user/user.api.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.api.php,v
retrieving revision 1.4
diff -u -p -r1.4 user.api.php
--- modules/user/user.api.php	14 Mar 2009 23:01:38 -0000	1.4
+++ modules/user/user.api.php	29 Apr 2009 23:57:06 -0000
@@ -129,31 +129,52 @@ function hook_user_cancel($edit, $accoun
     case 'user_cancel_block_unpublish':
       // Unpublish nodes (current revisions).
       module_load_include('inc', 'node', 'node.admin');
-      $nodes = db_select('node', 'n')->fields('n', array('nid'))->condition('uid', $account->uid)->execute()->fetchCol();
+      $nodes = db_select('node', 'n')
+        ->fields('n', array('nid'))
+        ->condition('uid', $account->uid)
+        ->execute()
+        ->fetchCol();
       node_mass_update($nodes, array('status' => 0));
       break;
 
     case 'user_cancel_reassign':
       // Anonymize nodes (current revisions).
       module_load_include('inc', 'node', 'node.admin');
-      $nodes = db_select('node', 'n')->fields('n', array('nid'))->condition('uid', $account->uid)->execute()->fetchCol();
+      $nodes = db_select('node', 'n')
+        ->fields('n', array('nid'))
+        ->condition('uid', $account->uid)
+        ->execute()
+        ->fetchCol();
       node_mass_update($nodes, array('uid' => 0));
       // Anonymize old revisions.
-      db_update('node_revision')->fields(array('uid' => 0))->condition('uid', $account->uid)->execute();
+      db_update('node_revision')
+        ->fields(array('uid' => 0))
+        ->condition('uid', $account->uid)
+        ->execute();
       // Clean history.
-      db_delete('history')->condition('uid', $account->uid)->execute();
+      db_delete('history')
+        ->condition('uid', $account->uid)
+        ->execute();
       break;
 
     case 'user_cancel_delete':
       // Delete nodes (current revisions).
-      $nodes = db_select('node', 'n')->fields('n', array('nid'))->condition('uid', $account->uid)->execute()->fetchCol();
+      $nodes = db_select('node', 'n')
+        ->fields('n', array('nid'))
+        ->condition('uid', $account->uid)
+        ->execute()
+        ->fetchCol();
       foreach ($nodes as $nid) {
         node_delete($nid);
       }
       // Delete old revisions.
-      db_delete('node_revision')->condition('uid', $account->uid)->execute();
+      db_delete('node_revision')
+        ->condition('uid', $account->uid)
+        ->execute();
       // Clean history.
-      db_delete('history')->condition('uid', $account->uid)->execute();
+      db_delete('history')
+        ->condition('uid', $account->uid)
+        ->execute();
       break;
   }
 }
Index: modules/user/user.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.install,v
retrieving revision 1.22
diff -u -p -r1.22 user.install
--- modules/user/user.install	13 Apr 2009 12:14:57 -0000	1.22
+++ modules/user/user.install	29 Apr 2009 23:57:08 -0000
@@ -262,7 +262,10 @@ function user_update_7000(&$sandbox) {
       if ($new_hash) {
         // Indicate an updated password.
         $new_hash  = 'U' . $new_hash;
-        db_update('users')->fields(array('pass' => $new_hash))->condition('uid', $account->uid)->execute();
+        db_update('users')
+          ->fields(array('pass' => $new_hash))
+          ->condition('uid', $account->uid)
+          ->execute();
       }
     }
     $ret['#finished'] = $sandbox['user_from']/$sandbox['user_count'];
Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.981
diff -u -p -r1.981 user.module
--- modules/user/user.module	29 Apr 2009 08:04:24 -0000	1.981
+++ modules/user/user.module	29 Apr 2009 23:57:16 -0000
@@ -464,18 +464,20 @@ function user_save($account, $edit = arr
 
     // Reload user roles if provided.
     if (isset($edit['roles']) && is_array($edit['roles'])) {
-      db_delete('users_roles')->condition('uid', $account->uid)->execute();
+      db_delete('users_roles')
+        ->condition('uid', $account->uid)
+        ->execute();
 
+      $query = db_insert('users_roles')->fields(array('uid', 'rid'));
       foreach (array_keys($edit['roles']) as $rid) {
         if (!in_array($rid, array(DRUPAL_ANONYMOUS_RID, DRUPAL_AUTHENTICATED_RID))) {
-          db_insert('users_roles')
-            ->fields(array(
-              'uid' => $account->uid,
-              'rid' => $rid,
-            ))
-            ->execute();
+          $query->values(array(
+            'uid' => $account->uid,
+            'rid' => $rid,
+          ));
         }
       }
+      $query->execute();
     }
 
     // Delete a blocked user's sessions to kick them if they are online.
@@ -552,17 +554,19 @@ function user_save($account, $edit = arr
 
     // Save user roles (delete just to be safe).
     if (isset($edit['roles']) && is_array($edit['roles'])) {
-      db_delete('users_roles')->condition('uid', $edit['uid'])->execute();
+      db_delete('users_roles')
+        ->condition('uid', $edit['uid'])
+        ->execute();
+      $query = db_insert('users_roles')->fields(array('uid', 'rid'));
       foreach (array_keys($edit['roles']) as $rid) {
         if (!in_array($rid, array(DRUPAL_ANONYMOUS_RID, DRUPAL_AUTHENTICATED_RID))) {
-          db_insert('users_roles')
-            ->fields(array(
-              'uid' => $edit['uid'],
-              'rid' => $rid,
-            ))
-            ->execute();
+          $query->values(array(
+            'uid' => $edit['uid'],
+            'rid' => $rid,
+          ));
         }
       }
+      $query->execute();
     }
 
     // Build the finished user object.
@@ -858,20 +862,20 @@ function user_search($op = 'search', $ke
         $find = array();
         // Replace wildcards with MySQL/PostgreSQL wildcards.
         $keys = preg_replace('!\*+!', '%', $keys);
-        $query = db_select('users');
+        $query = db_select('users')->extend('PagerDefault');
         $query->fields('users', array('name', 'uid', 'mail'));
         if (user_access('administer users')) {
           // Administrators can also search in the otherwise private email field.
           $query->condition(db_or()->
-                            where('LOWER(name) LIKE LOWER(:name)', array(':name' => "%$keys%"))->
-                            where('LOWER(mail) LIKE LOWER(:mail)', array(':mail' => "%$keys%")));
+            where('LOWER(name) LIKE LOWER(:name)', array(':name' => "%$keys%"))->
+            where('LOWER(mail) LIKE LOWER(:mail)', array(':mail' => "%$keys%")));
         }
         else {
           $query->where('LOWER(name) LIKE LOWER(:name)', array(':name' => "%$keys%"));
         }
-        $query = $query->extend('PagerDefault')
-                       ->limit(2);
-        $result = $query->execute();
+        $result = $query
+          ->limit(15)
+          ->execute();
         foreach ($result as $account) {
           $find[] = array('title' => $account->name . ' (' . $account->mail . ')', 'link' => url('user/' . $account->uid, array('absolute' => TRUE)));
         }
@@ -1520,14 +1524,8 @@ function user_page_title($account) {
  *   An associative array with module as key and username as value.
  */
 function user_get_authmaps($authname = NULL) {
-  $result = db_query("SELECT authname, module FROM {authmap} WHERE authname = :authname", array(':authname' => $authname));
-  $authmaps = array();
-  $has_rows = FALSE;
-  foreach ($result as $authmap) {
-    $authmaps[$authmap->module] = $authmap->authname;
-    $has_rows = TRUE;
-  }
-  return $has_rows ? $authmaps : 0;
+  $authmaps = db_query("SELECT authname, module FROM {authmap} WHERE authname = :authname", array(':authname' => $authname))->fetchAllKeyed();
+  return count($authmaps) ? $authmaps : 0;
 }
 
 /**
@@ -1548,16 +1546,17 @@ function user_set_authmaps($account, $au
     if ($value) {
       db_merge('authmap')
         ->key(array(
-        'uid' => $account->uid,
-        'module' => $module[1],
-        ))
-        ->fields(array(
-        'authname' => $value,
+          'uid' => $account->uid,
+          'module' => $module[1],
         ))
+        ->fields(array('authname' => $value))
         ->execute();
     }
     else {
-      db_delete('authmap')->condition('uid', $account->uid)->condition('module', $module[1])->execute();
+      db_delete('authmap')
+        ->condition('uid', $account->uid)
+        ->condition('module', $module[1])
+        ->execute();
     }
   }
 }
@@ -1974,7 +1973,10 @@ function _user_cancel($edit, $account, $
       if (!empty($edit['user_cancel_notify'])) {
         _user_mail_notify('status_blocked', $account);
       }
-      db_update('users')->fields(array('status' => 0))->condition('uid', $account->uid)->execute();
+      db_update('users')
+        ->fields(array('status' => 0))
+        ->condition('uid', $account->uid)
+        ->execute();
       drupal_set_message(t('%name has been disabled.', array('%name' => $account->name)));
       watchdog('user', 'Blocked user: %name %email.', array('%name' => $account->name, '%email' => '<' . $account->mail . '>'), WATCHDOG_NOTICE);
       break;
@@ -1985,9 +1987,15 @@ function _user_cancel($edit, $account, $
       if (!empty($edit['user_cancel_notify'])) {
         _user_mail_notify('status_canceled', $account);
       }
-      db_delete('users')->condition('uid', $account->uid)->execute();
-      db_delete('users_roles')->condition('uid', $account->uid)->execute();
-      db_delete('authmap')->condition('uid', $account->uid)->execute();
+      db_delete('users')
+        ->condition('uid', $account->uid)
+        ->execute();
+      db_delete('users_roles')
+        ->condition('uid', $account->uid)
+        ->execute();
+      db_delete('authmap')
+        ->condition('uid', $account->uid)
+        ->execute();
       drupal_set_message(t('%name has been deleted.', array('%name' => $account->name)));
       watchdog('user', 'Deleted user: %name %email.', array('%name' => $account->name, '%email' => '<' . $account->mail . '>'), WATCHDOG_NOTICE);
       break;
@@ -2425,9 +2433,8 @@ function user_filters() {
   if (count($roles)) {
     $filters['role'] = array(
       'title' => t('role'),
-      'where' => "ur.rid = %d",
+      'field' => 'ur.rid',
       'options' => $roles,
-      'join' => '',
     );
   }
 
@@ -2444,28 +2451,27 @@ function user_filters() {
   ksort($options);
   $filters['permission'] = array(
     'title' => t('permission'),
-    'join' => 'LEFT JOIN {role_permission} p ON ur.rid = p.rid',
-    'where' => " (p.permission = '%s' OR u.uid = 1) ",
     'options' => $options,
   );
 
   $filters['status'] = array(
     'title' => t('status'),
-    'where' => 'u.status = %d',
-    'join' => '',
+    'field' => 'u.status',
     'options' => array(1 => t('active'), 0 => t('blocked')),
   );
   return $filters;
 }
 
 /**
- * Build query for user administration filters based on session.
+ * Extends a query object for user administration filters based on session.
+ *
+ * @param $query
+ *   Query object that should be filtered.
  */
-function user_build_filter_query() {
+function user_build_filter_query(SelectQuery $query) {
   $filters = user_filters();
 
-  // Build query
-  $where = $args = $join = array();
+  // Extend Query with filter conditions.
   foreach ($_SESSION['user_overview_filter'] as $filter) {
     list($key, $value) = $filter;
     // This checks to see if this permission filter is an enabled permission for
@@ -2478,19 +2484,13 @@ function user_build_filter_query() {
       if (user_access($value, $account)) {
         continue;
       }
+      $query->leftJoin('role_permission', 'p', 'ur.rid = p.rid');
+      $query->condition(db_or()->condition('u.uid', 1)->condition('p.permission', $value));
+    }
+    else {
+      $query->condition($filters[$key]['field'], $value);
     }
-    $where[] = $filters[$key]['where'];
-    $args[] = $value;
-    $join[] = $filters[$key]['join'];
   }
-  $where = !empty($where) ? 'AND ' . implode(' AND ', $where) : '';
-  $join = !empty($join) ? ' ' . implode(' ', array_unique($join)) : '';
-
-  return array(
-    'where' => $where,
-    'join' => $join,
-    'args' => $args,
-  );
 }
 
 /**
@@ -2721,7 +2721,10 @@ function user_block_user_action(&$object
     global $user;
     $uid = $user->uid;
   }
-  db_update('users')->fields(array('status' => 0))->condition('uid', $uid)->execute();
+  db_update('users')
+    ->fields(array('status' => 0))
+    ->condition('uid', $uid)
+    ->execute();
   drupal_session_destroy_uid($uid);
   watchdog('action', 'Blocked user %name.', array('%name' => $user->name));
 }