DB: warn on parameter number constraints
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
This commit is contained in:
parent
b0ea654653
commit
b82efbdee5
|
@ -215,6 +215,36 @@ class QueryBuilder implements IQueryBuilder {
|
||||||
}
|
}
|
||||||
|
|
||||||
return $this->queryBuilder->execute();
|
return $this->queryBuilder->execute();
|
||||||
|
$numberOfParameters = 0;
|
||||||
|
$hasTooLargeArrayParameter = false;
|
||||||
|
foreach ($this->getParameters() as $parameter) {
|
||||||
|
if (is_array($parameter)) {
|
||||||
|
$count = count($parameter);
|
||||||
|
$numberOfParameters += $count;
|
||||||
|
$hasTooLargeArrayParameter = $hasTooLargeArrayParameter || ($count > 1000);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($hasTooLargeArrayParameter) {
|
||||||
|
$exception = new QueryException('More than 1000 expressions in a list are not allowed on Oracle.');
|
||||||
|
$this->logger->logException($exception, [
|
||||||
|
'message' => 'More than 1000 expressions in a list are not allowed on Oracle.',
|
||||||
|
'query' => $this->getSQL(),
|
||||||
|
'level' => ILogger::ERROR,
|
||||||
|
'app' => 'core',
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($numberOfParameters > 65535) {
|
||||||
|
$exception = new QueryException('The number of parameters must not exceed 65535. Restriction by PostgreSQL.');
|
||||||
|
$this->logger->logException($exception, [
|
||||||
|
'message' => 'The number of parameters must not exceed 65535. Restriction by PostgreSQL.',
|
||||||
|
'query' => $this->getSQL(),
|
||||||
|
'level' => ILogger::ERROR,
|
||||||
|
'app' => 'core',
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -22,6 +22,8 @@
|
||||||
namespace Test\DB\QueryBuilder;
|
namespace Test\DB\QueryBuilder;
|
||||||
|
|
||||||
use Doctrine\DBAL\Query\Expression\CompositeExpression;
|
use Doctrine\DBAL\Query\Expression\CompositeExpression;
|
||||||
|
use Doctrine\DBAL\Query\QueryException;
|
||||||
|
use Doctrine\DBAL\Result;
|
||||||
use OC\DB\QueryBuilder\Literal;
|
use OC\DB\QueryBuilder\Literal;
|
||||||
use OC\DB\QueryBuilder\Parameter;
|
use OC\DB\QueryBuilder\Parameter;
|
||||||
use OC\DB\QueryBuilder\QueryBuilder;
|
use OC\DB\QueryBuilder\QueryBuilder;
|
||||||
|
@ -1261,6 +1263,10 @@ class QueryBuilderTest extends \Test\TestCase {
|
||||||
->expects($this->once())
|
->expects($this->once())
|
||||||
->method('execute')
|
->method('execute')
|
||||||
->willReturn(3);
|
->willReturn(3);
|
||||||
|
$queryBuilder
|
||||||
|
->expects($this->any())
|
||||||
|
->method('getParameters')
|
||||||
|
->willReturn([]);
|
||||||
$this->logger
|
$this->logger
|
||||||
->expects($this->never())
|
->expects($this->never())
|
||||||
->method('debug');
|
->method('debug');
|
||||||
|
@ -1277,14 +1283,14 @@ class QueryBuilderTest extends \Test\TestCase {
|
||||||
public function testExecuteWithLoggerAndNamedArray() {
|
public function testExecuteWithLoggerAndNamedArray() {
|
||||||
$queryBuilder = $this->createMock(\Doctrine\DBAL\Query\QueryBuilder::class);
|
$queryBuilder = $this->createMock(\Doctrine\DBAL\Query\QueryBuilder::class);
|
||||||
$queryBuilder
|
$queryBuilder
|
||||||
->expects($this->at(0))
|
->expects($this->any())
|
||||||
->method('getParameters')
|
->method('getParameters')
|
||||||
->willReturn([
|
->willReturn([
|
||||||
'foo' => 'bar',
|
'foo' => 'bar',
|
||||||
'key' => 'value',
|
'key' => 'value',
|
||||||
]);
|
]);
|
||||||
$queryBuilder
|
$queryBuilder
|
||||||
->expects($this->at(1))
|
->expects($this->any())
|
||||||
->method('getSQL')
|
->method('getSQL')
|
||||||
->willReturn('SELECT * FROM FOO WHERE BAR = ?');
|
->willReturn('SELECT * FROM FOO WHERE BAR = ?');
|
||||||
$queryBuilder
|
$queryBuilder
|
||||||
|
@ -1315,11 +1321,11 @@ class QueryBuilderTest extends \Test\TestCase {
|
||||||
public function testExecuteWithLoggerAndUnnamedArray() {
|
public function testExecuteWithLoggerAndUnnamedArray() {
|
||||||
$queryBuilder = $this->createMock(\Doctrine\DBAL\Query\QueryBuilder::class);
|
$queryBuilder = $this->createMock(\Doctrine\DBAL\Query\QueryBuilder::class);
|
||||||
$queryBuilder
|
$queryBuilder
|
||||||
->expects($this->at(0))
|
->expects($this->any())
|
||||||
->method('getParameters')
|
->method('getParameters')
|
||||||
->willReturn(['Bar']);
|
->willReturn(['Bar']);
|
||||||
$queryBuilder
|
$queryBuilder
|
||||||
->expects($this->at(1))
|
->expects($this->any())
|
||||||
->method('getSQL')
|
->method('getSQL')
|
||||||
->willReturn('SELECT * FROM FOO WHERE BAR = ?');
|
->willReturn('SELECT * FROM FOO WHERE BAR = ?');
|
||||||
$queryBuilder
|
$queryBuilder
|
||||||
|
@ -1350,11 +1356,11 @@ class QueryBuilderTest extends \Test\TestCase {
|
||||||
public function testExecuteWithLoggerAndNoParams() {
|
public function testExecuteWithLoggerAndNoParams() {
|
||||||
$queryBuilder = $this->createMock(\Doctrine\DBAL\Query\QueryBuilder::class);
|
$queryBuilder = $this->createMock(\Doctrine\DBAL\Query\QueryBuilder::class);
|
||||||
$queryBuilder
|
$queryBuilder
|
||||||
->expects($this->at(0))
|
->expects($this->any())
|
||||||
->method('getParameters')
|
->method('getParameters')
|
||||||
->willReturn([]);
|
->willReturn([]);
|
||||||
$queryBuilder
|
$queryBuilder
|
||||||
->expects($this->at(1))
|
->expects($this->any())
|
||||||
->method('getSQL')
|
->method('getSQL')
|
||||||
->willReturn('SELECT * FROM FOO WHERE BAR = ?');
|
->willReturn('SELECT * FROM FOO WHERE BAR = ?');
|
||||||
$queryBuilder
|
$queryBuilder
|
||||||
|
@ -1380,4 +1386,74 @@ class QueryBuilderTest extends \Test\TestCase {
|
||||||
$this->invokePrivate($this->queryBuilder, 'queryBuilder', [$queryBuilder]);
|
$this->invokePrivate($this->queryBuilder, 'queryBuilder', [$queryBuilder]);
|
||||||
$this->assertEquals(3, $this->queryBuilder->execute());
|
$this->assertEquals(3, $this->queryBuilder->execute());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testExecuteWithParameterTooLarge() {
|
||||||
|
$queryBuilder = $this->createMock(\Doctrine\DBAL\Query\QueryBuilder::class);
|
||||||
|
$p = array_fill(0, 1001, 'foo');
|
||||||
|
$queryBuilder
|
||||||
|
->expects($this->any())
|
||||||
|
->method('getParameters')
|
||||||
|
->willReturn([$p]);
|
||||||
|
$queryBuilder
|
||||||
|
->expects($this->any())
|
||||||
|
->method('getSQL')
|
||||||
|
->willReturn('SELECT * FROM FOO WHERE BAR IN (?)');
|
||||||
|
$queryBuilder
|
||||||
|
->expects($this->once())
|
||||||
|
->method('execute')
|
||||||
|
->willReturn($this->createMock(Result::class));
|
||||||
|
$this->logger
|
||||||
|
->expects($this->once())
|
||||||
|
->method('logException')
|
||||||
|
->willReturnCallback(function ($e, $parameters) {
|
||||||
|
$this->assertInstanceOf(QueryException::class, $e);
|
||||||
|
$this->assertSame(
|
||||||
|
'More than 1000 expressions in a list are not allowed on Oracle.',
|
||||||
|
$parameters['message']
|
||||||
|
);
|
||||||
|
});
|
||||||
|
$this->config
|
||||||
|
->expects($this->once())
|
||||||
|
->method('getValue')
|
||||||
|
->with('log_query', false)
|
||||||
|
->willReturn(false);
|
||||||
|
|
||||||
|
$this->invokePrivate($this->queryBuilder, 'queryBuilder', [$queryBuilder]);
|
||||||
|
$this->queryBuilder->execute();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testExecuteWithParametersTooMany() {
|
||||||
|
$queryBuilder = $this->createMock(\Doctrine\DBAL\Query\QueryBuilder::class);
|
||||||
|
$p = array_fill(0, 999, 'foo');
|
||||||
|
$queryBuilder
|
||||||
|
->expects($this->any())
|
||||||
|
->method('getParameters')
|
||||||
|
->willReturn(array_fill(0, 66, $p));
|
||||||
|
$queryBuilder
|
||||||
|
->expects($this->any())
|
||||||
|
->method('getSQL')
|
||||||
|
->willReturn('SELECT * FROM FOO WHERE BAR IN (?) OR BAR IN (?)');
|
||||||
|
$queryBuilder
|
||||||
|
->expects($this->once())
|
||||||
|
->method('execute')
|
||||||
|
->willReturn($this->createMock(Result::class));
|
||||||
|
$this->logger
|
||||||
|
->expects($this->once())
|
||||||
|
->method('logException')
|
||||||
|
->willReturnCallback(function ($e, $parameters) {
|
||||||
|
$this->assertInstanceOf(QueryException::class, $e);
|
||||||
|
$this->assertSame(
|
||||||
|
'The number of parameters must not exceed 65535. Restriction by PostgreSQL.',
|
||||||
|
$parameters['message']
|
||||||
|
);
|
||||||
|
});
|
||||||
|
$this->config
|
||||||
|
->expects($this->once())
|
||||||
|
->method('getValue')
|
||||||
|
->with('log_query', false)
|
||||||
|
->willReturn(false);
|
||||||
|
|
||||||
|
$this->invokePrivate($this->queryBuilder, 'queryBuilder', [$queryBuilder]);
|
||||||
|
$this->queryBuilder->execute();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue