upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-03-01 13:00:44 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Fix unencrypted size calculation for files created before the Encryption storage is enabled

Browse source 
Signed-off-by: raul <raul@nextcloud.com>
This commit is contained in:
raul 2022-10-03 13:40:57 +02:00 committed by Raul Ferreira Fuentes (Rebase PR Action)
parent ba12309f3c
commit bdbacdffc2
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/private/Files/Cache/Propagator.php
View file

@ -24,7 +24,6 @@
namespace OC\Files\Cache;
use OC\DB\QueryBuilder\QueryFunction;
use Doctrine\DBAL\Exception\RetryableException;
use OC\Files\Storage\Wrapper\Encryption;
use OCP\DB\QueryBuilder\IQueryBuilder;
@ -122,7 +121,7 @@ class Propagator implements IPropagator {
$unencryptedSizeColumn = $builder->getColumnName('unencrypted_size');
$newUnencryptedSize = $builder->func()->greatest(
$builder->func()->add(
$builder->createFunction("CASE WHEN $hasUnencryptedSize THEN $sizeColumn ELSE $unencryptedSizeColumn END"),
$builder->createFunction("CASE WHEN $hasUnencryptedSize THEN $unencryptedSizeColumn ELSE $sizeColumn END"),
$builder->createNamedParameter($sizeDifference)
),
$builder->createNamedParameter(-1, IQueryBuilder::PARAM_INT)
@ -139,7 +138,7 @@ class Propagator implements IPropagator {
break;
} catch (RetryableException $e) {
/** @var LoggerInterface $loggerInterface */
$loggerInterface = \OCP\Server::get(LoggerInterface::class);
$loggerInterface = \OC::$server->get(LoggerInterface::class);
$loggerInterface->warning('Retrying propagation query after retryable exception.', [ 'exception' => $e ]);
}
}