Skip to content

[stable20] Fetch the logger and system config once for all query builder instances #23787

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

Merged
MorrisJobke merged 1 commit into from
Oct 30, 2020
Merged

[stable20] Fetch the logger and system config once for all query builder instances #23787

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 15 additions & 8 deletions lib/private/DB/Connection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,21 +42,25 @@
use Doctrine\DBAL\Platforms\MySqlPlatform;
use Doctrine\DBAL\Schema\Schema;
use OC\DB\QueryBuilder\QueryBuilder;
use OC\SystemConfig;
use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\IDBConnection;
use OCP\ILogger;
use OCP\PreConditionNotMetException;

class Connection extends ReconnectWrapper implements IDBConnection {
/**
* @var string $tablePrefix
*/
/** @var string */
protected $tablePrefix;

/**
* @var \OC\DB\Adapter $adapter
*/
/** @var \OC\DB\Adapter $adapter */
protected $adapter;

/** @var SystemConfig */
private $systemConfig;

/** @var ILogger */
private $logger;

protected $lockedTable = null;

public function connect() {
Expand All @@ -76,8 +80,8 @@ public function connect() {
public function getQueryBuilder() {
return new QueryBuilder(
$this,
\OC::$server->getSystemConfig(),
\OC::$server->getLogger()
$this->systemConfig,
$this->logger
);
}

Expand Down Expand Up @@ -149,6 +153,9 @@ public function __construct(array $params, Driver $driver, Configuration $config
parent::__construct($params, $driver, $config, $eventManager);
$this->adapter = new $params['adapter']($this);
$this->tablePrefix = $params['tablePrefix'];

$this->systemConfig = \OC::$server->getSystemConfig();
$this->logger = \OC::$server->getLogger();
}

/**
Expand Down