fix(retention): properly clean orphans

Signed-off-by: Richard Steinmetz <[email protected]>
nextcloud · Oct 9, 2023 · c99577d · c99577d
1 parent fef0d04
commit c99577d
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/Db/MessageRetentionMapper.php b/lib/Db/MessageRetentionMapper.php
@@ -85,7 +85,7 @@ public function deleteOrphans(): void {
 			);
 
 		$selectQb = $this->db->getQueryBuilder();
-		$selectQb->select('mr.id')
+		$selectQb->select('mr.id', 'mr.uid', 'mr.mailbox_id')
 			->from($this->getTableName(), 'mr')
 			->leftJoin('mr', 'mail_messages', 'm', $selectQb->expr()->andX(
 				$selectQb->expr()->eq(
@@ -102,8 +102,8 @@ public function deleteOrphans(): void {
 			->where($selectQb->expr()->isNull('m.id'));
 		$cursor = $selectQb->executeQuery();
 		while ($row = $cursor->fetch()) {
-			$deleteQb->setParameter('mailbox_id', $row['m.mailbox_id'], IQueryBuilder::PARAM_INT);
-			$deleteQb->setParameter('uid', $row['m.uid'], IQueryBuilder::PARAM_INT);
+			$deleteQb->setParameter('mailbox_id', $row['mailbox_id'], IQueryBuilder::PARAM_INT);
+			$deleteQb->setParameter('uid', $row['uid'], IQueryBuilder::PARAM_INT);
 			$deleteQb->executeStatement();
 		}
 		$cursor->closeCursor();