Skip to content

Commit acaf690

Browse files
summersabsummersab
committed
Refactor OC\Server::getDatabaseConnection
Signed-off-by: Andrew Summers <18727110+summersab@users.noreply.github.com> implement suggested changes from nickvergessen
1 parent e0c778f commit acaf690

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+141
-107
lines changed

‎core/register_command.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@
4848
* along with this program. If not, see <http://www.gnu.org/licenses/>
4949
*
5050
*/
51+
52+
use OCP\IDBConnection;
5153
use Psr\Log\LoggerInterface;
5254

5355
$application->add(new \Stecman\Component\Symfony\Console\BashCompletion\CompletionCommand());
@@ -107,7 +109,7 @@
107109
$application->add(\OC::$server->get(OC\Core\Command\Info\Space::class));
108110

109111
$application->add(new OC\Core\Command\Db\ConvertType(\OC::$server->getConfig(), new \OC\DB\ConnectionFactory(\OC::$server->getSystemConfig())));
110-
$application->add(new OC\Core\Command\Db\ConvertMysqlToMB4(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection(), \OC::$server->getURLGenerator(), \OC::$server->get(LoggerInterface::class)));
112+
$application->add(\OCP\Server::get(\OC\Core\Command\Db\ConvertMysqlToMB4::class));
111113
$application->add(new OC\Core\Command\Db\ConvertFilecacheBigInt(\OC::$server->get(\OC\DB\Connection::class)));
112114
$application->add(\OCP\Server::get(\OC\Core\Command\Db\AddMissingColumns::class));
113115
$application->add(\OCP\Server::get(\OC\Core\Command\Db\AddMissingIndices::class));

‎lib/private/Files/Cache/Cache.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ public function __construct(IStorage $storage) {
123123

124124
$this->storageCache = new Storage($storage);
125125
$this->mimetypeLoader = \OC::$server->getMimeTypeLoader();
126-
$this->connection = \OC::$server->getDatabaseConnection();
126+
$this->connection = \OC::$server->get(IDBConnection::class);
127127
$this->eventDispatcher = \OC::$server->get(IEventDispatcher::class);
128128
$this->querySearchHelper = \OCP\Server::get(QuerySearchHelper::class);
129129
}
@@ -1070,7 +1070,7 @@ public function getPathById($id) {
10701070
* @deprecated use getPathById() instead
10711071
*/
10721072
public static function getById($id) {
1073-
$query = \OC::$server->getDatabaseConnection()->getQueryBuilder();
1073+
$query = \OC::$server->get(IDBConnection::class)->getQueryBuilder();
10741074
$query->select('path', 'storage')
10751075
->from('filecache')
10761076
->where($query->expr()->eq('fileid', $query->createNamedParameter($id, IQueryBuilder::PARAM_INT)));

‎lib/private/Files/Cache/Storage.php‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131

3232
use OCP\DB\QueryBuilder\IQueryBuilder;
3333
use OCP\Files\Storage\IStorage;
34+
use OCP\IDBConnection;
3435
use Psr\Log\LoggerInterface;
3536

3637
/**
@@ -55,7 +56,7 @@ class Storage {
5556
*/
5657
public static function getGlobalCache() {
5758
if (is_null(self::$globalCache)) {
58-
self::$globalCache = new StorageGlobal(\OC::$server->getDatabaseConnection());
59+
self::$globalCache = new StorageGlobal(\OC::$server->get(IDBConnection::class));
5960
}
6061
return self::$globalCache;
6162
}
@@ -76,7 +77,7 @@ public function __construct($storage, $isAvailable = true) {
7677
if ($row = self::getStorageById($this->storageId)) {
7778
$this->numericId = (int)$row['numeric_id'];
7879
} else {
79-
$connection = \OC::$server->getDatabaseConnection();
80+
$connection = \OC::$server->get(IDBConnection::class);
8081
$available = $isAvailable ? 1 : 0;
8182
if ($connection->insertIfNotExist('*PREFIX*storages', ['id' => $this->storageId, 'available' => $available])) {
8283
$this->numericId = $connection->lastInsertId('*PREFIX*storages');
@@ -174,7 +175,7 @@ public function setAvailability($isAvailable, int $delay = 0) {
174175
\OC::$server->get(LoggerInterface::class)->info('Storage with ' . $this->storageId . ' marked as unavailable', ['app' => 'lib']);
175176
}
176177

177-
$query = \OC::$server->getDatabaseConnection()->getQueryBuilder();
178+
$query = \OC::$server->get(IDBConnection::class)->getQueryBuilder();
178179
$query->update('storages')
179180
->set('available', $query->createNamedParameter($available))
180181
->set('last_checked', $query->createNamedParameter(time() + $delay))
@@ -201,13 +202,13 @@ public static function remove($storageId) {
201202
$storageId = self::adjustStorageId($storageId);
202203
$numericId = self::getNumericStorageId($storageId);
203204

204-
$query = \OC::$server->getDatabaseConnection()->getQueryBuilder();
205+
$query = \OC::$server->get(IDBConnection::class)->getQueryBuilder();
205206
$query->delete('storages')
206207
->where($query->expr()->eq('id', $query->createNamedParameter($storageId)));
207208
$query->execute();
208209

209210
if (!is_null($numericId)) {
210-
$query = \OC::$server->getDatabaseConnection()->getQueryBuilder();
211+
$query = \OC::$server->get(IDBConnection::class)->getQueryBuilder();
211212
$query->delete('filecache')
212213
->where($query->expr()->eq('storage', $query->createNamedParameter($numericId)));
213214
$query->execute();
@@ -220,7 +221,7 @@ public static function remove($storageId) {
220221
* @param int $mountId
221222
*/
222223
public static function cleanByMountId(int $mountId) {
223-
$db = \OC::$server->getDatabaseConnection();
224+
$db = \OC::$server->get(IDBConnection::class);
224225

225226
try {
226227
$db->beginTransaction();

‎lib/private/Files/Cache/Wrapper/CacheJail.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
use OCP\Files\Search\ISearchBinaryOperator;
3535
use OCP\Files\Search\ISearchComparison;
3636
use OCP\Files\Search\ISearchOperator;
37+
use OCP\IDBConnection;
3738

3839
/**
3940
* Jail to a subdirectory of the wrapped cache
@@ -52,7 +53,7 @@ class CacheJail extends CacheWrapper {
5253
public function __construct($cache, $root) {
5354
parent::__construct($cache);
5455
$this->root = $root;
55-
$this->connection = \OC::$server->getDatabaseConnection();
56+
$this->connection = \OC::$server->get(IDBConnection::class);
5657
$this->mimetypeLoader = \OC::$server->getMimeTypeLoader();
5758

5859
if ($cache instanceof CacheJail) {

‎lib/private/Files/Storage/Common.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161
use OCP\Files\Storage\ILockingStorage;
6262
use OCP\Files\Storage\IStorage;
6363
use OCP\Files\Storage\IWriteStreamStorage;
64+
use OCP\IDBConnection;
6465
use OCP\Lock\ILockingProvider;
6566
use OCP\Lock\LockedException;
6667
use Psr\Log\LoggerInterface;
@@ -382,7 +383,7 @@ public function getPropagator($storage = null) {
382383
}
383384
if (!isset($storage->propagator)) {
384385
$config = \OC::$server->getSystemConfig();
385-
$storage->propagator = new Propagator($storage, \OC::$server->getDatabaseConnection(), ['appdata_' . $config->getValue('instanceid')]);
386+
$storage->propagator = new Propagator($storage, \OC::$server->get(IDBConnection::class), ['appdata_' . $config->getValue('instanceid')]);
386387
}
387388
return $storage->propagator;
388389
}
@@ -536,7 +537,7 @@ public function verifyPath($path, $fileName) {
536537
throw new InvalidDirectoryException();
537538
}
538539

539-
if (!\OC::$server->getDatabaseConnection()->supports4ByteText()) {
540+
if (!\OC::$server->get(IDBConnection::class)->supports4ByteText()) {
540541
// verify database - e.g. mysql only 3-byte chars
541542
if (preg_match('%(?:
542543
\xF0[\x90-\xBF][\x80-\xBF]{2} # planes 1-3

‎lib/private/Files/Storage/Home.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
namespace OC\Files\Storage;
2727

2828
use OC\Files\Cache\HomePropagator;
29+
use OCP\IDBConnection;
2930
use OCP\IUser;
3031

3132
/**
@@ -84,7 +85,7 @@ public function getPropagator($storage = null) {
8485
$storage = $this;
8586
}
8687
if (!isset($this->propagator)) {
87-
$this->propagator = new HomePropagator($storage, \OC::$server->getDatabaseConnection());
88+
$this->propagator = new HomePropagator($storage, \OC::$server->get(IDBConnection::class));
8889
}
8990
return $this->propagator;
9091
}

‎lib/private/Files/Storage/Wrapper/Jail.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
use OCP\Files\Storage\IStorage;
3535
use OCP\Files\Storage\IWriteStreamStorage;
3636
use OCP\Lock\ILockingProvider;
37+
use OCP\IDBConnection;
3738

3839
/**
3940
* Jail to a subdirectory of the wrapped storage
@@ -513,7 +514,7 @@ public function getPropagator($storage = null) {
513514
if (!$storage) {
514515
$storage = $this;
515516
}
516-
$this->propagator = new JailPropagator($storage, \OC::$server->getDatabaseConnection());
517+
$this->propagator = new JailPropagator($storage, \OC::$server->get(IDBConnection::class));
517518
return $this->propagator;
518519
}
519520

‎lib/private/Group/Database.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public function __construct(IDBConnection $dbConn = null) {
8282
*/
8383
private function fixDI() {
8484
if ($this->dbConn === null) {
85-
$this->dbConn = \OC::$server->getDatabaseConnection();
85+
$this->dbConn = \OC::$server->get(IDBConnection::class);
8686
}
8787
}
8888

‎lib/private/Group/Manager.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
use OCP\Group\Events\GroupCreatedEvent;
4949
use OCP\GroupInterface;
5050
use OCP\ICacheFactory;
51+
use OCP\IDBConnection;
5152
use OCP\IGroup;
5253
use OCP\IGroupManager;
5354
use OCP\IUser;
@@ -482,7 +483,7 @@ public function getSubAdmin() {
482483
$this->subAdmin = new \OC\SubAdmin(
483484
$this->userManager,
484485
$this,
485-
\OC::$server->getDatabaseConnection(),
486+
\OC::$server->get(IDBConnection::class),
486487
$this->dispatcher
487488
);
488489
}

‎lib/private/Repair.php‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
use OCP\AppFramework\Utility\ITimeFactory;
4141
use OCP\Collaboration\Resources\IManager;
4242
use OCP\EventDispatcher\IEventDispatcher;
43+
use OCP\IDBConnection;
4344
use OCP\Migration\IOutput;
4445
use OCP\Migration\IRepairStep;
4546
use OC\DB\Connection;
@@ -174,10 +175,10 @@ public function addStep($repairStep) {
174175
*/
175176
public static function getRepairSteps(): array {
176177
return [
177-
new Collation(\OC::$server->getConfig(), \OC::$server->get(LoggerInterface::class), \OC::$server->getDatabaseConnection(), false),
178-
new RepairMimeTypes(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection()),
179-
new CleanTags(\OC::$server->getDatabaseConnection(), \OC::$server->getUserManager()),
180-
new RepairInvalidShares(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection()),
178+
new Collation(\OC::$server->getConfig(), \OC::$server->get(LoggerInterface::class), \OC::$server->get(IDBConnection::class), false),
179+
new RepairMimeTypes(\OC::$server->getConfig(), \OC::$server->get(IDBConnection::class)),
180+
new CleanTags(\OC::$server->get(IDBConnection::class), \OC::$server->getUserManager()),
181+
new RepairInvalidShares(\OC::$server->getConfig(), \OC::$server->get(IDBConnection::class)),
181182
new MoveUpdaterStepFile(\OC::$server->getConfig()),
182183
new MoveAvatars(
183184
\OC::$server->getJobList(),
@@ -189,16 +190,16 @@ public static function getRepairSteps(): array {
189190
\OC::$server->getConfig()
190191
),
191192
new MigrateOauthTables(\OC::$server->get(Connection::class)),
192-
new FixMountStorages(\OC::$server->getDatabaseConnection()),
193-
new UpdateLanguageCodes(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig()),
193+
\OCP\Server::get(FixMountStorages::class),
194+
new UpdateLanguageCodes(\OC::$server->get(IDBConnection::class), \OC::$server->getConfig()),
194195
new AddLogRotateJob(\OC::$server->getJobList()),
195196
new ClearFrontendCaches(\OC::$server->getMemCacheFactory(), \OCP\Server::get(JSCombiner::class)),
196197
\OCP\Server::get(ClearGeneratedAvatarCache::class),
197198
new AddPreviewBackgroundCleanupJob(\OC::$server->getJobList()),
198199
new AddCleanupUpdaterBackupsJob(\OC::$server->getJobList()),
199200
new CleanupCardDAVPhotoCache(\OC::$server->getConfig(), \OC::$server->getAppDataDir('dav-photocache'), \OC::$server->get(LoggerInterface::class)),
200201
new AddClenupLoginFlowV2BackgroundJob(\OC::$server->getJobList()),
201-
new RemoveLinkShares(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig(), \OC::$server->getGroupManager(), \OC::$server->getNotificationManager(), \OCP\Server::get(ITimeFactory::class)),
202+
new RemoveLinkShares(\OC::$server->get(IDBConnection::class), \OC::$server->getConfig(), \OC::$server->getGroupManager(), \OC::$server->getNotificationManager(), \OCP\Server::get(ITimeFactory::class)),
202203
new ClearCollectionsAccessCache(\OC::$server->getConfig(), \OCP\Server::get(IManager::class)),
203204
\OCP\Server::get(ResetGeneratedAvatarFlag::class),
204205
\OCP\Server::get(EncryptionLegacyCipher::class),
@@ -223,7 +224,7 @@ public static function getRepairSteps(): array {
223224
*/
224225
public static function getExpensiveRepairSteps() {
225226
return [
226-
new OldGroupMembershipShares(\OC::$server->getDatabaseConnection(), \OC::$server->getGroupManager()),
227+
new OldGroupMembershipShares(\OC::$server->get(IDBConnection::class), \OC::$server->getGroupManager()),
227228
\OC::$server->get(ValidatePhoneNumber::class),
228229
];
229230
}

0 commit comments

Comments
 (0)