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 1 commit
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
Prev Previous commit
Next Next commit
refactor(querybuilder): Port away from qb::execute() in tests/ 
Replace by either executeStatement or executeQuery

Signed-off-by: Carl Schwan <[email protected]>
  • Loading branch information
@CarlSchwan
Carl Schwan authored and CarlSchwan committed Sep 2, 2025
commit 9b2fff5931d939218e22b5c9945bc7d6956864c8
18 changes: 9 additions & 9 deletions tests/lib/Authentication/Token/PublicKeyTokenMapperTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ protected function setUp(): void {

private function resetDatabase() {
$qb = $this->dbConnection->getQueryBuilder();
$qb->delete('authtoken')->execute();
$qb->delete('authtoken')->executeStatement();
$qb->insert('authtoken')->values([
'uid' => $qb->createNamedParameter('user1'),
'login_name' => $qb->createNamedParameter('User1'),
Expand All @@ -56,7 +56,7 @@ private function resetDatabase() {
'public_key' => $qb->createNamedParameter('public key'),
'private_key' => $qb->createNamedParameter('private key'),
'version' => $qb->createNamedParameter(2),
])->execute();
])->executeStatement();
$qb->insert('authtoken')->values([
'uid' => $qb->createNamedParameter('user2'),
'login_name' => $qb->createNamedParameter('User2'),
Expand All @@ -69,7 +69,7 @@ private function resetDatabase() {
'public_key' => $qb->createNamedParameter('public key'),
'private_key' => $qb->createNamedParameter('private key'),
'version' => $qb->createNamedParameter(2),
])->execute();
])->executeStatement();
$qb->insert('authtoken')->values([
'uid' => $qb->createNamedParameter('user1'),
'login_name' => $qb->createNamedParameter('User1'),
Expand All @@ -82,7 +82,7 @@ private function resetDatabase() {
'public_key' => $qb->createNamedParameter('public key'),
'private_key' => $qb->createNamedParameter('private key'),
'version' => $qb->createNamedParameter(2),
])->execute();
])->executeStatement();
$qb->insert('authtoken')->values([
'uid' => $qb->createNamedParameter('user3'),
'login_name' => $qb->createNamedParameter('User3'),
Expand All @@ -96,7 +96,7 @@ private function resetDatabase() {
'private_key' => $qb->createNamedParameter('private key'),
'version' => $qb->createNamedParameter(2),
'password_invalid' => $qb->createNamedParameter(1),
])->execute();
])->executeStatement();
$qb->insert('authtoken')->values([
'uid' => $qb->createNamedParameter('user3'),
'login_name' => $qb->createNamedParameter('User3'),
Expand All @@ -110,14 +110,14 @@ private function resetDatabase() {
'private_key' => $qb->createNamedParameter('private key'),
'version' => $qb->createNamedParameter(2),
'password_invalid' => $qb->createNamedParameter(1),
])->execute();
])->executeStatement();
}

private function getNumberOfTokens() {
$qb = $this->dbConnection->getQueryBuilder();
$result = $qb->select($qb->func()->count('*', 'count'))
->from('authtoken')
->execute()
->executeQuery()
->fetch();
return (int)$result['count'];
}
Expand Down Expand Up @@ -240,7 +240,7 @@ public function testGetById(): void {
$qb->select('id')
->from('authtoken')
->where($qb->expr()->eq('token', $qb->createNamedParameter('9c5a2e661482b65597408a6bb6c4a3d1af36337381872ac56e445a06cdb7fea2b1039db707545c11027a4966919918b19d875a8b774840b18c6cbb7ae56fe206')));
$result = $qb->execute();
$result = $qb->executeQuery();
$id = $result->fetch()['id'];

$token = $this->mapper->getTokenById((int)$id);
Expand All @@ -252,7 +252,7 @@ public function testDeleteByName(): void {
$qb->select('name')
->from('authtoken')
->where($qb->expr()->eq('token', $qb->createNamedParameter('9c5a2e661482b65597408a6bb6c4a3d1af36337381872ac56e445a06cdb7fea2b1039db707545c11027a4966919918b19d875a8b774840b18c6cbb7ae56fe206')));
$result = $qb->execute();
$result = $qb->executeQuery();
$name = $result->fetch()['name'];
$this->mapper->deleteByName($name);
$this->assertEquals(4, $this->getNumberOfTokens());
Expand Down
12 changes: 6 additions & 6 deletions tests/lib/Authentication/TwoFactorAuth/Db/ProviderUserAssignmentDaoTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ protected function setUp(): void {
$this->dbConn = Server::get(IDBConnection::class);
$qb = $this->dbConn->getQueryBuilder();
$q = $qb->delete(ProviderUserAssignmentDao::TABLE_NAME);
$q->execute();
$q->executeStatement();

$this->dao = new ProviderUserAssignmentDao($this->dbConn);
}
Expand All @@ -42,13 +42,13 @@ public function testGetState(): void {
'uid' => $qb->createNamedParameter('user123'),
'enabled' => $qb->createNamedParameter(1),
]);
$q1->execute();
$q1->executeStatement();
$q2 = $qb->insert(ProviderUserAssignmentDao::TABLE_NAME)->values([
'provider_id' => $qb->createNamedParameter('twofactor_totp'),
'uid' => $qb->createNamedParameter('user123'),
'enabled' => $qb->createNamedParameter(0),
]);
$q2->execute();
$q2->executeStatement();
$expected = [
'twofactor_u2f' => true,
'twofactor_totp' => false,
Expand All @@ -70,7 +70,7 @@ public function testPersist(): void {
->where($qb->expr()->eq('provider_id', $qb->createNamedParameter('twofactor_totp')))
->andWhere($qb->expr()->eq('uid', $qb->createNamedParameter('user123')))
->andWhere($qb->expr()->eq('enabled', $qb->createNamedParameter(0)));
$res = $q->execute();
$res = $q->executeQuery();
$data = $res->fetchAll();
$res->closeCursor();
$this->assertCount(1, $data);
Expand All @@ -88,7 +88,7 @@ public function testPersistTwice(): void {
->where($qb->expr()->eq('provider_id', $qb->createNamedParameter('twofactor_totp')))
->andWhere($qb->expr()->eq('uid', $qb->createNamedParameter('user123')))
->andWhere($qb->expr()->eq('enabled', $qb->createNamedParameter(1)));
$res = $q->execute();
$res = $q->executeQuery();
$data = $res->fetchAll();
$res->closeCursor();

Expand All @@ -107,7 +107,7 @@ public function testPersistSameStateTwice(): void {
->where($qb->expr()->eq('provider_id', $qb->createNamedParameter('twofactor_totp')))
->andWhere($qb->expr()->eq('uid', $qb->createNamedParameter('user123')))
->andWhere($qb->expr()->eq('enabled', $qb->createNamedParameter(1)));
$res = $q->execute();
$res = $q->executeQuery();
$data = $res->fetchAll();
$res->closeCursor();

Expand Down
2 changes: 1 addition & 1 deletion tests/lib/BackgroundJob/JobListTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ protected function setUp(): void {
protected function clearJobsList() {
$query = $this->connection->getQueryBuilder();
$query->delete('jobs');
$query->execute();
$query->executeStatement();
}

protected function getAllSorted() {
Expand Down
34 changes: 17 additions & 17 deletions tests/lib/Calendar/ResourcesRoomsUpdaterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,10 @@ protected function setUp(): void {

protected function tearDown(): void {
$query = self::$realDatabase->getQueryBuilder();
$query->delete('calendar_resources')->execute();
$query->delete('calendar_resources_md')->execute();
$query->delete('calendar_rooms')->execute();
$query->delete('calendar_rooms_md')->execute();
$query->delete('calendar_resources')->executeStatement();
$query->delete('calendar_resources_md')->executeStatement();
$query->delete('calendar_rooms')->executeStatement();
$query->delete('calendar_rooms_md')->executeStatement();
}

/**
Expand Down Expand Up @@ -215,7 +215,7 @@ public function testUpdateBoth(): void {

$rows = [];
$ids = [];
$stmt = $query->execute();
$stmt = $query->executeQuery();
while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
$ids[$row['backend_id'] . '::' . $row['resource_id']] = $row['id'];
unset($row['id']);
Expand Down Expand Up @@ -285,7 +285,7 @@ public function testUpdateBoth(): void {
$query2->select('*')->from('calendar_resources_md');

$rows2 = [];
$stmt = $query2->execute();
$stmt = $query2->executeQuery();
while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
unset($row['id']);
$rows2[] = $row;
Expand Down Expand Up @@ -345,7 +345,7 @@ protected function createTestResourcesInCache() {
'displayname' => $query->createNamedParameter('Beamer1'),
'group_restrictions' => $query->createNamedParameter('[]'),
])
->execute();
->executeStatement();

$query->insert('calendar_resources')
->values([
Expand All @@ -355,7 +355,7 @@ protected function createTestResourcesInCache() {
'displayname' => $query->createNamedParameter('TV1'),
'group_restrictions' => $query->createNamedParameter('[]'),
])
->execute();
->executeStatement();

$query->insert('calendar_resources')
->values([
Expand All @@ -365,7 +365,7 @@ protected function createTestResourcesInCache() {
'displayname' => $query->createNamedParameter('Beamer2'),
'group_restrictions' => $query->createNamedParameter('[]'),
])
->execute();
->executeStatement();
$id3 = $query->getLastInsertId();

$query->insert('calendar_resources')
Expand All @@ -376,7 +376,7 @@ protected function createTestResourcesInCache() {
'displayname' => $query->createNamedParameter('TV2'),
'group_restrictions' => $query->createNamedParameter('[]'),
])
->execute();
->executeStatement();
$id4 = $query->getLastInsertId();

$query->insert('calendar_resources')
Expand All @@ -387,7 +387,7 @@ protected function createTestResourcesInCache() {
'displayname' => $query->createNamedParameter('Beamer3'),
'group_restrictions' => $query->createNamedParameter('[]'),
])
->execute();
->executeStatement();

$query->insert('calendar_resources')
->values([
Expand All @@ -397,7 +397,7 @@ protected function createTestResourcesInCache() {
'displayname' => $query->createNamedParameter('Pointer'),
'group_restrictions' => $query->createNamedParameter('["foo", "bar"]'),
])
->execute();
->executeStatement();
$id6 = $query->getLastInsertId();

$query->insert('calendar_resources_md')
Expand All @@ -406,34 +406,34 @@ protected function createTestResourcesInCache() {
'key' => $query->createNamedParameter('meta1'),
'value' => $query->createNamedParameter('value1')
])
->execute();
->executeStatement();
$query->insert('calendar_resources_md')
->values([
'resource_id' => $query->createNamedParameter($id3),
'key' => $query->createNamedParameter('meta2'),
'value' => $query->createNamedParameter('value2')
])
->execute();
->executeStatement();
$query->insert('calendar_resources_md')
->values([
'resource_id' => $query->createNamedParameter($id4),
'key' => $query->createNamedParameter('meta1'),
'value' => $query->createNamedParameter('value1')
])
->execute();
->executeStatement();
$query->insert('calendar_resources_md')
->values([
'resource_id' => $query->createNamedParameter($id4),
'key' => $query->createNamedParameter('meta3'),
'value' => $query->createNamedParameter('value3-old')
])
->execute();
->executeStatement();
$query->insert('calendar_resources_md')
->values([
'resource_id' => $query->createNamedParameter($id6),
'key' => $query->createNamedParameter('meta99'),
'value' => $query->createNamedParameter('value99')
])
->execute();
->executeStatement();
}
}
4 changes: 2 additions & 2 deletions tests/lib/DB/AdapterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public function tearDown(): void {
$qb->delete('appconfig')
->from('appconfig')
->where($qb->expr()->eq('appid', $qb->createNamedParameter($this->appId)))
->execute();
->executeStatement();
}

public function testInsertIgnoreOnConflictDuplicate(): void {
Expand Down Expand Up @@ -63,7 +63,7 @@ private function getRows(string $configKey): array {
->from('appconfig')
->where($qb->expr()->eq('appid', $qb->createNamedParameter($this->appId)))
->andWhere($qb->expr()->eq('configkey', $qb->createNamedParameter($configKey)))
->execute()
->executeQuery()
->fetchAll();
}
}
6 changes: 3 additions & 3 deletions tests/lib/DB/QueryBuilder/ExpressionBuilderDBTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public function testLike($param1, $param2, $match): void {
->from('users')
->where($query->expr()->like($query->createNamedParameter($param1), $query->createNamedParameter($param2)));

$result = $query->execute();
$result = $query->executeQuery();
$column = $result->fetchOne();
$result->closeCursor();
$this->assertEquals($match, $column);
Expand Down Expand Up @@ -98,7 +98,7 @@ public function testILike($param1, $param2, $match): void {
->from('users')
->where($query->expr()->iLike($query->createNamedParameter($param1), $query->createNamedParameter($param2)));

$result = $query->execute();
$result = $query->executeQuery();
$column = $result->fetchOne();
$result->closeCursor();
$this->assertEquals($match, $column);
Expand Down Expand Up @@ -204,7 +204,7 @@ protected function createConfig($appId, $key, $value) {
'configkey' => $query->createNamedParameter((string)$key),
'configvalue' => $query->createNamedParameter((string)$value),
])
->execute();
->executeStatement();
}

protected function prepareTestingTable(): void {
Expand Down
6 changes: 3 additions & 3 deletions tests/lib/DB/QueryBuilder/ExpressionBuilderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,15 +407,15 @@ public function testClobComparisons($function, $value, $type, $compareKeyToValue
$query->andWhere(call_user_func([$query->expr(), $function], 'configkey', 'configvalue', IQueryBuilder::PARAM_STR));
}

$result = $query->execute();
$result = $query->executeQuery();

$this->assertEquals(['count' => $expected], $result->fetch());
$result->closeCursor();

$query = $this->connection->getQueryBuilder();
$query->delete('appconfig')
->where($query->expr()->eq('appid', $query->createNamedParameter($appId)))
->execute();
->executeStatement();
}

protected function createConfig($appId, $key, $value) {
Expand All @@ -426,6 +426,6 @@ protected function createConfig($appId, $key, $value) {
'configkey' => $query->createNamedParameter((string)$key),
'configvalue' => $query->createNamedParameter((string)$value),
])
->execute();
->executeStatement();
}
}
Loading