Skip to content

Port away from IQueryBuilder::execute in lib/ and tests/ and fix invalid usage of UniqueConstraintViolationException #54664

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CarlSchwan merged 4 commits into from
Sep 2, 2025
Merged

Port away from IQueryBuilder::execute in lib/ and tests/ and fix invalid usage of UniqueConstraintViolationException #54664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c21b816
refactor(querybuilder): Port away from qb::execute() in lib/
Aug 26, 2025
c4e6fbd
fix(query-builder): Don't catch UniqueConstraintViolationException
Aug 26, 2025
9b2fff5
refactor(querybuilder): Port away from qb::execute() in tests/
Aug 26, 2025
996be0f
fix(comments): Don's catch invalid DriverException
Aug 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions lib/private/Authentication/Token/Manager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
*/
namespace OC\Authentication\Token;

use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
use OC\Authentication\Exceptions\InvalidTokenException as OcInvalidTokenException;
use OC\Authentication\Exceptions\PasswordlessTokenException;
use OCP\Authentication\Exceptions\ExpiredTokenException;
use OCP\Authentication\Exceptions\InvalidTokenException;
use OCP\Authentication\Exceptions\WipeTokenException;
use OCP\Authentication\Token\IProvider as OCPIProvider;
use OCP\Authentication\Token\IToken as OCPIToken;
use OCP\DB\Exception;

class Manager implements IProvider, OCPIProvider {
/** @var PublicKeyTokenProvider */
Expand Down Expand Up @@ -60,7 +60,10 @@ public function generateToken(string $token,
$remember,
$scope,
);
} catch (UniqueConstraintViolationException $e) {
} catch (Exception $e) {
if ($e->getReason() !== Exception::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
throw $e;
}
// It's rare, but if two requests of the same session (e.g. env-based SAML)
// try to create the session token they might end up here at the same time
// because we use the session ID as token and the db token is created anew
Expand Down
2 changes: 1 addition & 1 deletion lib/private/Collaboration/Resources/Collection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public function addResource(IResource $resource): void {
]);

try {
$query->execute();
$query->executeStatement();
} catch (ConstraintViolationException $e) {
throw new ResourceException('Already part of the collection');
}
Expand Down
48 changes: 27 additions & 21 deletions lib/private/Collaboration/Resources/Manager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
*/
namespace OC\Collaboration\Resources;

use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
use OCP\Collaboration\Resources\CollectionException;
use OCP\Collaboration\Resources\ICollection;
use OCP\Collaboration\Resources\IManager;
use OCP\Collaboration\Resources\IProvider;
use OCP\Collaboration\Resources\IProviderManager;
use OCP\Collaboration\Resources\IResource;
use OCP\Collaboration\Resources\ResourceException;
use OCP\DB\Exception;
use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\IDBConnection;
use OCP\IUser;
Expand Down Expand Up @@ -45,7 +45,7 @@ public function getCollection(int $id): ICollection {
$query->select('*')
->from(self::TABLE_COLLECTIONS)
->where($query->expr()->eq('id', $query->createNamedParameter($id, IQueryBuilder::PARAM_INT)));
$result = $query->execute();
$result = $query->executeQuery();
$row = $result->fetch();
$result->closeCursor();

Expand Down Expand Up @@ -74,7 +74,7 @@ public function getCollectionForUser(int $id, ?IUser $user): ICollection {
)
)
->where($query->expr()->eq('c.id', $query->createNamedParameter($id, IQueryBuilder::PARAM_INT)));
$result = $query->execute();
$result = $query->executeQuery();
$row = $result->fetch();
$result->closeCursor();

Expand Down Expand Up @@ -116,7 +116,7 @@ public function searchCollections(IUser $user, string $filter, int $limit = 50,
$query->andWhere($query->expr()->iLike('c.name', $query->createNamedParameter('%' . $this->connection->escapeLikeParameter($filter) . '%')));
}

$result = $query->execute();
$result = $query->executeQuery();
$collections = [];

$foundResults = 0;
Expand Down Expand Up @@ -146,7 +146,7 @@ public function newCollection(string $name): ICollection {
->values([
'name' => $query->createNamedParameter($name),
]);
$query->execute();
$query->executeStatement();

return new Collection($this, $this->connection, $query->getLastInsertId(), $name);
}
Expand Down Expand Up @@ -178,7 +178,7 @@ public function getResourceForUser(string $type, string $id, ?IUser $user): IRes
)
->where($query->expr()->eq('r.resource_type', $query->createNamedParameter($type, IQueryBuilder::PARAM_STR)))
->andWhere($query->expr()->eq('r.resource_id', $query->createNamedParameter($id, IQueryBuilder::PARAM_STR)));
$result = $query->execute();
$result = $query->executeQuery();
$row = $result->fetch();
$result->closeCursor();

Expand Down Expand Up @@ -215,7 +215,7 @@ public function getResourcesByCollectionForUser(ICollection $collection, ?IUser
->where($query->expr()->eq('r.collection_id', $query->createNamedParameter($collection->getId(), IQueryBuilder::PARAM_INT)));

$resources = [];
$result = $query->execute();
$result = $query->executeQuery();
while ($row = $result->fetch()) {
$access = $row['access'] === null ? null : (bool)$row['access'];
$resources[] = new Resource($this, $this->connection, $row['resource_type'], $row['resource_id'], $user, $access);
Expand Down Expand Up @@ -309,7 +309,7 @@ protected function checkAccessCacheForUserByResource(IResource $resource, ?IUser
->setMaxResults(1);

$hasAccess = null;
$result = $query->execute();
$result = $query->executeQuery();
if ($row = $result->fetch()) {
$hasAccess = (bool)$row['access'];
}
Expand All @@ -329,7 +329,7 @@ protected function checkAccessCacheForUserByCollection(ICollection $collection,
->setMaxResults(1);

$hasAccess = null;
$result = $query->execute();
$result = $query->executeQuery();
if ($row = $result->fetch()) {
$hasAccess = (bool)$row['access'];
}
Expand All @@ -350,8 +350,11 @@ public function cacheAccessForResource(IResource $resource, ?IUser $user, bool $
'access' => $query->createNamedParameter($access, IQueryBuilder::PARAM_BOOL),
]);
try {
$query->execute();
} catch (UniqueConstraintViolationException $e) {
$query->executeStatement();
} catch (Exception $e) {
if ($e->getReason() !== Exception::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
throw $e;
}
}
}

Expand All @@ -366,8 +369,11 @@ public function cacheAccessForCollection(ICollection $collection, ?IUser $user,
'access' => $query->createNamedParameter($access, IQueryBuilder::PARAM_BOOL),
]);
try {
$query->execute();
} catch (UniqueConstraintViolationException $e) {
$query->executeStatement();
} catch (Exception $e) {
if ($e->getReason() !== Exception::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
throw $e;
}
}
}

Expand All @@ -377,7 +383,7 @@ public function invalidateAccessCacheForUser(?IUser $user): void {

$query->delete(self::TABLE_ACCESS_CACHE)
->where($query->expr()->eq('user_id', $query->createNamedParameter($userId)));
$query->execute();
$query->executeStatement();
}

public function invalidateAccessCacheForResource(IResource $resource): void {
Expand All @@ -386,7 +392,7 @@ public function invalidateAccessCacheForResource(IResource $resource): void {
$query->delete(self::TABLE_ACCESS_CACHE)
->where($query->expr()->eq('resource_id', $query->createNamedParameter($resource->getId())))
->andWhere($query->expr()->eq('resource_type', $query->createNamedParameter($resource->getType(), IQueryBuilder::PARAM_STR)));
$query->execute();
$query->executeStatement();

foreach ($resource->getCollections() as $collection) {
$this->invalidateAccessCacheForCollection($collection);
Expand All @@ -398,23 +404,23 @@ public function invalidateAccessCacheForAllCollections(): void {

$query->delete(self::TABLE_ACCESS_CACHE)
->where($query->expr()->neq('collection_id', $query->createNamedParameter(0)));
$query->execute();
$query->executeStatement();
}

public function invalidateAccessCacheForCollection(ICollection $collection): void {
$query = $this->connection->getQueryBuilder();

$query->delete(self::TABLE_ACCESS_CACHE)
->where($query->expr()->eq('collection_id', $query->createNamedParameter($collection->getId())));
$query->execute();
$query->executeStatement();
}

public function invalidateAccessCacheForProvider(IProvider $provider): void {
$query = $this->connection->getQueryBuilder();

$query->delete(self::TABLE_ACCESS_CACHE)
->where($query->expr()->eq('resource_type', $query->createNamedParameter($provider->getType(), IQueryBuilder::PARAM_STR)));
$query->execute();
$query->executeStatement();
}

public function invalidateAccessCacheForResourceByUser(IResource $resource, ?IUser $user): void {
Expand All @@ -424,7 +430,7 @@ public function invalidateAccessCacheForResourceByUser(IResource $resource, ?IUs
$query->delete(self::TABLE_ACCESS_CACHE)
->where($query->expr()->eq('resource_id', $query->createNamedParameter($resource->getId())))
->andWhere($query->expr()->eq('user_id', $query->createNamedParameter($userId)));
$query->execute();
$query->executeStatement();

foreach ($resource->getCollections() as $collection) {
$this->invalidateAccessCacheForCollectionByUser($collection, $user);
Expand All @@ -438,7 +444,7 @@ protected function invalidateAccessCacheForCollectionByUser(ICollection $collect
$query->delete(self::TABLE_ACCESS_CACHE)
->where($query->expr()->eq('collection_id', $query->createNamedParameter($collection->getId())))
->andWhere($query->expr()->eq('user_id', $query->createNamedParameter($userId)));
$query->execute();
$query->executeStatement();
}

public function invalidateAccessCacheForProviderByUser(IProvider $provider, ?IUser $user): void {
Expand All @@ -448,7 +454,7 @@ public function invalidateAccessCacheForProviderByUser(IProvider $provider, ?IUs
$query->delete(self::TABLE_ACCESS_CACHE)
->where($query->expr()->eq('resource_type', $query->createNamedParameter($provider->getType(), IQueryBuilder::PARAM_STR)))
->andWhere($query->expr()->eq('user_id', $query->createNamedParameter($userId)));
$query->execute();
$query->executeStatement();
}

public function registerResourceProvider(string $provider): void {
Expand Down
2 changes: 1 addition & 1 deletion lib/private/Collaboration/Resources/Resource.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public function getCollections(): array {
->where($query->expr()->eq('resource_type', $query->createNamedParameter($this->getType())))
->andWhere($query->expr()->eq('resource_id', $query->createNamedParameter($this->getId())));

$result = $query->execute();
$result = $query->executeQuery();
while ($row = $result->fetch()) {
$collections[] = $this->manager->getCollection((int)$row['collection_id']);
}
Expand Down
Loading
Loading