diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/argument/UserUid.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/argument/UserUid.php index e4fe764..613d4c8 100644 --- a/core/modules/comment/lib/Drupal/comment/Plugin/views/argument/UserUid.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/argument/UserUid.php @@ -25,10 +25,7 @@ function title() { $title = config('user.settings')->get('anonymous'); } else { - $query = db_select('users', 'u'); - $query->addField('u', 'name'); - $query->condition('u.uid', $this->argument); - $title = $query->execute()->fetchField(); + $title = db_query('SELECT u.name FROM {users} u WHERE u.uid = :uid', array(':uid' => $this->argument))->fetchField(); } if (empty($title)) { return t('No user'); diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeNewComments.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeNewComments.php index 3f3f903..2916a0a 100644 --- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeNewComments.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeNewComments.php @@ -76,16 +76,15 @@ function pre_render(&$values) { } if ($nids) { - $query = db_select('node', 'n'); - $query->addField('n', 'nid'); - $query->innerJoin('comment', 'c', 'n.nid = c.nid'); - $query->addExpression('COUNT(c.cid)', 'num_comments'); - $query->leftJoin('history', 'h', 'h.nid = n.nid'); - $query->condition('n.nid', $nids); - $query->where('c.changed > GREATEST(COALESCE(h.timestamp, :timestamp), :timestamp)', array(':timestamp' => HISTORY_READ_LIMIT)); - $query->condition('c.status', COMMENT_PUBLISHED); - $query->groupBy('n.nid'); - $result = $query->execute(); + $result = db_query("SELECT n.nid, COUNT(c.cid) as num_comments FROM {node} n INNER JOIN {comment} c ON n.nid = c.nid + LEFT JOIN {history} h ON h.nid = n.nid AND h.uid = :h_uid WHERE n.nid IN (:nids) + AND c.changed > GREATEST(COALESCE(h.timestamp, :timestamp), :timestamp) AND c.status = :status GROUP BY n.nid", array( + ':status' => COMMENT_PUBLISHED, + ':h_uid' => $user->uid, + ':nids' => $nids, + ':timestamp' => HISTORY_READ_LIMIT, + )); + foreach ($result as $node) { foreach ($ids[$node->nid] as $id) { $values[$id]->{$this->field_alias} = $node->num_comments; diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/argument/Vid.php b/core/modules/node/lib/Drupal/node/Plugin/views/argument/Vid.php index eb2565b..3728d83 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/views/argument/Vid.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/argument/Vid.php @@ -25,11 +25,7 @@ class Vid extends Numeric { function title_query() { $titles = array(); - $results = db_select('node_field_revision', 'npr') - ->fields('npr', array('vid', 'nid', 'title')) - ->condition('npr.vid', $this->value) - ->execute() - ->fetchAllAssoc('vid', PDO::FETCH_ASSOC); + $results = db_query("SELECT npr.vid, npr.nid, npr.title FROM {node_field_revision} npr WHERE npr.vid IN (:vids)", array(':vids' => $this->value))->fetchAllAssoc('vid', PDO::FETCH_ASSOC); $nids = array(); foreach ($results as $result) { $nids[] = $result['nid']; diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/argument_validator/User.php b/core/modules/user/lib/Drupal/user/Plugin/views/argument_validator/User.php index 929ed42..c84916e 100644 --- a/core/modules/user/lib/Drupal/user/Plugin/views/argument_validator/User.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/argument_validator/User.php @@ -120,10 +120,7 @@ function validate_argument($argument) { $roles = $this->options['roles']; $account->roles = array(); $account->roles[] = $account->uid ? DRUPAL_AUTHENTICATED_RID : DRUPAL_ANONYMOUS_RID; - $query = db_select('users_roles', 'u'); - $query->addField('u', 'rid'); - $query->condition('u.uid', $account->uid); - $result = $query->execute(); + $result = db_query('SELECT rid FROM {users_roles} WHERE uid = :uid', array(':uid' => $account->uid)); foreach ($result as $role) { $account->roles[] = $role->rid; } diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/Permissions.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/Permissions.php index 7aa22fe..bf55cb3 100644 --- a/core/modules/user/lib/Drupal/user/Plugin/views/field/Permissions.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/Permissions.php @@ -55,14 +55,8 @@ function pre_render(&$values) { $permissions = module_invoke_all('permission'); - $query = db_select('role_permission', 'rp'); - $query->join('users_roles', 'u', 'u.rid = rp.rid'); - $query->fields('u', array('uid', 'rid')); - $query->addField('rp', 'permission'); - $query->condition('u.uid', $uids); - $query->condition('rp.module', array_keys($modules)); - $query->orderBy('rp.permission'); - $result = $query->execute(); + $result = db_query("SELECT u.uid, u.rid, rp.permission FROM {role_permission} rp INNER JOIN {users_roles} u ON u.rid = rp.rid WHERE u.uid IN (:uids) AND rp.module IN (:modules) ORDER BY rp.permission", + array(':uids' => $uids, ':modules' => array_keys($modules))); foreach ($result as $perm) { $this->items[$perm->uid][$perm->permission]['permission'] = $permissions[$perm->permission]['title']; diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/Roles.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/Roles.php index 64480b5..e23e5c5 100644 --- a/core/modules/user/lib/Drupal/user/Plugin/views/field/Roles.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/Roles.php @@ -45,12 +45,7 @@ function pre_render(&$values) { if ($uids) { $roles = user_roles(); - $query = db_select('users_roles', 'u'); - $query->fields('u', array('uid', 'rid')); - $query->condition('u.rid', array_keys($roles)); - $query->condition('u.uid', $uids); - - $result = $query->execute(); + $result = db_query("SELECT u.uid, u.rid FROM {users_roles} u WHERE u.uid IN (:uids) AND u.rid IN (:rids)", array(':uids' => $uids, ':rids' => array_keys($roles))); foreach ($result as $role) { $this->items[$role->uid][$role->rid]['role'] = check_plain($roles[$role->rid]->label()); $this->items[$role->uid][$role->rid]['rid'] = $role->rid;