8000 [DoctrineBridge] Fix issue which prevent the profiler to explain a query by Baachi · Pull Request #16306 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[DoctrineBridge] Fix issue which prevent the profiler to explain a query #16306

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

[DoctrineBridge] Fix issue which prevent the profiler to explain a query #16306

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b7bb6b
Fix issue which prevent the profiler to explain a query
Baachi Oct 21, 2015
00c90e4
Fix CS
Baachi Oct 26, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Fix issue which prevent the profiler to explain a query
  • Loading branch information
@Baachi
Baachi committed Oct 21, 2015
commit 3b7bb6be49b4a520970b3c890c38140f298065fb
3 changes: 3 additions & 0 deletions src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,9 @@ private function sanitizeQueries($connectionName, $queries)
private function sanitizeQuery($connectionName, $query)
{
$query['explainable'] = true;
if (null === $query['params']) {
$query['params'] = array();
}
if (!is_array($query['params'])) {
$query['params'] = array($query['params']);
}
Expand Down
16 changes: 16 additions & 0 deletions src/Symfony/Bridge/Doctrine/Tests/DataCollector/DoctrineDataCollectorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,22 @@ public function testCollectQueries($param, $types, $expected, $explainable)
$this->assertEquals($explainable, $collected_queries['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());

$collected_queries = $c->getQueries();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be camel cased: $collectedQueries.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just noticed it's also snaked_cased in the other test case. Feel free to fix that one as well.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed it in all testcases

$this->assertEquals(array(), $collected_queries['default'][0]['params']);
$this->assertTrue($collected_queries['default'][0]['explainable']);
$this->assertEquals(array(), $collected_queries['default'][1]['params']);
$this->assertTrue($collected_queries['default'][1]['explainable']);
}

/**
* @dataProvider paramProvider
*/
Expand Down
0