From c254855222ca2776ccaa9c362b84295391cdd208 Mon Sep 17 00:00:00 2001
From: Git'Fellow <12234510+solracsf@users.noreply.github.com>
Date: Wed, 16 Oct 2024 10:41:21 +0200
Subject: chore(db): Correctly apply query types
fix: psalm
fix: error
fix: add batch
fix: fatal error
fix: add batch
chore: add batch
chore: add batch
fix: psalm
fix: typo
fix: psalm
fix: return bool
fix: revert Manager
---
lib/private/Files/Cache/Propagator.php | 5 ++---
lib/private/Files/Cache/StorageGlobal.php | 14 ++++++--------
lib/private/Files/Type/Loader.php | 9 ++++-----
3 files changed, 12 insertions(+), 16 deletions(-)
(limited to 'lib/private/Files')
diff --git a/lib/private/Files/Cache/Propagator.php b/lib/private/Files/Cache/Propagator.php
index bbeb8c42075..cdf9ca9991a 100644
--- a/lib/private/Files/Cache/Propagator.php
+++ b/lib/private/Files/Cache/Propagator.php
@@ -45,7 +45,6 @@ class Propagator implements IPropagator {
$this->ignore = $ignore;
}
-
/**
* @param string $internalPath
* @param int $time
@@ -200,13 +199,13 @@ class Propagator implements IPropagator {
$query->setParameter('time', $item['time'], IQueryBuilder::PARAM_INT);
$query->setParameter('hash', $item['hash']);
- $query->execute();
+ $query->executeStatement();
if ($item['size']) {
$sizeQuery->setParameter('size', $item['size'], IQueryBuilder::PARAM_INT);
$sizeQuery->setParameter('hash', $item['hash']);
- $sizeQuery->execute();
+ $sizeQuery->executeStatement();
}
}
diff --git a/lib/private/Files/Cache/StorageGlobal.php b/lib/private/Files/Cache/StorageGlobal.php
index b55c0fcdb91..bab31b1db91 100644
--- a/lib/private/Files/Cache/StorageGlobal.php
+++ b/lib/private/Files/Cache/StorageGlobal.php
@@ -21,16 +21,14 @@ use OCP\IDBConnection;
* @package OC\Files\Cache
*/
class StorageGlobal {
- /** @var IDBConnection */
- private $connection;
-
/** @var array<string, array> */
private $cache = [];
/** @var array<int, array> */
private $numericIdCache = [];
- public function __construct(IDBConnection $connection) {
- $this->connection = $connection;
+ public function __construct(
+ private IDBConnection $connection,
+ ) {
}
/**
@@ -42,7 +40,7 @@ class StorageGlobal {
->from('storages')
->where($builder->expr()->in('id', $builder->createNamedParameter(array_values($storageIds), IQueryBuilder::PARAM_STR_ARRAY)));
- $result = $query->execute();
+ $result = $query->executeQuery();
while ($row = $result->fetch()) {
$this->cache[$row['id']] = $row;
}
@@ -60,7 +58,7 @@ class StorageGlobal {
->from('storages')
->where($builder->expr()->eq('id', $builder->createNamedParameter($storageId)));
- $result = $query->execute();
+ $result = $query->executeQuery();
$row = $result->fetch();
$result->closeCursor();
@@ -83,7 +81,7 @@ class StorageGlobal {
->from('storages')
->where($builder->expr()->eq('numeric_id', $builder->createNamedParameter($numericId)));
- $result = $query->execute();
+ $result = $query->executeQuery();
$row = $result->fetch();
$result->closeCursor();
diff --git a/lib/private/Files/Type/Loader.php b/lib/private/Files/Type/Loader.php
index 407df59b2e2..5fbe4139759 100644
--- a/lib/private/Files/Type/Loader.php
+++ b/lib/private/Files/Type/Loader.php
@@ -21,8 +21,6 @@ use OCP\IDBConnection;
class Loader implements IMimeTypeLoader {
use TTransactional;
- private IDBConnection $dbConnection;
-
/** @psalm-var array<int, string> */
protected array $mimetypes;
@@ -32,8 +30,9 @@ class Loader implements IMimeTypeLoader {
/**
* @param IDBConnection $dbConnection
*/
- public function __construct(IDBConnection $dbConnection) {
- $this->dbConnection = $dbConnection;
+ public function __construct(
+ private IDBConnection $dbConnection,
+ ) {
$this->mimetypes = [];
$this->mimetypeIds = [];
}
@@ -161,6 +160,6 @@ class Loader implements IMimeTypeLoader {
$update->func()->lower('name'),
$update->createNamedParameter('%' . $this->dbConnection->escapeLikeParameter('.' . $ext))
));
- return $update->execute();
+ return $update->executeStatement();
}
}
--
cgit v1.2.3