fixup! fix: duplicate uid repair job failing on postgres

nextcloud · Jul 4, 2024 · d9aa74b · d9aa74b
1 parent e613e0f
commit d9aa74b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/lib/Db/MessageMapper.php b/lib/Db/MessageMapper.php
@@ -1672,7 +1672,7 @@ public function deleteDuplicateUids(): void {
 				$qb->expr()->eq('t1.uid', 't2.uid', IQueryBuilder::PARAM_INT),
 				$qb->expr()->neq('t1.id', 't2.id', IQueryBuilder::PARAM_INT),
 			))
-			->groupBy('t1.mailbox_id', 't1.uid')
+			->groupBy('t1.mailbox_id', 't1.uid', 't1.id')
 			->executeQuery();
 		$rows = $result->fetchAll();
 		$result->closeCursor();
@@ -1684,7 +1684,7 @@ public function deleteDuplicateUids(): void {
 		$deleteQb = $this->db->getQueryBuilder();
 		$deleteQb->delete($this->getTableName())
 			->where(
-				$deleteQb->expr()->neq(
+				$deleteQb->expr()->eq(
 					'id',
 					$deleteQb->createParameter('id'),
 					IQueryBuilder::PARAM_INT,
@@ -1718,13 +1718,10 @@ public function deleteDuplicateUids(): void {
 						$first = false;
 						continue;
 					}
+
 					$deleteQb->setParameter('id', $id, IQueryBuilder::PARAM_INT);
 					$deleteQb->setParameter('mailbox_id', $mailboxId, IQueryBuilder::PARAM_INT);
 					$deleteQb->setParameter('uid', $uid, IQueryBuilder::PARAM_INT);
-
-					//$deleteQb->setParameter('id', $row['id'], IQueryBuilder::PARAM_INT);
-					//$deleteQb->setParameter('mailbox_id', $row['mailbox_id'], IQueryBuilder::PARAM_INT);
-					//$deleteQb->setParameter('uid', $row['uid'], IQueryBuilder::PARAM_INT);
 					$deleteQb->executeStatement();
 				}
 			}

diff --git a/tests/Integration/Db/MessageMapperTest.php b/tests/Integration/Db/MessageMapperTest.php
@@ -206,7 +206,7 @@ public function testDeleteDuplicateUids(): void {
 		$mailbox2 = new Mailbox();
 		$mailbox2->setId(2);
 		$mailbox3 = new Mailbox();
-		$mailbox3->setId(2);
+		$mailbox3->setId(3);
 		$this->insertMessage(100, 1);
 		$this->insertMessage(101, 1);
 		$this->insertMessage(101, 1);