From ba47efcec3fcc3c99bc4d430b49f74605fec2a78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Mon, 15 Aug 2022 18:43:43 +0200 Subject: Avoid duplicate queries that were caused by running execute and the mapper find method MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- lib/Db/SessionMapper.php | 9 +++------ lib/Db/StepMapper.php | 3 +-- 2 files changed, 4 insertions(+), 8 deletions(-) (limited to 'lib') diff --git a/lib/Db/SessionMapper.php b/lib/Db/SessionMapper.php index c5ad44391..1f7c896eb 100644 --- a/lib/Db/SessionMapper.php +++ b/lib/Db/SessionMapper.php @@ -64,8 +64,7 @@ class SessionMapper extends QBMapper { $qb = $this->db->getQueryBuilder(); $qb->select('id', 'color', 'document_id', 'last_contact', 'user_id', 'guest_name') ->from($this->getTableName()) - ->where($qb->expr()->eq('document_id', $qb->createNamedParameter($documentId))) - ->execute(); + ->where($qb->expr()->eq('document_id', $qb->createNamedParameter($documentId))); return $this->findEntities($qb); } @@ -75,8 +74,7 @@ class SessionMapper extends QBMapper { $qb->select('id', 'color', 'document_id', 'last_contact', 'user_id', 'guest_name') ->from($this->getTableName()) ->where($qb->expr()->eq('document_id', $qb->createNamedParameter($documentId))) - ->andWhere($qb->expr()->gt('last_contact', $qb->createNamedParameter(time() - SessionService::SESSION_VALID_TIME))) - ->execute(); + ->andWhere($qb->expr()->gt('last_contact', $qb->createNamedParameter(time() - SessionService::SESSION_VALID_TIME))); return $this->findEntities($qb); } @@ -85,8 +83,7 @@ class SessionMapper extends QBMapper { $qb = $this->db->getQueryBuilder(); $qb->select('id', 'color', 'document_id', 'last_contact', 'user_id', 'guest_name') ->from($this->getTableName()) - ->where($qb->expr()->lt('last_contact', $qb->createNamedParameter(time() - SessionService::SESSION_VALID_TIME))) - ->execute(); + ->where($qb->expr()->lt('last_contact', $qb->createNamedParameter(time() - SessionService::SESSION_VALID_TIME))); return $this->findEntities($qb); } diff --git a/lib/Db/StepMapper.php b/lib/Db/StepMapper.php index a977c1629..472f28183 100644 --- a/lib/Db/StepMapper.php +++ b/lib/Db/StepMapper.php @@ -46,8 +46,7 @@ class StepMapper extends QBMapper { $qb ->setMaxResults(100) ->orderBy('version') - ->orderBy('id') - ->execute(); + ->orderBy('id'); return $this->findEntities($qb); } -- cgit v1.2.3