mirror
/
social
kopia lustrzana https://github.com/nextcloud/social
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Merge pull request #1989 from nextcloud/carl/port-away-execute 

refactor(QueryBuilder): Port away from execute()
master
Carl Schwan 2025-10-14 16:42:34 +02:00 zatwierdzone przez GitHub
rodzic fc0946db6d fb8f19ad6a
commit c3fdea7cb2
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: B5690EEEBB952194
10 zmienionych plików z 44 dodań i 44 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
lib/Db/ActionsRequest.php
Wyświetl plik

@ -97,7 +97,7 @@ class ActionsRequest extends ActionsRequestBuilder {
$qb->limitToObjectIdPrim($qb->prim($objectId));
$qb->limitToType($type);
$cursor = $qb->execute();
$cursor = $qb->executeQuery();
$data = $cursor->fetch();
$cursor->closeCursor();
@ -127,7 +127,7 @@ class ActionsRequest extends ActionsRequestBuilder {
$this->limitToIdString($qb, $item->getId());
$this->limitToType($qb, $item->getType());
$qb->execute();
$qb->executeStatement();
}

6
lib/Db/ActorsRequest.php
Wyświetl plik

@ -101,7 +101,7 @@ class ActorsRequest extends ActorsRequestBuilder {
$qb = $this->getActorsSelectSql();
$qb->limitToIdString($id);
$cursor = $qb->execute();
$cursor = $qb->executeQuery();
$data = $cursor->fetch();
$cursor->closeCursor();
@ -146,7 +146,7 @@ class ActorsRequest extends ActorsRequestBuilder {
);
$qb->limitToPreferredUsername($handle);
$qb->execute();
$qb->executeStatement();
}
/**
@ -156,7 +156,7 @@ class ActorsRequest extends ActorsRequestBuilder {
$qb = $this->getActorsDeleteSql();
$qb->limitToPreferredUsername($handle);
$qb->execute();
$qb->executeStatement();
}

4
lib/Db/CacheActorsRequest.php
Wyświetl plik

@ -256,7 +256,7 @@ class CacheActorsRequest extends CacheActorsRequestBuilder {
$qb = $this->getCacheActorsDeleteSql();
$qb->limitToIdPrim($qb->prim($id));
$qb->execute();
$qb->executeStatement();
}
@ -268,7 +268,7 @@ class CacheActorsRequest extends CacheActorsRequestBuilder {
$qb->selectDistinct('shared_inbox')
->from(self::TABLE_CACHE_ACTORS);
$inbox = [];
$cursor = $qb->execute();
$cursor = $qb->executeQuery();
while ($data = $cursor->fetch()) {
$inbox[] = $data['shared_inbox'];
}

16
lib/Db/CacheDocumentsRequest.php
Wyświetl plik

@ -130,7 +130,7 @@ class CacheDocumentsRequest extends CacheDocumentsRequestBuilder {
$qb = $this->getCacheDocumentsSelectSql();
$this->limitToUrl($qb, $url);
$cursor = $qb->execute();
$cursor = $qb->executeQuery();
$data = $cursor->fetch();
$cursor->closeCursor();
@ -154,7 +154,7 @@ class CacheDocumentsRequest extends CacheDocumentsRequestBuilder {
$qb->limitToAccount($account);
$documents = [];
$cursor = $qb->execute();
$cursor = $qb->executeQuery();
while ($data = $cursor->fetch()) {
$documents[] = $this->parseCacheDocumentsSelectSql($data);
}
@ -179,7 +179,7 @@ class CacheDocumentsRequest extends CacheDocumentsRequestBuilder {
$this->limitToPublic($qb);
}
$cursor = $qb->execute();
$cursor = $qb->executeQuery();
$data = $cursor->fetch();
$cursor->closeCursor();
@ -201,7 +201,7 @@ class CacheDocumentsRequest extends CacheDocumentsRequestBuilder {
$this->limitToUrl($qb, $item->getUrl());
$this->limitToParentId($qb, $item->getParentId());
$cursor = $qb->execute();
$cursor = $qb->executeQuery();
$data = $cursor->fetch();
$cursor->closeCursor();
@ -220,7 +220,7 @@ class CacheDocumentsRequest extends CacheDocumentsRequestBuilder {
$this->limitToDBFieldInt($qb, 'error', 0);
$documents = [];
$cursor = $qb->execute();
$cursor = $qb->executeQuery();
while ($data = $cursor->fetch()) {
$documents[] = $this->parseCacheDocumentsSelectSql($data);
}
@ -237,7 +237,7 @@ class CacheDocumentsRequest extends CacheDocumentsRequestBuilder {
$qb = $this->getCacheDocumentsDeleteSql();
$this->limitToUrl($qb, $url);
$qb->execute();
$qb->executeStatement();
}
@ -248,7 +248,7 @@ class CacheDocumentsRequest extends CacheDocumentsRequestBuilder {
$qb = $this->getCacheDocumentsDeleteSql();
$this->limitToIdString($qb, $id);
$qb->execute();
$qb->executeStatement();
}
public function deleteByParent(string $parentId): void {
@ -285,7 +285,7 @@ class CacheDocumentsRequest extends CacheDocumentsRequestBuilder {
);
$documents = [];
$cursor = $qb->execute();
$cursor = $qb->executeQuery();
while ($data = $cursor->fetch()) {
$documents[] = $this->parseCacheDocumentsSelectSql($data);
}

6
lib/Db/ClientRequest.php
Wyświetl plik

@ -79,7 +79,7 @@ class ClientRequest extends ClientRequestBuilder {
$qb->limitToId($client->getId());
$qb->execute();
$qb->executeStatement();
}
@ -95,7 +95,7 @@ class ClientRequest extends ClientRequestBuilder {
$qb->limitToId($client->getId());
$qb->execute();
$qb->executeStatement();
}
@ -137,6 +137,6 @@ class ClientRequest extends ClientRequestBuilder {
$date->setTimestamp(time() - ClientService::TIME_TOKEN_TTL);
$qb->limitToDBFieldDateTime('last_update', $date, true);
$qb->execute();
$qb->executeStatement();
}
}

18
lib/Db/FollowsRequest.php
Wyświetl plik

@ -52,7 +52,7 @@ class FollowsRequest extends FollowsRequestBuilder {
}
$qb->generatePrimaryKey($follow->getId());
$qb->execute();
$qb->executeStatement();
}
@ -77,7 +77,7 @@ class FollowsRequest extends FollowsRequestBuilder {
}
$qb->generatePrimaryKey($actor->getId());
$qb->execute();
$qb->executeStatement();
}
@ -91,7 +91,7 @@ class FollowsRequest extends FollowsRequestBuilder {
$this->limitToActorId($qb, $follow->getActorId());
$this->limitToObjectId($qb, $follow->getObjectId());
$qb->execute();
$qb->executeStatement();
}
@ -151,7 +151,7 @@ class FollowsRequest extends FollowsRequestBuilder {
$qb->limitToType(Follow::TYPE);
$qb->limitToAccepted(true);
$cursor = $qb->execute();
$cursor = $qb->executeQuery();
$data = $cursor->fetch();
$cursor->closeCursor();
@ -165,7 +165,7 @@ class FollowsRequest extends FollowsRequestBuilder {
public function countFollows() {
$qb = $this->countFollowsSelectSql();
$cursor = $qb->execute();
$cursor = $qb->executeQuery();
$data = $cursor->fetch();
$cursor->closeCursor();
@ -246,7 +246,7 @@ class FollowsRequest extends FollowsRequestBuilder {
$qb = $this->getFollowsDeleteSql();
$this->limitToIdString($qb, $follow->getId());
$qb->execute();
$qb->executeStatement();
}
/**
@ -257,7 +257,7 @@ class FollowsRequest extends FollowsRequestBuilder {
$this->limitToActorId($qb, $follow->getActorId());
$this->limitToObjectId($qb, $follow->getObjectId());
$qb->execute();
$qb->executeStatement();
}
/**
@ -269,7 +269,7 @@ class FollowsRequest extends FollowsRequestBuilder {
$orX->add($qb->exprLimitToDBField('actor_id_prim', $qb->prim($actorId)));
$orX->add($qb->exprLimitToDBField('object_id_prim', $qb->prim($actorId)));
$qb->where($orX);
$qb->execute();
$qb->executeStatement();
}
/**
@ -279,7 +279,7 @@ class FollowsRequest extends FollowsRequestBuilder {
$qb = $this->getFollowsDeleteSql();
$this->limitToIdString($qb, $id);
$qb->execute();
$qb->executeStatement();
}

10
lib/Db/HashtagsRequest.php
Wyświetl plik

@ -32,7 +32,7 @@ class HashtagsRequest extends HashtagsRequestBuilder {
$qb->setValue('hashtag', $qb->createNamedParameter($hashtag))
->setValue('trend', $qb->createNamedParameter(json_encode($trend)));
$qb->execute();
$qb->executeStatement();
}
@ -47,7 +47,7 @@ class HashtagsRequest extends HashtagsRequestBuilder {
$qb->set('trend', $qb->createNamedParameter(json_encode($trend)));
$this->limitToHashtag($qb, $hashtag);
$qb->execute();
$qb->executeStatement();
}
@ -58,7 +58,7 @@ class HashtagsRequest extends HashtagsRequestBuilder {
$qb = $this->getHashtagsSelectSql();
$hashtags = [];
$cursor = $qb->execute();
$cursor = $qb->executeQuery();
while ($data = $cursor->fetch()) {
$hashtags[] = $this->parseHashtagsSelectSql($data);
}
@ -79,7 +79,7 @@ class HashtagsRequest extends HashtagsRequestBuilder {
$this->limitToHashtag($qb, $hashtag);
$cursor = $qb->execute();
$cursor = $qb->executeQuery();
$data = $cursor->fetch();
$cursor->closeCursor();
@ -103,7 +103,7 @@ class HashtagsRequest extends HashtagsRequestBuilder {
$this->limitResults($qb, 25);
$hashtags = [];
$cursor = $qb->execute();
$cursor = $qb->executeQuery();
while ($data = $cursor->fetch()) {
$hashtags[] = $this->parseHashtagsSelectSql($data);
}

2
lib/Db/RequestQueueRequest.php
Wyświetl plik

@ -192,6 +192,6 @@ class RequestQueueRequest extends RequestQueueRequestBuilder {
// ->set('instance', $qb->createNamedParameter($instance));
// $qb->limitToDBField('author_prim', $qb->prim($actorId));
//
// $qb->execute();
// $qb->executeStatement();
// }
}

14
lib/Db/StreamQueueRequest.php
Wyświetl plik

@ -32,7 +32,7 @@ class StreamQueueRequest extends StreamQueueRequestBuilder {
->setValue('type', $qb->createNamedParameter($queue->getType()))
->setValue('status', $qb->createNamedParameter($queue->getStatus()))
->setValue('tries', $qb->createNamedParameter($queue->getTries()));
$qb->execute();
$qb->executeStatement();
}
@ -47,7 +47,7 @@ class StreamQueueRequest extends StreamQueueRequestBuilder {
$qb->orderBy('id', 'asc');
$requests = [];
$cursor = $qb->execute();
$cursor = $qb->executeQuery();
while ($data = $cursor->fetch()) {
$requests[] = $this->parseStreamQueueSelectSql($data);
}
@ -69,7 +69,7 @@ class StreamQueueRequest extends StreamQueueRequestBuilder {
$qb->limitToToken($token);
$queue = [];
$cursor = $qb->execute();
$cursor = $qb->executeQuery();
while ($data = $cursor->fetch()) {
$queue[] = $this->parseStreamQueueSelectSql($data);
}
@ -94,7 +94,7 @@ class StreamQueueRequest extends StreamQueueRequestBuilder {
$this->limitToId($qb, $queue->getId());
$this->limitToStatus($qb, StreamQueue::STATUS_STANDBY);
$count = $qb->execute();
$count = $qb->executeStatement();
if ($count === 0) {
throw new QueueStatusException();
@ -115,7 +115,7 @@ class StreamQueueRequest extends StreamQueueRequestBuilder {
$this->limitToId($qb, $queue->getId());
$this->limitToStatus($qb, StreamQueue::STATUS_RUNNING);
$count = $qb->execute();
$count = $qb->executeStatement();
if ($count === 0) {
throw new QueueStatusException();
@ -140,7 +140,7 @@ class StreamQueueRequest extends StreamQueueRequestBuilder {
$this->limitToId($qb, $queue->getId());
$this->limitToStatus($qb, StreamQueue::STATUS_RUNNING);
$count = $qb->execute();
$count = $qb->executeStatement();
if ($count === 0) {
throw new QueueStatusException();
@ -157,6 +157,6 @@ class StreamQueueRequest extends StreamQueueRequestBuilder {
$qb = $this->getStreamQueueDeleteSql();
$this->limitToId($qb, $queue->getId());
$qb->execute();
$qb->executeStatement();
}
}

8
lib/Db/StreamRequest.php
Wyświetl plik

@ -333,7 +333,7 @@ class StreamRequest extends StreamRequestBuilder {
$qb = $this->countNotesSelectSql();
$qb->limitToInReplyTo($id, true);
$cursor = $qb->execute();
$cursor = $qb->executeQuery();
$data = $cursor->fetch();
$cursor->closeCursor();
@ -355,7 +355,7 @@ class StreamRequest extends StreamRequestBuilder {
$qb->innerJoinStreamDest('recipient', 'id_prim', 'sd', 's');
$qb->limitToDest(ACore::CONTEXT_PUBLIC, 'recipient', '', 'sd');
$cursor = $qb->execute();
$cursor = $qb->executeQuery();
$data = $cursor->fetch();
$cursor->closeCursor();
@ -852,7 +852,7 @@ class StreamRequest extends StreamRequestBuilder {
$qb->limitToType($type);
}
$qb->execute();
$qb->executeStatement();
}
@ -863,7 +863,7 @@ class StreamRequest extends StreamRequestBuilder {
$qb = $this->getStreamDeleteSql();
$qb->limitToAttributedTo($actorId, true);
$qb->execute();
$qb->executeStatement();
}