diff --git a/lib/private/DB/QueryBuilder/ExtendedQueryBuilder.php b/lib/private/DB/QueryBuilder/ExtendedQueryBuilder.php index f928132a123..9230c55c28c 100644 --- a/lib/private/DB/QueryBuilder/ExtendedQueryBuilder.php +++ b/lib/private/DB/QueryBuilder/ExtendedQueryBuilder.php @@ -8,7 +8,6 @@ declare(strict_types=1); namespace OC\DB\QueryBuilder; -use OC\DB\Exceptions\DbalException; use OCP\DB\IResult; use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\IDBConnection; @@ -47,21 +46,6 @@ abstract class ExtendedQueryBuilder implements IQueryBuilder { return $this->builder->getState(); } - public function execute(?IDBConnection $connection = null) { - try { - if ($this->getType() === \Doctrine\DBAL\Query\QueryBuilder::SELECT) { - return $this->executeQuery($connection); - } else { - return $this->executeStatement($connection); - } - } catch (DBALException $e) { - // `IQueryBuilder->execute` never wrapped the exception, but `executeQuery` and `executeStatement` do - /** @var \Doctrine\DBAL\Exception $previous */ - $previous = $e->getPrevious(); - throw $previous; - } - } - public function getSQL() { return $this->builder->getSQL(); } diff --git a/lib/private/DB/QueryBuilder/QueryBuilder.php b/lib/private/DB/QueryBuilder/QueryBuilder.php index 1d44c049793..494e271bbad 100644 --- a/lib/private/DB/QueryBuilder/QueryBuilder.php +++ b/lib/private/DB/QueryBuilder/QueryBuilder.php @@ -9,7 +9,6 @@ namespace OC\DB\QueryBuilder; use Doctrine\DBAL\Query\QueryException; use OC\DB\ConnectionAdapter; -use OC\DB\Exceptions\DbalException; use OC\DB\QueryBuilder\ExpressionBuilder\MySqlExpressionBuilder; use OC\DB\QueryBuilder\ExpressionBuilder\OCIExpressionBuilder; use OC\DB\QueryBuilder\ExpressionBuilder\PgSqlExpressionBuilder; @@ -254,30 +253,6 @@ class QueryBuilder implements IQueryBuilder { } } - /** - * Executes this query using the bound parameters and their types. - * - * Uses {@see Connection::executeQuery} for select statements and {@see Connection::executeUpdate} - * for insert, update and delete statements. - * - * @return IResult|int - */ - public function execute(?IDBConnection $connection = null) { - try { - if ($this->getType() === \Doctrine\DBAL\Query\QueryBuilder::SELECT) { - return $this->executeQuery($connection); - } else { - return $this->executeStatement($connection); - } - } catch (DBALException $e) { - // `IQueryBuilder->execute` never wrapped the exception, but `executeQuery` and `executeStatement` do - /** @var \Doctrine\DBAL\Exception $previous */ - $previous = $e->getPrevious(); - - throw $previous; - } - } - public function executeQuery(?IDBConnection $connection = null): IResult { if ($this->getType() !== \Doctrine\DBAL\Query\QueryBuilder::SELECT) { throw new \RuntimeException('Invalid query type, expected SELECT query'); diff --git a/lib/public/DB/QueryBuilder/IQueryBuilder.php b/lib/public/DB/QueryBuilder/IQueryBuilder.php index 4794e7e8877..b28aa8c24a0 100644 --- a/lib/public/DB/QueryBuilder/IQueryBuilder.php +++ b/lib/public/DB/QueryBuilder/IQueryBuilder.php @@ -190,24 +190,6 @@ interface IQueryBuilder { */ public function getState(); - /** - * Executes this query using the bound parameters and their types. - * - * Uses {@see Connection::executeQuery} for select statements and {@see Connection::executeStatement} - * for insert, update and delete statements. - * - * Warning: until Nextcloud 20, this method could return a \Doctrine\DBAL\Driver\Statement but since - * that interface changed in a breaking way the adapter \OCP\DB\QueryBuilder\IStatement is returned - * to bridge old code to the new API - * - * @param ?IDBConnection $connection (optional) the connection to run the query against. since 30.0 - * @return IResult|int - * @throws Exception since 21.0.0 - * @since 8.2.0 - * @deprecated 22.0.0 Use executeQuery or executeStatement - */ - public function execute(?IDBConnection $connection = null); - /** * Execute for select statements *