diff options
author | Julius Härtl <jus@bitgrid.net> | 2022-08-25 11:58:19 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-08-25 11:58:19 +0300 |
commit | 63a36201ccc91ef10f4390efda6566464fb23ab7 (patch) | |
tree | 459e182f37f91a20511893f250845ca788087894 | |
parent | 5b5c3e68aa3ca1b765c79b11f7250371997841b6 (diff) | |
parent | a951f168ac868ea66ce32f74884b25003e85f117 (diff) |
Merge pull request #2831 from nextcloud/bugfix/noid/occv25.0.0beta3
-rw-r--r-- | lib/Db/StepMapper.php | 9 | ||||
-rw-r--r-- | lib/Service/DocumentService.php | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/lib/Db/StepMapper.php b/lib/Db/StepMapper.php index 472f28183..ed510ce59 100644 --- a/lib/Db/StepMapper.php +++ b/lib/Db/StepMapper.php @@ -55,7 +55,7 @@ class StepMapper extends QBMapper { $qb = $this->db->getQueryBuilder(); $qb->delete($this->getTableName()) ->where($qb->expr()->eq('document_id', $qb->createNamedParameter($documentId))) - ->execute(); + ->executeStatement(); } public function deleteBeforeVersion($documentId, $version): void { @@ -63,15 +63,14 @@ class StepMapper extends QBMapper { $qb->delete($this->getTableName()) ->where($qb->expr()->eq('document_id', $qb->createNamedParameter($documentId))) ->andWhere($qb->expr()->lte('version', $qb->createNamedParameter($version))) - ->execute(); + ->executeStatement(); } public function deleteAfterVersion($documentId, $version): int { $qb = $this->db->getQueryBuilder(); - $result = $qb->delete($this->getTableName()) + return $qb->delete($this->getTableName()) ->where($qb->expr()->eq('document_id', $qb->createNamedParameter($documentId))) ->andWhere($qb->expr()->gt('version', $qb->createNamedParameter($version))) - ->execute(); - return $result->rowCount(); + ->executeStatement(); } } diff --git a/lib/Service/DocumentService.php b/lib/Service/DocumentService.php index 84f3b1a0b..765b687e7 100644 --- a/lib/Service/DocumentService.php +++ b/lib/Service/DocumentService.php @@ -335,7 +335,7 @@ class DocumentService { * @param bool $force * @throws DocumentHasUnsavedChangesException */ - public function resetDocument($documentId, $force = false): void { + public function resetDocument(int $documentId, $force = false): void { try { $this->unlock($documentId); |