1 files changed, 44 insertions, 25 deletions

diff --git a/lib/private/DB/ConnectionAdapter.php b/lib/private/DB/ConnectionAdapter.php
index b21bce490f4..d9ccb3c54f2 100644
--- a/lib/private/DB/ConnectionAdapter.php
+++ b/lib/private/DB/ConnectionAdapter.php
@@ -3,25 +3,8 @@
 declare(strict_types=1);
 
 /**
- * @copyright 2020 Christoph Wurst <christoph@winzerhof-wurst.at>
- *
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- *
- * @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: 2020 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 namespace OC\DB;
 
@@ -29,6 +12,8 @@ use Doctrine\DBAL\Exception;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Schema\Schema;
 use OC\DB\Exceptions\DbalException;
+use OC\DB\QueryBuilder\Sharded\CrossShardMoveHelper;
+use OC\DB\QueryBuilder\Sharded\ShardDefinition;
 use OCP\DB\IPreparedStatement;
 use OCP\DB\IResult;
 use OCP\DB\QueryBuilder\IQueryBuilder;
@@ -38,7 +23,6 @@ use OCP\IDBConnection;
  * Adapts the public API to our internal DBAL connection wrapper
  */
 class ConnectionAdapter implements IDBConnection {
-
 	/** @var Connection */
 	private $inner;
 
@@ -66,7 +50,7 @@ class ConnectionAdapter implements IDBConnection {
 				$this->inner->executeQuery($sql, $params, $types)
 			);
 		} catch (Exception $e) {
-			throw DbalException::wrap($e);
+			throw DbalException::wrap($e, '', $sql);
 		}
 	}
 
@@ -74,7 +58,7 @@ class ConnectionAdapter implements IDBConnection {
 		try {
 			return $this->inner->executeUpdate($sql, $params, $types);
 		} catch (Exception $e) {
-			throw DbalException::wrap($e);
+			throw DbalException::wrap($e, '', $sql);
 		}
 	}
 
@@ -82,19 +66,19 @@ class ConnectionAdapter implements IDBConnection {
 		try {
 			return $this->inner->executeStatement($sql, $params, $types);
 		} catch (Exception $e) {
-			throw DbalException::wrap($e);
+			throw DbalException::wrap($e, '', $sql);
 		}
 	}
 
 	public function lastInsertId(string $table): int {
 		try {
-			return (int)$this->inner->lastInsertId($table);
+			return $this->inner->lastInsertId($table);
 		} catch (Exception $e) {
 			throw DbalException::wrap($e);
 		}
 	}
 
-	public function insertIfNotExist(string $table, array $input, array $compare = null) {
+	public function insertIfNotExist(string $table, array $input, ?array $compare = null) {
 		try {
 			return $this->inner->insertIfNotExist($table, $input, $compare);
 		} catch (Exception $e) {
@@ -205,6 +189,14 @@ class ConnectionAdapter implements IDBConnection {
 		}
 	}
 
+	public function truncateTable(string $table, bool $cascade): void {
+		try {
+			$this->inner->truncateTable($table, $cascade);
+		} catch (Exception $e) {
+			throw DbalException::wrap($e);
+		}
+	}
+
 	public function tableExists(string $table): bool {
 		try {
 			return $this->inner->tableExists($table);
@@ -243,4 +235,31 @@ class ConnectionAdapter implements IDBConnection {
 	public function getInner(): Connection {
 		return $this->inner;
 	}
+
+	/**
+	 * @return self::PLATFORM_MYSQL|self::PLATFORM_ORACLE|self::PLATFORM_POSTGRES|self::PLATFORM_SQLITE|self::PLATFORM_MARIADB
+	 */
+	public function getDatabaseProvider(bool $strict = false): string {
+		return $this->inner->getDatabaseProvider($strict);
+	}
+
+	/**
+	 * @internal Should only be used inside the QueryBuilder, ExpressionBuilder and FunctionBuilder
+	 * All apps and API code should not need this and instead use provided functionality from the above.
+	 */
+	public function getServerVersion(): string {
+		return $this->inner->getServerVersion();
+	}
+
+	public function logDatabaseException(\Exception $exception) {
+		$this->inner->logDatabaseException($exception);
+	}
+
+	public function getShardDefinition(string $name): ?ShardDefinition {
+		return $this->inner->getShardDefinition($name);
+	}
+
+	public function getCrossShardMoveHelper(): CrossShardMoveHelper {
+		return $this->inner->getCrossShardMoveHelper();
+	}
 }