Skip to content

Commit 9e9365d

Browse files
committed
always log queries even if debug bar is disabled
1 parent d87d3c8 commit 9e9365d

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

code/Extension/ProxyDBExtension.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
use SilverStripe\Control\Controller;
99
use TractorCow\ClassProxy\Generators\ProxyGenerator;
1010
use LeKoala\DebugBar\DebugBarUtils;
11+
use SilverStripe\Dev\Debug;
1112

1213
class ProxyDBExtension extends Extension
1314
{
@@ -33,16 +34,12 @@ class ProxyDBExtension extends Extension
3334
*/
3435
public function updateProxy(ProxyGenerator &$proxy)
3536
{
36-
if (DebugBar::getDebugBar() === false) {
37-
return;
38-
}
3937
if (self::$findSource === null) {
4038
self::$findSource = DebugBar::config()->get('find_source');
4139
}
4240

4341
// In the closure, $this is the proxied database
4442
$callback = function ($args, $next) {
45-
4643
// The first argument is always the sql query
4744
$sql = $args[0];
4845
$parameters = isset($args[2]) ? $args[2] : [];

tests/Extension/ProxyDBExtensionTest.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use SilverStripe\Dev\SapphireTest;
66
use SilverStripe\ORM\DB;
77
use LeKoala\DebugBar\Extension\ProxyDBExtension;
8+
use LeKoala\DebugBar\DebugBar;
89

910
class ProxyDBExtensionTest extends SapphireTest
1011
{
@@ -17,10 +18,14 @@ public function setUp(): void
1718
{
1819
parent::setUp();
1920
$this->conn = DB::get_conn();
21+
DebugBar::initDebugBar();
2022
}
2123

2224
public function testQueriesAreCollected()
2325
{
26+
$res = DebugBar::getDebugBar();
27+
$this->assertTrue($res !== false);
28+
DB::query("SELECT 0");
2429
$this->assertNotEmpty(ProxyDBExtension::getQueries());
2530
ProxyDBExtension::resetQueries();
2631
}

0 commit comments

Comments
 (0)