1 files changed, 17 insertions, 24 deletions

diff --git a/lib/private/DB/Exceptions/DbalException.php b/lib/private/DB/Exceptions/DbalException.php
index ca0119a576c..2ce6ddf80a6 100644
--- a/lib/private/DB/Exceptions/DbalException.php
+++ b/lib/private/DB/Exceptions/DbalException.php
@@ -3,26 +3,8 @@
 declare(strict_types=1);
 
 /**
- * @copyright 2021 Christoph Wurst <christoph@winzerhof-wurst.at>
- *
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Daniel Kesselberg <mail@danielkesselberg.de>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-FileCopyrightText: 2021 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 namespace OC\DB\Exceptions;
 
@@ -35,8 +17,10 @@ use Doctrine\DBAL\Exception\DriverException;
 use Doctrine\DBAL\Exception\ForeignKeyConstraintViolationException;
 use Doctrine\DBAL\Exception\InvalidArgumentException;
 use Doctrine\DBAL\Exception\InvalidFieldNameException;
+use Doctrine\DBAL\Exception\LockWaitTimeoutException;
 use Doctrine\DBAL\Exception\NonUniqueFieldNameException;
 use Doctrine\DBAL\Exception\NotNullConstraintViolationException;
+use Doctrine\DBAL\Exception\RetryableException;
 use Doctrine\DBAL\Exception\ServerException;
 use Doctrine\DBAL\Exception\SyntaxErrorException;
 use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
@@ -49,32 +33,38 @@ use OCP\DB\Exception;
  * @psalm-immutable
  */
 class DbalException extends Exception {
-
 	/** @var \Doctrine\DBAL\Exception */
 	private $original;
+	public readonly ?string $query;
 
 	/**
 	 * @param \Doctrine\DBAL\Exception $original
 	 * @param int $code
 	 * @param string $message
 	 */
-	private function __construct(\Doctrine\DBAL\Exception $original, int $code, string $message) {
+	private function __construct(\Doctrine\DBAL\Exception $original, int $code, string $message, ?string $query = null) {
 		parent::__construct(
 			$message,
 			$code,
 			$original
 		);
 		$this->original = $original;
+		$this->query = $query;
 	}
 
-	public static function wrap(\Doctrine\DBAL\Exception $original, string $message = ''): self {
+	public static function wrap(\Doctrine\DBAL\Exception $original, string $message = '', ?string $query = null): self {
 		return new self(
 			$original,
 			is_int($original->getCode()) ? $original->getCode() : 0,
-			empty($message) ? $original->getMessage() : $message
+			empty($message) ? $original->getMessage() : $message,
+			$query,
 		);
 	}
 
+	public function isRetryable(): bool {
+		return $this->original instanceof RetryableException;
+	}
+
 	public function getReason(): ?int {
 		/**
 		 * Constraint errors
@@ -96,6 +86,9 @@ class DbalException extends Exception {
 		/**
 		 * Other server errors
 		 */
+		if ($this->original instanceof LockWaitTimeoutException) {
+			return parent::REASON_LOCK_WAIT_TIMEOUT;
+		}
 		if ($this->original instanceof DatabaseObjectExistsException) {
 			return parent::REASON_DATABASE_OBJECT_EXISTS;
 		}