diff options
| -rw-r--r-- | lib/private/DB/QueryBuilder/Sharded/ShardedQueryBuilder.php | 2 | ||||
| -rw-r--r-- | lib/private/User/Manager.php | 25 |
2 files changed, 5 insertions, 22 deletions
diff --git a/lib/private/DB/QueryBuilder/Sharded/ShardedQueryBuilder.php b/lib/private/DB/QueryBuilder/Sharded/ShardedQueryBuilder.php index e5b66470de0..4caab8aec15 100644 --- a/lib/private/DB/QueryBuilder/Sharded/ShardedQueryBuilder.php +++ b/lib/private/DB/QueryBuilder/Sharded/ShardedQueryBuilder.php @@ -277,7 +277,7 @@ class ShardedQueryBuilder extends ExtendedQueryBuilder { public function addOrderBy($sort, $order = null) { $this->registerOrder((string)$sort, (string)$order ?? 'ASC'); - return parent::orderBy($sort, $order); + return parent::addOrderBy($sort, $order); } public function orderBy($sort, $order = null) { diff --git a/lib/private/User/Manager.php b/lib/private/User/Manager.php index 5e99107e504..2ca0359e4d4 100644 --- a/lib/private/User/Manager.php +++ b/lib/private/User/Manager.php @@ -754,27 +754,10 @@ class Manager extends PublicEmitter implements IUserManager { $connection = \OC::$server->getDatabaseConnection(); $queryBuilder = $connection->getQueryBuilder(); - $queryBuilder->selectDistinct('uid') - ->from('users', 'u') - ->leftJoin('u', 'preferences', 'p', $queryBuilder->expr()->andX( - $queryBuilder->expr()->eq('p.userid', 'uid'), - $queryBuilder->expr()->eq('p.appid', $queryBuilder->expr()->literal('login')), - $queryBuilder->expr()->eq('p.configkey', $queryBuilder->expr()->literal('lastLogin'))) - ); - if($search !== '') { - $queryBuilder->leftJoin('u', 'preferences', 'p1', $queryBuilder->expr()->andX( - $queryBuilder->expr()->eq('p1.userid', 'uid'), - $queryBuilder->expr()->eq('p1.appid', $queryBuilder->expr()->literal('settings')), - $queryBuilder->expr()->eq('p1.configkey', $queryBuilder->expr()->literal('email'))) - ) - // sqlite doesn't like re-using a single named parameter here - ->where($queryBuilder->expr()->iLike('uid', $queryBuilder->createPositionalParameter('%' . $connection->escapeLikeParameter($search) . '%'))) - ->orWhere($queryBuilder->expr()->iLike('displayname', $queryBuilder->createPositionalParameter('%' . $connection->escapeLikeParameter($search) . '%'))) - ->orWhere($queryBuilder->expr()->iLike('p1.configvalue', $queryBuilder->createPositionalParameter('%' . $connection->escapeLikeParameter($search) . '%')) - ); - } - $queryBuilder->orderBy($queryBuilder->func()->lower('p.configvalue'), 'DESC') - ->addOrderBy('uid_lower', 'ASC') + $queryBuilder->select('pref_login.userid') + ->from('preferences', 'pref_login') + ->where($queryBuilder->expr()->eq('pref_login.appid', $queryBuilder->expr()->literal('login'))) + ->andWhere($queryBuilder->expr()->eq('pref_login.configkey', $queryBuilder->expr()->literal('lastLogin'))) ->setFirstResult($offset) ->setMaxResults($limit) ; |