opensourcemirror
/
laravel-debugbar
mirror of https://github.com/barryvdh/laravel-debugbar.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Hide explain when empty for sqlite (#1565) 

* Hide explain when empty for sqlite

* Update QueryCollectorRuntimeDatabaseTest.php
This commit is contained in:
Barry vd. Heuvel 2024-03-09 09:39:15 +01:00 committed by GitHub
parent a8c3ec8108
commit e518f58ee4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 56 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
src/DataCollector/QueryCollector.php
View File

@ -531,62 +531,64 @@ class QueryCollector extends PDOCollector
'connection' => $query['connection'],
];
// Add the results from the EXPLAIN as new rows
if ($query['driver'] === 'pgsql') {
$explainer = trim(implode("\n", array_map(function ($explain) {
return $explain->{'QUERY PLAN'};
}, $query['explain'])));
if ($query['explain']) {
// Add the results from the EXPLAIN as new rows
if ($query['driver'] === 'pgsql') {
$explainer = trim(implode("\n", array_map(function ($explain) {
return $explain->{'QUERY PLAN'};
}, $query['explain'])));
if ($explainer) {
$statements[] = [
'sql' => " - EXPLAIN: {$explainer}",
'type' => 'explain',
];
}
} elseif ($query['driver'] === 'sqlite') {
$vmi = '<table style="margin:-5px -11px !important;width: 100% !important">';
$vmi .= "<thead><tr>
<td>Address</td>
<td>Opcode</td>
<td>P1</td>
<td>P2</td>
<td>P3</td>
<td>P4</td>
<td>P5</td>
<td>Comment</td>
</tr></thead>";
foreach ($query['explain'] as $explain) {
$vmi .= "<tr>
<td>{$explain->addr}</td>
<td>{$explain->opcode}</td>
<td>{$explain->p1}</td>
<td>{$explain->p2}</td>
<td>{$explain->p3}</td>
<td>{$explain->p4}</td>
<td>{$explain->p5}</td>
<td>{$explain->comment}</td>
</tr>";
}
$vmi .= '</table>';
if ($explainer) {
$statements[] = [
'sql' => " - EXPLAIN: {$explainer}",
'sql' => " - EXPLAIN:",
'type' => 'explain',
'params' => [
'Virtual Machine Instructions' => $vmi,
]
];
}
} elseif ($query['driver'] === 'sqlite') {
$vmi = '<table style="margin:-5px -11px !important;width: 100% !important">';
$vmi .= "<thead><tr>
<td>Address</td>
<td>Opcode</td>
<td>P1</td>
<td>P2</td>
<td>P3</td>
<td>P4</td>
<td>P5</td>
<td>Comment</td>
</tr></thead>";
foreach ($query['explain'] as $explain) {
$vmi .= "<tr>
<td>{$explain->addr}</td>
<td>{$explain->opcode}</td>
<td>{$explain->p1}</td>
<td>{$explain->p2}</td>
<td>{$explain->p3}</td>
<td>{$explain->p4}</td>
<td>{$explain->p5}</td>
<td>{$explain->comment}</td>
</tr>";
}
$vmi .= '</table>';
$statements[] = [
'sql' => " - EXPLAIN:",
'type' => 'explain',
'params' => [
'Virtual Machine Instructions' => $vmi,
]
];
} else {
foreach ($query['explain'] as $explain) {
$statements[] = [
'sql' => " - EXPLAIN # {$explain->id}: `{$explain->table}` ({$explain->select_type})",
'type' => 'explain',
'params' => $explain,
'row_count' => $explain->rows,
'stmt_id' => $explain->id,
];
} else {
foreach ($query['explain'] as $explain) {
$statements[] = [
'sql' => " - EXPLAIN # {$explain->id}: `{$explain->table}` ({$explain->select_type})",
'type' => 'explain',
'params' => $explain,
'row_count' => $explain->rows,
'stmt_id' => $explain->id,
];
}
}
}
}

4
tests/DataCollector/QueryCollectorRuntimeDatabaseTest.php
View File

@ -47,7 +47,7 @@ class QueryCollectorRuntimeDatabaseTest extends TestCase
tap($collector->collect(), function (array $collection) {
$this->assertEquals(1, $collection['nb_statements']);
self::assertSame('SELECT 1', $collection['statements'][2]['sql']);
self::assertSame('SELECT 1', $collection['statements'][1]['sql']);
});
}
@ -78,7 +78,7 @@ class QueryCollectorRuntimeDatabaseTest extends TestCase
tap($collector->collect(), function (array $collection) {
$this->assertEquals(1, $collection['nb_statements']);
self::assertSame('SELECT 1', $collection['statements'][2]['sql']);
self::assertSame('SELECT 1', $collection['statements'][1]['sql']);
});
}
}