Merge pull request #5245 from nextcloud/backport/5242/stable20.1

[stable20.1] Try to catch the unique constraint violation on migrating the data

1 files changed, 11 insertions, 1 deletions

diff --git a/lib/Migration/Version10000Date20201015134000.php b/lib/Migration/Version10000Date20201015134000.php
index aa7e5bb5e..cc5fdc7f3 100644
--- a/lib/Migration/Version10000Date20201015134000.php
+++ b/lib/Migration/Version10000Date20201015134000.php
@@ -26,6 +26,7 @@ declare(strict_types=1);
 namespace OCA\Talk\Migration;
 
 use Closure;
+use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
 use Doctrine\DBAL\Types\Type;
 use OCA\Talk\Model\Attendee;
 use OCA\Talk\Participant;
@@ -220,7 +221,16 @@ class Version10000Date20201015134000 extends SimpleMigrationStep {
 				->setParameter('last_mention_message', (int) $row['last_mention_message'], IQueryBuilder::PARAM_INT)
 				;
 
-			$insert->execute();
+			try {
+				$insert->execute();
+			} catch (\Exception $e) {
+				if (get_class($e) === UniqueConstraintViolationException::class) {
+					// UniqueConstraintViolationException before 21
+					continue;
+				}
+
+				throw $e;
+			}
 		}
 		$result->closeCursor();
 	}