Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
fixup! feat: Add repair step for deduplicating mounts
Signed-off-by: Salvatore Martire <[email protected]>
  • Loading branch information
salmart-dev authored and provokateurin committed Dec 2, 2025
commit f4c2f804e2c8224b158e6a7a0e972bbe692d62ba
6 changes: 5 additions & 1 deletion lib/private/Repair.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,11 @@
use OC\Repair\ClearFrontendCaches;
use OC\Repair\ClearGeneratedAvatarCache;
use OC\Repair\Collation;
<<<<<<< HEAD
use OC\Repair\ConfigKeyMigration;
use OC\Repair\DeduplicateMounts;
=======
>>>>>>> 40ad8fd0dfc (fixup! feat: Add repair step for deduplicating mounts)
use OC\Repair\Events\RepairAdvanceEvent;
use OC\Repair\Events\RepairErrorEvent;
use OC\Repair\Events\RepairFinishEvent;
Expand Down Expand Up @@ -58,6 +61,7 @@
use OC\Repair\RepairInvalidShares;
use OC\Repair\RepairLogoDimension;
use OC\Repair\RepairMimeTypes;
use OC\Repair\TruncateMounts;
use OC\Template\JSCombiner;
use OCA\DAV\Migration\DeleteSchedulingObjects;
use OCA\DAV\Migration\RemoveObjectProperties;
Expand Down Expand Up @@ -222,7 +226,7 @@ public static function getExpensiveRepairSteps() {
),
\OCP\Server::get(DeleteSchedulingObjects::class),
\OC::$server->get(RemoveObjectProperties::class),
\OCP\Server::get(DeduplicateMounts::class),
\OCP\Server::get(TruncateMounts::class),
];
}

Expand Down
68 changes: 0 additions & 68 deletions lib/private/Repair/DeduplicateMounts.php

This file was deleted.

29 changes: 29 additions & 0 deletions lib/private/Repair/TruncateMounts.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<?php

declare(strict_types=1);

/**
* SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/

namespace OC\Repair;

use OCP\IDBConnection;
use OCP\Migration\IOutput;
use OCP\Migration\IRepairStep;

class TruncateMounts implements IRepairStep {
public function __construct(
private readonly IDBConnection $connection,
) {
}

public function getName(): string {
return 'Deduplicate mounts';
}

public function run(IOutput $output): void {
$this->connection->truncateTable('mounts', false);
}
}
158 changes: 0 additions & 158 deletions tests/lib/Repair/DeduplicateMountsTest.php

This file was deleted.