Skip to content

Commit eb32161

Browse files
Merge pull request #416 from nextcloud/carl/remote-querybuilder-execute
refactor(QueryBuilder): Port away from deprecated execute method
2 parents 1ed1465 + d93f2a2 commit eb32161

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

lib/Db/CodeMapper.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public function entryExists(IUser $user): bool {
2828
'user_id',
2929
$qb->createNamedParameter($user->getUID())
3030
));
31-
$res = $select->execute();
31+
$res = $select->executeQuery();
3232
$data = $res->fetchColumn(0);
3333
$res->closeCursor();
3434

@@ -63,7 +63,7 @@ public function deleteAll(IUser $user) {
6363
'user_id',
6464
$qb->createNamedParameter($user->getUID())
6565
));
66-
$delete->execute();
66+
$delete->executeStatement();
6767
}
6868

6969
}

lib/Migration/Version2Date20180926053333.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ private function fillExpireDates(IQueryBuilder $qb, int $expires) {
5959
$updateQuery = $qb->update('twofactor_admin_codes')
6060
->set('expires', $qb->createNamedParameter($expires))
6161
->where($qb->expr()->isNull('expires'));
62-
$updateQuery->execute();
62+
$updateQuery->executeStatement();
6363
}
6464

6565
}

lib/Migration/Version3Date20200821134736.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public function postSchemaChange(IOutput $output, Closure $schemaClosure, array
8383
'expires' => $insert->createParameter('expires'),
8484
]);
8585

86-
$result = $select->execute();
86+
$result = $select->executeQuery();
8787
while (($row = $result->fetch()) !== false) {
8888
if (!isset($row['user_id'], $row['code'])) {
8989
continue;
@@ -93,7 +93,7 @@ public function postSchemaChange(IOutput $output, Closure $schemaClosure, array
9393
$insert->setParameter('code', $row['code'], IQueryBuilder::PARAM_STR);
9494
$insert->setParameter('expires', (int)($row['expires'] ?? 0), IQueryBuilder::PARAM_INT);
9595

96-
$insert->execute();
96+
$insert->executeStatement();
9797
}
9898

9999
$result->closeCursor();

0 commit comments

Comments
 (0)