diff options
Diffstat (limited to 'lib/private')
-rw-r--r-- | lib/private/DB/BacktraceDebugStack.php | 34 | ||||
-rw-r--r-- | lib/private/DB/Connection.php | 3 | ||||
-rw-r--r-- | lib/private/DB/DbDataCollector.php | 5 |
3 files changed, 37 insertions, 5 deletions
diff --git a/lib/private/DB/BacktraceDebugStack.php b/lib/private/DB/BacktraceDebugStack.php new file mode 100644 index 00000000000..be37e5a35da --- /dev/null +++ b/lib/private/DB/BacktraceDebugStack.php @@ -0,0 +1,34 @@ +<?php + +declare(strict_types=1); +/** + * @copyright Copyright (c) 2022 Robin Appelman <robin@icewind.nl> + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +namespace OC\DB; + +use Doctrine\DBAL\Logging\DebugStack; + +class BacktraceDebugStack extends DebugStack { + public function startQuery($sql, ?array $params = null, ?array $types = null) { + parent::startQuery($sql, $params, $types); + $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); + $this->queries[$this->currentQuery]['backtrace'] = $backtrace; + } +} diff --git a/lib/private/DB/Connection.php b/lib/private/DB/Connection.php index 2e38b1ddf5e..22c2bbbb793 100644 --- a/lib/private/DB/Connection.php +++ b/lib/private/DB/Connection.php @@ -42,7 +42,6 @@ use Doctrine\DBAL\Driver; use Doctrine\DBAL\Exception; use Doctrine\DBAL\Exception\ConstraintViolationException; use Doctrine\DBAL\Exception\NotNullConstraintViolationException; -use Doctrine\DBAL\Logging\DebugStack; use Doctrine\DBAL\Platforms\MySQLPlatform; use Doctrine\DBAL\Platforms\OraclePlatform; use Doctrine\DBAL\Platforms\PostgreSQL94Platform; @@ -113,7 +112,7 @@ class Connection extends \Doctrine\DBAL\Connection { if ($profiler->isEnabled()) { $this->dbDataCollector = new DbDataCollector($this); $profiler->add($this->dbDataCollector); - $debugStack = new DebugStack(); + $debugStack = new BacktraceDebugStack(); $this->dbDataCollector->setDebugStack($debugStack); $this->_config->setSQLLogger($debugStack); } diff --git a/lib/private/DB/DbDataCollector.php b/lib/private/DB/DbDataCollector.php index d708955b10e..60e3dbe797d 100644 --- a/lib/private/DB/DbDataCollector.php +++ b/lib/private/DB/DbDataCollector.php @@ -25,14 +25,13 @@ declare(strict_types = 1); namespace OC\DB; -use Doctrine\DBAL\Logging\DebugStack; use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; use OC\AppFramework\Http\Request; use OCP\AppFramework\Http\Response; class DbDataCollector extends \OCP\DataCollector\AbstractDataCollector { - protected ?DebugStack $debugStack = null; + protected ?BacktraceDebugStack $debugStack = null; private Connection $connection; /** @@ -42,7 +41,7 @@ class DbDataCollector extends \OCP\DataCollector\AbstractDataCollector { $this->connection = $connection; } - public function setDebugStack(DebugStack $debugStack, $name = 'default'): void { + public function setDebugStack(BacktraceDebugStack $debugStack, $name = 'default'): void { $this->debugStack = $debugStack; } |