[DoctrineBridge] Fix issue which prevent the profiler to explain a query
This commit is contained in:
parent
c7e772c8d8
commit
3490e98226
@ -117,6 +117,9 @@ class DoctrineDataCollector extends DataCollector
|
|||||||
private function sanitizeQuery($connectionName, $query)
|
private function sanitizeQuery($connectionName, $query)
|
||||||
{
|
{
|
||||||
$query['explainable'] = true;
|
$query['explainable'] = true;
|
||||||
|
if (null === $query['params']) {
|
||||||
|
$query['params'] = array();
|
||||||
|
}
|
||||||
if (!is_array($query['params'])) {
|
if (!is_array($query['params'])) {
|
||||||
$query['params'] = array($query['params']);
|
$query['params'] = array($query['params']);
|
||||||
}
|
}
|
||||||
|
@ -79,9 +79,25 @@ class DoctrineDataCollectorTest extends \PHPUnit_Framework_TestCase
|
|||||||
$c = $this->createCollector($queries);
|
$c = $this->createCollector($queries);
|
||||||
$c->collect(new Request(), new Response());
|
$c->collect(new Request(), new Response());
|
||||||
|
|
||||||
$collected_queries = $c->getQueries();
|
$collectedQueries = $c->getQueries();
|
||||||
$this->assertEquals($expected, $collected_queries['default'][0]['params'][0]);
|
$this->assertEquals($expected, $collectedQueries['default'][0]['params'][0]);
|
||||||
$this->assertEquals($explainable, $collected_queries['default'][0]['explainable']);
|
$this->assertEquals($explainable, $collectedQueries['default'][0]['explainable']);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testCollectQueryWithNoParams()
|
||||||
|
{
|
||||||
|
$queries = array(
|
||||||
|
array('sql' => 'SELECT * FROM table1', 'params' => array(), 'types' => array(), 'executionMS' => 1),
|
||||||
|
array('sql' => 'SELECT * FROM table1', 'params' => null, 'types' => null, 'executionMS' => 1),
|
||||||
|
);
|
||||||
|
$c = $this->createCollector($queries);
|
||||||
|
$c->collect(new Request(), new Response());
|
||||||
|
|
||||||
|
$collectedQueries = $c->getQueries();
|
||||||
|
$this->assertEquals(array(), $collectedQueries['default'][0]['params']);
|
||||||
|
$this->assertTrue($collectedQueries['default'][0]['explainable']);
|
||||||
|
$this->assertEquals(array(), $collectedQueries['default'][1]['params']);
|
||||||
|
$this->assertTrue($collectedQueries['default'][1]['explainable']);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -96,9 +112,9 @@ class DoctrineDataCollectorTest extends \PHPUnit_Framework_TestCase
|
|||||||
$c->collect(new Request(), new Response());
|
$c->collect(new Request(), new Response());
|
||||||
$c = unserialize(serialize($c));
|
$c = unserialize(serialize($c));
|
||||||
|
|
||||||
$collected_queries = $c->getQueries();
|
$collectedQueries = $c->getQueries();
|
||||||
$this->assertEquals($expected, $collected_queries['default'][0]['params'][0]);
|
$this->assertEquals($expected, $collectedQueries['default'][0]['params'][0]);
|
||||||
$this->assertEquals($explainable, $collected_queries['default'][0]['explainable']);
|
$this->assertEquals($explainable, $collectedQueries['default'][0]['explainable']);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function paramProvider()
|
public function paramProvider()
|
||||||
|
Reference in New Issue
Block a user