]> source.dussan.org Git - nextcloud-server.git/commitdiff
Revert "Cleanup versions entity in during versions:clean command"
authorLouis Chemineau <louis@chmn.me>
Thu, 1 Feb 2024 22:37:26 +0000 (23:37 +0100)
committerLouis Chemineau <louis@chmn.me>
Thu, 1 Feb 2024 22:37:26 +0000 (23:37 +0100)
This reverts commit 1ec9f3e5f9dd84723008137af73cf365beaf4d1b.

apps/files_versions/lib/Command/CleanUp.php
apps/files_versions/lib/Db/VersionsMapper.php

index be66ce8ffb3a24d93f098b7b70b6d1b1b5bcd5e8..519b3689a58dace89e02aa536531adfac81b785b 100644 (file)
@@ -24,7 +24,6 @@
  */
 namespace OCA\Files_Versions\Command;
 
-use OCA\Files_Versions\Db\VersionsMapper;
 use OCP\Files\IRootFolder;
 use OCP\IUserBackend;
 use OCP\IUserManager;
@@ -38,7 +37,6 @@ class CleanUp extends Command {
        public function __construct(
                protected IRootFolder $rootFolder,
                protected IUserManager $userManager,
-               protected VersionsMapper $versionMapper,
        ) {
                parent::__construct();
        }
@@ -122,7 +120,6 @@ class CleanUp extends Command {
                \OC_Util::setupFS($user);
 
                $fullPath = '/' . $user . '/files_versions' . ($path ? '/' . $path : '');
-               $this->versionMapper->deleteAllVersionsForUser($user);
                if ($this->rootFolder->nodeExists($fullPath)) {
                        $this->rootFolder->get($fullPath)->delete();
                }
index 9b5d7a52c1343796da648b66bb294d301e769f6b..bc6e8b264dee98139776e3624df29e0ceae2bc0d 100644 (file)
@@ -27,7 +27,6 @@ declare(strict_types=1);
 namespace OCA\Files_Versions\Db;
 
 use OCP\AppFramework\Db\QBMapper;
-use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
 
 /**
@@ -84,20 +83,4 @@ class VersionsMapper extends QBMapper {
                         ->where($qb->expr()->eq('file_id', $qb->createNamedParameter($fileId)))
                         ->executeStatement();
        }
-
-       public function deleteAllVersionsForUser(string $userId): int {
-               $deleteQuery = $this->db->getQueryBuilder();
-               $filesVersionSelect = $this->db->getQueryBuilder();
-               $filesVersionSelect->select('fileid')
-                       ->from('filecache', 'f')
-                       ->join('f', 'mounts', 'm', $filesVersionSelect->expr()->eq('f.storage', 'm.storage_id'))
-                       ->where($filesVersionSelect->expr()->like('f.path', $deleteQuery->createNamedParameter('files/%', IQueryBuilder::PARAM_STR)))
-                       ->andWhere($filesVersionSelect->expr()->eq('m.user_id', $deleteQuery->createNamedParameter($userId, IQueryBuilder::PARAM_STR)))
-                       ->andWhere($filesVersionSelect->expr()->eq('m.mount_point', $deleteQuery->createNamedParameter("/$userId/", IQueryBuilder::PARAM_STR)));
-
-               $deleteQuery->delete($this->getTableName())
-                       ->where($deleteQuery->expr()->in('file_id', $deleteQuery->createFunction($filesVersionSelect->getSQL()), IQueryBuilder::PARAM_INT_ARRAY));
-
-               return $deleteQuery->executeStatement();
-       }
 }