Merge pull request #42576 from nextcloud/fix/fix-ldap-upgrade-on-duplicate-membership

Fix upgrade of user_ldap when oc_group_members contains duplicated uids
pull/42513/head
Côme Chilliet 5 months ago committed by GitHub
commit 2ab852e04f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -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();

Loading…
Cancel
Save