feat: log query for dbal exceptions

Signed-off-by: Robin Appelman <[email protected]>
nextcloud · Mar 4, 2025 · 0fed622 · 0fed622
1 parent 6860b5b
commit 0fed622
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/lib/private/DB/ConnectionAdapter.php b/lib/private/DB/ConnectionAdapter.php
@@ -69,23 +69,23 @@ public function executeQuery(string $sql, array $params = [], $types = []): IRes
 				$this->inner->executeQuery($sql, $params, $types)
 			);
 		} catch (Exception $e) {
-			throw DbalException::wrap($e);
+			throw DbalException::wrap($e, '', $sql);
 		}
 	}
 
 	public function executeUpdate(string $sql, array $params = [], array $types = []): int {
 		try {
 			return $this->inner->executeUpdate($sql, $params, $types);
 		} catch (Exception $e) {
-			throw DbalException::wrap($e);
+			throw DbalException::wrap($e, '', $sql);
 		}
 	}
 
 	public function executeStatement($sql, array $params = [], array $types = []): int {
 		try {
 			return $this->inner->executeStatement($sql, $params, $types);
 		} catch (Exception $e) {
-			throw DbalException::wrap($e);
+			throw DbalException::wrap($e, '', $sql);
 		}
 	}
 

diff --git a/lib/private/DB/Exceptions/DbalException.php b/lib/private/DB/Exceptions/DbalException.php
@@ -52,26 +52,29 @@
 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,
 		);
 	}