From 7966eee0078633f0836bd9303e296b328418e78c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Mon, 12 Jan 2015 15:22:02 +0100 Subject: [PATCH] Adding repair step to fix missing etags - fixes #12172 --- lib/private/repair.php | 4 +++- lib/repair/filletags.php | 41 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 lib/repair/filletags.php diff --git a/lib/private/repair.php b/lib/private/repair.php index be607b44ed..c4f057b53a 100644 --- a/lib/private/repair.php +++ b/lib/private/repair.php @@ -12,6 +12,7 @@ use OC\Hooks\BasicEmitter; use OC\Hooks\Emitter; use OC\Repair\AssetCache; use OC\Repair\Collation; +use OC\Repair\FillETags; use OC\Repair\InnoDB; use OC\Repair\RepairConfig; use OC\Repair\RepairLegacyStorages; @@ -79,7 +80,8 @@ class Repair extends BasicEmitter { new RepairMimeTypes(), new RepairLegacyStorages(\OC::$server->getConfig(), \OC_DB::getConnection()), new RepairConfig(), - new AssetCache() + new AssetCache(), + new FillETags(\OC_DB::getConnection()) ); } diff --git a/lib/repair/filletags.php b/lib/repair/filletags.php new file mode 100644 index 0000000000..b94ae385f0 --- /dev/null +++ b/lib/repair/filletags.php @@ -0,0 +1,41 @@ + + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OC\Repair; + +use Doctrine\DBAL\Query\QueryBuilder; +use OC\Hooks\BasicEmitter; + +class FillETags extends BasicEmitter implements \OC\RepairStep { + + /** @var \OC\DB\Connection */ + protected $connection; + + /** + * @param \OC\DB\Connection $connection + */ + public function __construct($connection) { + $this->connection = $connection; + } + + public function getName() { + return 'Generate ETags for file where no ETag is present.'; + } + + public function run() { + $qb = $this->connection->createQueryBuilder(); + $qb->update('`*PREFIX*filecache`') + ->set('`etag`', $qb->expr()->literal('xxx')) + ->where($qb->expr()->eq('`etag`', $qb->expr()->literal(''))) + ->orWhere($qb->expr()->isNull('`etag`')); + + $result = $qb->execute(); + $this->emit('\OC\Repair', 'info', array("ETags have been fixed for $result files/folders.")); + } +} +