Skip to content

Commit 7a2e251

Browse files
kesselbkesselb
authored
Merge pull request #55085 from nextcloud/carl/execute-apps
Port away from IQueryBuilder::execute in apps/
2 parents 0baaebd + 8555f98 commit 7a2e251

27 files changed

Lines changed: 196 additions & 306 deletions

‎apps/dav/lib/BackgroundJob/CleanupInvitationTokenJob.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ public function __construct(
2525
$this->setTimeSensitivity(self::TIME_INSENSITIVE);
2626
}
2727

28-
public function run($argument) {
28+
public function run($argument): void {
2929
$query = $this->db->getQueryBuilder();
3030
$query->delete('calendar_invitations')
3131
->where($query->expr()->lt('expiration',
3232
$query->createNamedParameter($this->time->getTime())))
33-
->execute();
33+
->executeStatement();
3434
}
3535
}

‎apps/dav/lib/CalDAV/ResourceBooking/AbstractPrincipalBackend.php‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,12 @@ public function getPrincipalsByPrefix($prefixPath): array {
7272
$query = $this->db->getQueryBuilder();
7373
$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname'])
7474
->from($this->dbTableName);
75-
$stmt = $query->execute();
75+
$stmt = $query->executeQuery();
7676

7777
$metaDataQuery = $this->db->getQueryBuilder();
7878
$metaDataQuery->select([$this->dbForeignKeyName, 'key', 'value'])
7979
->from($this->dbMetaDataTableName);
80-
$metaDataStmt = $metaDataQuery->execute();
80+
$metaDataStmt = $metaDataQuery->executeQuery();
8181
$metaDataRows = $metaDataStmt->fetchAll(\PDO::FETCH_ASSOC);
8282

8383
$metaDataById = [];
@@ -128,7 +128,7 @@ public function getPrincipalByPath($path) {
128128
->from($this->dbTableName)
129129
->where($query->expr()->eq('backend_id', $query->createNamedParameter($backendId)))
130130
->andWhere($query->expr()->eq('resource_id', $query->createNamedParameter($resourceId)));
131-
$stmt = $query->execute();
131+
$stmt = $query->executeQuery();
132132
$row = $stmt->fetch(\PDO::FETCH_ASSOC);
133133

134134
if (!$row) {
@@ -139,7 +139,7 @@ public function getPrincipalByPath($path) {
139139
$metaDataQuery->select(['key', 'value'])
140140
->from($this->dbMetaDataTableName)
141141
->where($metaDataQuery->expr()->eq($this->dbForeignKeyName, $metaDataQuery->createNamedParameter($row['id'])));
142-
$metaDataStmt = $metaDataQuery->execute();
142+
$metaDataStmt = $metaDataQuery->executeQuery();
143143
$metaDataRows = $metaDataStmt->fetchAll(\PDO::FETCH_ASSOC);
144144
$metadata = [];
145145

@@ -159,7 +159,7 @@ public function getPrincipalById($id): ?array {
159159
$query->select(['id', 'backend_id', 'resource_id', 'email', 'displayname'])
160160
->from($this->dbTableName)
161161
->where($query->expr()->eq('id', $query->createNamedParameter($id)));
162-
$stmt = $query->execute();
162+
$stmt = $query->executeQuery();
163163
$row = $stmt->fetch(\PDO::FETCH_ASSOC);
164164

165165
if (!$row) {
@@ -170,7 +170,7 @@ public function getPrincipalById($id): ?array {
170170
$metaDataQuery->select(['key', 'value'])
171171
->from($this->dbMetaDataTableName)
172172
->where($metaDataQuery->expr()->eq($this->dbForeignKeyName, $metaDataQuery->createNamedParameter($row['id'])));
173-
$metaDataStmt = $metaDataQuery->execute();
173+
$metaDataStmt = $metaDataQuery->executeQuery();
174174
$metaDataRows = $metaDataStmt->fetchAll(\PDO::FETCH_ASSOC);
175175
$metadata = [];
176176

@@ -219,7 +219,7 @@ public function searchPrincipals($prefixPath, array $searchProperties, $test = '
219219
->from($this->dbTableName)
220220
->where($query->expr()->iLike('email', $query->createNamedParameter('%' . $this->db->escapeLikeParameter($value) . '%')));
221221

222-
$stmt = $query->execute();
222+
$stmt = $query->executeQuery();
223223
$principals = [];
224224
while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
225225
if (!$this->isAllowedToAccessResource($row, $usersGroups)) {
@@ -238,7 +238,7 @@ public function searchPrincipals($prefixPath, array $searchProperties, $test = '
238238
->from($this->dbTableName)
239239
->where($query->expr()->iLike('displayname', $query->createNamedParameter('%' . $this->db->escapeLikeParameter($value) . '%')));
240240

241-
$stmt = $query->execute();
241+
$stmt = $query->executeQuery();
242242
$principals = [];
243243
while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
244244
if (!$this->isAllowedToAccessResource($row, $usersGroups)) {
@@ -406,7 +406,7 @@ public function findByUri($uri, $principalPrefix): ?string {
406406
->from($this->dbTableName)
407407
->where($query->expr()->eq('email', $query->createNamedParameter($email)));
408408

409-
$stmt = $query->execute();
409+
$stmt = $query->executeQuery();
410410
$row = $stmt->fetch(\PDO::FETCH_ASSOC);
411411

412412
if (!$row) {
@@ -433,7 +433,7 @@ public function findByUri($uri, $principalPrefix): ?string {
433433
->from($this->dbTableName)
434434
->where($query->expr()->eq('backend_id', $query->createNamedParameter($backendId)))
435435
->andWhere($query->expr()->eq('resource_id', $query->createNamedParameter($resourceId)));
436-
$stmt = $query->execute();
436+
$stmt = $query->executeQuery();
437437
$row = $stmt->fetch(\PDO::FETCH_ASSOC);
438438

439439
if (!$row) {

‎apps/dav/lib/Migration/BuildSocialSearchIndex.php‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,29 +7,21 @@
77
namespace OCA\DAV\Migration;
88

99
use OCP\BackgroundJob\IJobList;
10-
use OCP\IConfig;
10+
use OCP\IAppConfig;
1111
use OCP\IDBConnection;
1212
use OCP\Migration\IOutput;
1313
use OCP\Migration\IRepairStep;
1414

1515
class BuildSocialSearchIndex implements IRepairStep {
1616

17-
/**
18-
* @param IDBConnection $db
19-
* @param IJobList $jobList
20-
* @param IConfig $config
21-
*/
2217
public function __construct(
23-
private IDBConnection $db,
24-
private IJobList $jobList,
25-
private IConfig $config,
18+
private readonly IDBConnection $db,
19+
private readonly IJobList $jobList,
20+
private readonly IAppConfig $config,
2621
) {
2722
}
2823

29-
/**
30-
* @return string
31-
*/
32-
public function getName() {
24+
public function getName(): string {
3325
return 'Register building of social profile search index as background job';
3426
}
3527

@@ -38,7 +30,7 @@ public function getName() {
3830
*/
3931
public function run(IOutput $output) {
4032
// only run once
41-
if ($this->config->getAppValue('dav', 'builtSocialSearchIndex') === 'yes') {
33+
if ($this->config->getValueBool('dav', 'builtSocialSearchIndex')) {
4234
$output->info('Repair step already executed');
4335
return;
4436
}
@@ -47,7 +39,7 @@ public function run(IOutput $output) {
4739
$query->select($query->func()->max('cardid'))
4840
->from('cards_properties')
4941
->where($query->expr()->eq('name', $query->createNamedParameter('X-SOCIALPROFILE')));
50-
$maxId = (int)$query->execute()->fetchOne();
42+
$maxId = (int)$query->executeQuery()->fetchOne();
5143

5244
if ($maxId === 0) {
5345
return;
@@ -60,6 +52,6 @@ public function run(IOutput $output) {
6052
]);
6153

6254
// no need to redo the repair during next upgrade
63-
$this->config->setAppValue('dav', 'builtSocialSearchIndex', 'yes');
55+
$this->config->setValueBool('dav', 'builtSocialSearchIndex', true);
6456
}
6557
}

‎apps/dav/lib/Migration/RefreshWebcalJobRegistrar.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ public function getName() {
3838
/**
3939
* @inheritdoc
4040
*/
41-
public function run(IOutput $output) {
41+
public function run(IOutput $output): void {
4242
$query = $this->connection->getQueryBuilder();
4343
$query->select(['principaluri', 'uri'])
4444
->from('calendarsubscriptions');
45-
$stmt = $query->execute();
45+
$stmt = $query->executeQuery();
4646

4747
$count = 0;
4848
while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {

‎apps/dav/lib/Migration/RemoveDeletedUsersCalendarSubscriptions.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ private function countSubscriptions(): int {
6464
$query = $qb->select($qb->func()->count('*'))
6565
->from('calendarsubscriptions');
6666

67-
$result = $query->execute();
67+
$result = $query->executeQuery();
6868
$count = $result->fetchOne();
6969
$result->closeCursor();
7070

@@ -87,7 +87,7 @@ private function checkSubscriptions(): void {
8787
->setMaxResults(self::SUBSCRIPTIONS_CHUNK_SIZE)
8888
->setFirstResult($this->progress);
8989

90-
$result = $query->execute();
90+
$result = $query->executeQuery();
9191
while ($row = $result->fetch()) {
9292
$username = $this->getPrincipal($row['principaluri']);
9393
if (!$this->userManager->userExists($username)) {

‎apps/dav/lib/Migration/Version1008Date20181105104826.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,6 @@ public function postSchemaChange(IOutput $output, Closure $schemaClosure, array
5555
$qb = $this->connection->getQueryBuilder();
5656
$qb->update('calendarsubscriptions')
5757
->set('source_copy', 'source')
58-
->execute();
58+
->executeStatement();
5959
}
6060
}

‎apps/dav/lib/Migration/Version1008Date20181105110300.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,6 @@ public function postSchemaChange(IOutput $output, Closure $schemaClosure, array
5454
$qb = $this->connection->getQueryBuilder();
5555
$qb->update('calendarsubscriptions')
5656
->set('source', 'source_copy')
57-
->execute();
57+
->executeStatement();
5858
}
5959
}

‎apps/dav/tests/unit/BackgroundJob/CleanupInvitationTokenJobTest.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ public function testRun(): void {
3939

4040
$queryBuilder = $this->createMock(IQueryBuilder::class);
4141
$expr = $this->createMock(IExpressionBuilder::class);
42-
$stmt = $this->createMock(\Doctrine\DBAL\Driver\Statement::class);
4342

4443
$this->dbConnection->expects($this->once())
4544
->method('getQueryBuilder')
@@ -72,9 +71,9 @@ public function testRun(): void {
7271
->with($function)
7372
->willReturn($queryBuilder);
7473
$queryBuilder->expects($this->once())
75-
->method('execute')
74+
->method('executeStatement')
7675
->with()
77-
->willReturn($stmt);
76+
->willReturn(1);
7877

7978
$this->backgroundJob->run([]);
8079
}

‎apps/dav/tests/unit/Migration/RefreshWebcalJobRegistrarTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public function testRun(): void {
5454
->with('calendarsubscriptions')
5555
->willReturn($queryBuilder);
5656
$queryBuilder->expects($this->once())
57-
->method('execute')
57+
->method('executeQuery')
5858
->willReturn($statement);
5959

6060
$statement->expects($this->exactly(4))

‎apps/dav/tests/unit/Migration/RemoveDeletedUsersCalendarSubscriptionsTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public function testRun(array $subscriptions, array $userExists, int $deletions)
7272

7373
$result = $this->createMock(IResult::class);
7474

75-
$qb->method('execute')
75+
$qb->method('executeQuery')
7676
->willReturn($result);
7777

7878
$result->expects($this->once())

0 commit comments

Comments
 (0)