From: Côme Chilliet <come.chilliet@nextcloud.com>
Date: Thu, 4 Jan 2024 10:12:03 +0000 (+0100)
Subject: Fix upgrade of user_ldap when oc_group_members contains duplicated uids
X-Git-Tag: v29.0.0beta1~561^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F42576%2Fhead;p=nextcloud-server.git

Fix upgrade of user_ldap when oc_group_members contains duplicated uids

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
---

diff --git a/apps/user_ldap/lib/Migration/Version1190Date20230706134108.php b/apps/user_ldap/lib/Migration/Version1190Date20230706134108.php
index 3f554f56e64..71fdb536b1a 100644
--- a/apps/user_ldap/lib/Migration/Version1190Date20230706134108.php
+++ b/apps/user_ldap/lib/Migration/Version1190Date20230706134108.php
@@ -99,13 +99,21 @@ class Version1190Date20230706134108 extends SimpleMigrationStep {
 		$result = $query->executeQuery();
 		while ($row = $result->fetch()) {
 			$knownUsers = unserialize($row['owncloudusers']);
+			$knownUsers = array_unique($knownUsers);
 			foreach ($knownUsers as $knownUser) {
-				$insert
-					->setParameter('groupid', $row['owncloudname'])
-					->setParameter('userid', $knownUser)
-				;
+				try {
+					$insert
+						->setParameter('groupid', $row['owncloudname'])
+						->setParameter('userid', $knownUser)
+					;
 
-				$insert->executeStatement();
+					$insert->executeStatement();
+				} catch (\OCP\DB\Exception $e) {
+					/*
+					 * If it fails on unique constaint violation it may just be left over value from previous half-migration
+					 * If it fails on something else, ignore as well, data will be filled by background job later anyway
+					 */
+				}
 			}
 		}
 		$result->closeCursor();