Skip to content

Commit f488610

Browse files
summersabsummersab
committed
Refactor OC\DB\QueryBuilder::execute
Signed-off-by: Andrew Summers <[email protected]>
1 parent 9d1547f commit f488610

File tree

76 files changed

+430
-430
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+430
-430
lines changed

‎core/Command/Db/ConvertType.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ protected function copyTable(Connection $fromDB, Connection $toDB, Table $table,
298298
$query->automaticTablePrefix(false);
299299
$query->select($query->func()->count('*', 'num_entries'))
300300
->from($table->getName());
301-
$result = $query->execute();
301+
$result = $query->executeQuery();
302302
$count = $result->fetchOne();
303303
$result->closeCursor();
304304

@@ -337,7 +337,7 @@ protected function copyTable(Connection $fromDB, Connection $toDB, Table $table,
337337
for ($chunk = 0; $chunk < $numChunks; $chunk++) {
338338
$query->setFirstResult($chunk * $chunkSize);
339339

340-
$result = $query->execute();
340+
$result = $query->executeQuery();
341341

342342
try {
343343
$toDB->beginTransaction();
@@ -359,7 +359,7 @@ protected function copyTable(Connection $fromDB, Connection $toDB, Table $table,
359359
$insertQuery->setParameter($key, $value);
360360
}
361361
}
362-
$insertQuery->execute();
362+
$insertQuery->executeStatement();
363363
}
364364
$result->closeCursor();
365365

‎core/Command/Preview/ResetRenderedTexts.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ private function getPreviewsToDelete(): \Iterator {
137137
$qb->select('path', 'mimetype')
138138
->from('filecache')
139139
->where($qb->expr()->eq('fileid', $qb->createNamedParameter($this->previewFolder->getId())));
140-
$cursor = $qb->execute();
140+
$cursor = $qb->executeQuery();
141141
$data = $cursor->fetch();
142142
$cursor->closeCursor();
143143

@@ -170,7 +170,7 @@ private function getPreviewsToDelete(): \Iterator {
170170
)
171171
);
172172

173-
$cursor = $qb->execute();
173+
$cursor = $qb->executeQuery();
174174

175175
while ($row = $cursor->fetch()) {
176176
yield $row;

‎core/Db/LoginFlowV2Mapper.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public function cleanup(): void {
8888
$qb->expr()->lt('timestamp', $qb->createNamedParameter($this->timeFactory->getTime() - self::lifetime))
8989
);
9090

91-
$qb->execute();
91+
$qb->executeStatement();
9292
}
9393

9494
/**

‎lib/private/Accounts/AccountManager.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ public function deleteUser(IUser $user): void {
273273
$query = $this->connection->getQueryBuilder();
274274
$query->delete($this->table)
275275
->where($query->expr()->eq('uid', $query->createNamedParameter($uid)))
276-
->execute();
276+
->executeStatement();
277277

278278
$this->deleteUserData($user);
279279
}
@@ -286,7 +286,7 @@ public function deleteUserData(IUser $user): void {
286286
$query = $this->connection->getQueryBuilder();
287287
$query->delete($this->dataTable)
288288
->where($query->expr()->eq('uid', $query->createNamedParameter($uid)))
289-
->execute();
289+
->executeStatement();
290290
}
291291

292292
/**

‎lib/private/AppConfig.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ public function setValue($app, $key, $value) {
306306
}
307307
}
308308

309-
$changedRow = (bool) $sql->execute();
309+
$changedRow = (bool) $sql->executeStatement();
310310

311311
$this->cache[$app][$key] = $value;
312312

@@ -329,7 +329,7 @@ public function deleteKey($app, $key) {
329329
->andWhere($sql->expr()->eq('configkey', $sql->createParameter('configkey')))
330330
->setParameter('app', $app)
331331
->setParameter('configkey', $key);
332-
$sql->execute();
332+
$sql->executeStatement();
333333

334334
unset($this->cache[$app][$key]);
335335
return false;
@@ -350,7 +350,7 @@ public function deleteApp($app) {
350350
$sql->delete('appconfig')
351351
->where($sql->expr()->eq('appid', $sql->createParameter('app')))
352352
->setParameter('app', $app);
353-
$sql->execute();
353+
$sql->executeStatement();
354354

355355
unset($this->cache[$app]);
356356
return false;
@@ -415,7 +415,7 @@ protected function loadConfigValues() {
415415
$sql = $this->conn->getQueryBuilder();
416416
$sql->select('*')
417417
->from('appconfig');
418-
$result = $sql->execute();
418+
$result = $sql->executeQuery();
419419

420420
// we are going to store the result in memory anyway
421421
$rows = $result->fetchAll();

‎lib/private/Authentication/Token/PublicKeyTokenMapper.php‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public function invalidate(string $token) {
5151
$qb->delete($this->tableName)
5252
->where($qb->expr()->eq('token', $qb->createNamedParameter($token)))
5353
->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT)))
54-
->execute();
54+
->executeStatement();
5555
}
5656

5757
/**
@@ -66,7 +66,7 @@ public function invalidateOld(int $olderThan, int $remember = IToken::DO_NOT_REM
6666
->andWhere($qb->expr()->eq('type', $qb->createNamedParameter(IToken::TEMPORARY_TOKEN, IQueryBuilder::PARAM_INT)))
6767
->andWhere($qb->expr()->eq('remember', $qb->createNamedParameter($remember, IQueryBuilder::PARAM_INT)))
6868
->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT)))
69-
->execute();
69+
->executeStatement();
7070
}
7171

7272
public function invalidateLastUsedBefore(string $uid, int $before): int {
@@ -90,7 +90,7 @@ public function getToken(string $token): PublicKeyToken {
9090
->from($this->tableName)
9191
->where($qb->expr()->eq('token', $qb->createNamedParameter($token)))
9292
->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT)))
93-
->execute();
93+
->executeQuery();
9494

9595
$data = $result->fetch();
9696
$result->closeCursor();
@@ -112,7 +112,7 @@ public function getTokenById(int $id): PublicKeyToken {
112112
->from($this->tableName)
113113
->where($qb->expr()->eq('id', $qb->createNamedParameter($id)))
114114
->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT)))
115-
->execute();
115+
->executeQuery();
116116

117117
$data = $result->fetch();
118118
$result->closeCursor();
@@ -139,7 +139,7 @@ public function getTokenByUser(string $uid): array {
139139
->where($qb->expr()->eq('uid', $qb->createNamedParameter($uid)))
140140
->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT)))
141141
->setMaxResults(1000);
142-
$result = $qb->execute();
142+
$result = $qb->executeQuery();
143143
$data = $result->fetchAll();
144144
$result->closeCursor();
145145

@@ -157,7 +157,7 @@ public function deleteById(string $uid, int $id) {
157157
->where($qb->expr()->eq('id', $qb->createNamedParameter($id)))
158158
->andWhere($qb->expr()->eq('uid', $qb->createNamedParameter($uid)))
159159
->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT)));
160-
$qb->execute();
160+
$qb->executeStatement();
161161
}
162162

163163
/**
@@ -170,7 +170,7 @@ public function deleteByName(string $name) {
170170
$qb->delete($this->tableName)
171171
->where($qb->expr()->eq('name', $qb->createNamedParameter($name), IQueryBuilder::PARAM_STR))
172172
->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT)));
173-
$qb->execute();
173+
$qb->executeStatement();
174174
}
175175

176176
public function deleteTempToken(PublicKeyToken $except) {
@@ -182,7 +182,7 @@ public function deleteTempToken(PublicKeyToken $except) {
182182
->andWhere($qb->expr()->neq('id', $qb->createNamedParameter($except->getId())))
183183
->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT)));
184184

185-
$qb->execute();
185+
$qb->executeStatement();
186186
}
187187

188188
public function hasExpiredTokens(string $uid): bool {
@@ -193,7 +193,7 @@ public function hasExpiredTokens(string $uid): bool {
193193
->andWhere($qb->expr()->eq('password_invalid', $qb->createNamedParameter(true), IQueryBuilder::PARAM_BOOL))
194194
->setMaxResults(1);
195195

196-
$cursor = $qb->execute();
196+
$cursor = $qb->executeQuery();
197197
$data = $cursor->fetchAll();
198198
$cursor->closeCursor();
199199

‎lib/private/Authentication/TwoFactorAuth/Db/ProviderUserAssignmentDao.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public function getState(string $uid): array {
5656
$query = $qb->select('provider_id', 'enabled')
5757
->from(self::TABLE_NAME)
5858
->where($qb->expr()->eq('uid', $qb->createNamedParameter($uid)));
59-
$result = $query->execute();
59+
$result = $query->executeQuery();
6060
$providers = [];
6161
foreach ($result->fetchAll() as $row) {
6262
$providers[(string)$row['provider_id']] = 1 === (int)$row['enabled'];
@@ -80,14 +80,14 @@ public function persist(string $providerId, string $uid, int $enabled): void {
8080
'enabled' => $qb->createNamedParameter($enabled, IQueryBuilder::PARAM_INT),
8181
]);
8282

83-
$insertQuery->execute();
83+
$insertQuery->executeStatement();
8484
} catch (UniqueConstraintViolationException $ex) {
8585
// There is already an entry -> update it
8686
$updateQuery = $qb->update(self::TABLE_NAME)
8787
->set('enabled', $qb->createNamedParameter($enabled))
8888
->where($qb->expr()->eq('provider_id', $qb->createNamedParameter($providerId)))
8989
->andWhere($qb->expr()->eq('uid', $qb->createNamedParameter($uid)));
90-
$updateQuery->execute();
90+
$updateQuery->executeStatement();
9191
}
9292
}
9393

@@ -103,15 +103,15 @@ public function deleteByUser(string $uid): array {
103103
$selectQuery = $qb1->select('*')
104104
->from(self::TABLE_NAME)
105105
->where($qb1->expr()->eq('uid', $qb1->createNamedParameter($uid)));
106-
$selectResult = $selectQuery->execute();
106+
$selectResult = $selectQuery->executeQuery();
107107
$rows = $selectResult->fetchAll();
108108
$selectResult->closeCursor();
109109

110110
$qb2 = $this->conn->getQueryBuilder();
111111
$deleteQuery = $qb2
112112
->delete(self::TABLE_NAME)
113113
->where($qb2->expr()->eq('uid', $qb2->createNamedParameter($uid)));
114-
$deleteQuery->execute();
114+
$deleteQuery->executeStatement();
115115

116116
return array_map(function (array $row) {
117117
return [
@@ -128,6 +128,6 @@ public function deleteAll(string $providerId): void {
128128
$deleteQuery = $qb->delete(self::TABLE_NAME)
129129
->where($qb->expr()->eq('provider_id', $qb->createNamedParameter($providerId)));
130130

131-
$deleteQuery->execute();
131+
$deleteQuery->executeStatement();
132132
}
133133
}

‎lib/private/BackgroundJob/JobList.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,11 +119,11 @@ public function remove($job, $argument = null): void {
119119
$query->setMaxResults($max);
120120

121121
do {
122-
$deleted = $query->execute();
122+
$deleted = $query->executeStatement();
123123
} while ($deleted === $max);
124124
} else {
125125
// Dont use chunked delete - let the DB handle the large row count natively
126-
$query->execute();
126+
$query->executeStatement();
127127
}
128128
}
129129

‎lib/private/Collaboration/Resources/Collection.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public function setName(string $name): void {
100100
$query->update(Manager::TABLE_COLLECTIONS)
101101
->set('name', $query->createNamedParameter($name))
102102
->where($query->expr()->eq('id', $query->createNamedParameter($this->getId(), IQueryBuilder::PARAM_INT)));
103-
$query->execute();
103+
$query->executeStatement();
104104

105105
$this->name = $name;
106106
}
@@ -142,7 +142,7 @@ public function addResource(IResource $resource): void {
142142
]);
143143

144144
try {
145-
$query->execute();
145+
$query->executeStatement();
146146
} catch (ConstraintViolationException $e) {
147147
throw new ResourceException('Already part of the collection');
148148
}
@@ -166,7 +166,7 @@ public function removeResource(IResource $resource): void {
166166
->where($query->expr()->eq('collection_id', $query->createNamedParameter($this->id, IQueryBuilder::PARAM_INT)))
167167
->andWhere($query->expr()->eq('resource_type', $query->createNamedParameter($resource->getType())))
168168
->andWhere($query->expr()->eq('resource_id', $query->createNamedParameter($resource->getId())));
169-
$query->execute();
169+
$query->executeStatement();
170170

171171
if (empty($this->resources)) {
172172
$this->removeCollection();
@@ -222,7 +222,7 @@ protected function removeCollection(): void {
222222
$query = $this->connection->getQueryBuilder();
223223
$query->delete(Manager::TABLE_COLLECTIONS)
224224
->where($query->expr()->eq('id', $query->createNamedParameter($this->id, IQueryBuilder::PARAM_INT)));
225-
$query->execute();
225+
$query->executeStatement();
226226

227227
$this->manager->invalidateAccessCacheForCollection($this);
228228
$this->id = 0;

0 commit comments

Comments
 (0)