nextcloud / server

core/Command/Info/FileUtils.php

Indentation +272 added lines, -272 removed lines

@@ -33,293 +33,293 @@
  * @psalm-type StorageInfo array{numeric_id: int, id: string, available: bool, last_checked: ?\DateTime, files: int, mount_id: ?int}
  */
 class FileUtils {
-	public function __construct(
-		private IRootFolder $rootFolder,
-		private IUserMountCache $userMountCache,
-		private IDBConnection $connection,
-	) {
-	}
+    public function __construct(
+        private IRootFolder $rootFolder,
+        private IUserMountCache $userMountCache,
+        private IDBConnection $connection,
+    ) {
+    }
 
-	/**
-	 * @param FileInfo $file
-	 * @return array<string, Node[]>
-	 * @throws NotPermittedException
-	 * @throws NoUserException
-	 */
-	public function getFilesByUser(FileInfo $file): array {
-		$id = $file->getId();
-		if (!$id) {
-			return [];
-		}
+    /**
+     * @param FileInfo $file
+     * @return array<string, Node[]>
+     * @throws NotPermittedException
+     * @throws NoUserException
+     */
+    public function getFilesByUser(FileInfo $file): array {
+        $id = $file->getId();
+        if (!$id) {
+            return [];
+        }
 
-		$mounts = $this->userMountCache->getMountsForFileId($id);
-		$result = [];
-		foreach ($mounts as $cachedMount) {
-			$mount = $this->rootFolder->getMount($cachedMount->getMountPoint());
-			$cache = $mount->getStorage()->getCache();
-			$cacheEntry = $cache->get($id);
-			$node = $this->rootFolder->getNodeFromCacheEntryAndMount($cacheEntry, $mount);
-			$result[$cachedMount->getUser()->getUID()][] = $node;
-		}
+        $mounts = $this->userMountCache->getMountsForFileId($id);
+        $result = [];
+        foreach ($mounts as $cachedMount) {
+            $mount = $this->rootFolder->getMount($cachedMount->getMountPoint());
+            $cache = $mount->getStorage()->getCache();
+            $cacheEntry = $cache->get($id);
+            $node = $this->rootFolder->getNodeFromCacheEntryAndMount($cacheEntry, $mount);
+            $result[$cachedMount->getUser()->getUID()][] = $node;
+        }
 
-		return $result;
-	}
+        return $result;
+    }
 
-	/**
-	 * Get file by either id of path
-	 *
-	 * @param string $fileInput
-	 * @return Node|null
-	 */
-	public function getNode(string $fileInput): ?Node {
-		if (is_numeric($fileInput)) {
-			$mounts = $this->userMountCache->getMountsForFileId((int)$fileInput);
-			if (!$mounts) {
-				return null;
-			}
-			$mount = reset($mounts);
-			$userFolder = $this->rootFolder->getUserFolder($mount->getUser()->getUID());
-			return $userFolder->getFirstNodeById((int)$fileInput);
-		} else {
-			try {
-				return $this->rootFolder->get($fileInput);
-			} catch (NotFoundException $e) {
-				return null;
-			}
-		}
-	}
+    /**
+     * Get file by either id of path
+     *
+     * @param string $fileInput
+     * @return Node|null
+     */
+    public function getNode(string $fileInput): ?Node {
+        if (is_numeric($fileInput)) {
+            $mounts = $this->userMountCache->getMountsForFileId((int)$fileInput);
+            if (!$mounts) {
+                return null;
+            }
+            $mount = reset($mounts);
+            $userFolder = $this->rootFolder->getUserFolder($mount->getUser()->getUID());
+            return $userFolder->getFirstNodeById((int)$fileInput);
+        } else {
+            try {
+                return $this->rootFolder->get($fileInput);
+            } catch (NotFoundException $e) {
+                return null;
+            }
+        }
+    }
 
-	public function formatPermissions(string $type, int $permissions): string {
-		if ($permissions == Constants::PERMISSION_ALL || ($type === 'file' && $permissions == (Constants::PERMISSION_ALL - Constants::PERMISSION_CREATE))) {
-			return 'full permissions';
-		}
+    public function formatPermissions(string $type, int $permissions): string {
+        if ($permissions == Constants::PERMISSION_ALL || ($type === 'file' && $permissions == (Constants::PERMISSION_ALL - Constants::PERMISSION_CREATE))) {
+            return 'full permissions';
+        }
 
-		$perms = [];
-		$allPerms = [Constants::PERMISSION_READ => 'read', Constants::PERMISSION_UPDATE => 'update', Constants::PERMISSION_CREATE => 'create', Constants::PERMISSION_DELETE => 'delete', Constants::PERMISSION_SHARE => 'share'];
-		foreach ($allPerms as $perm => $name) {
-			if (($permissions & $perm) === $perm) {
-				$perms[] = $name;
-			}
-		}
+        $perms = [];
+        $allPerms = [Constants::PERMISSION_READ => 'read', Constants::PERMISSION_UPDATE => 'update', Constants::PERMISSION_CREATE => 'create', Constants::PERMISSION_DELETE => 'delete', Constants::PERMISSION_SHARE => 'share'];
+        foreach ($allPerms as $perm => $name) {
+            if (($permissions & $perm) === $perm) {
+                $perms[] = $name;
+            }
+        }
 
-		return implode(', ', $perms);
-	}
+        return implode(', ', $perms);
+    }
 
-	/**
-	 * @psalm-suppress UndefinedClass
-	 * @psalm-suppress UndefinedInterfaceMethod
-	 */
-	public function formatMountType(IMountPoint $mountPoint): string {
-		$storage = $mountPoint->getStorage();
-		if ($storage && $storage->instanceOfStorage(IHomeStorage::class)) {
-			return 'home storage';
-		} elseif ($mountPoint instanceof SharedMount) {
-			$share = $mountPoint->getShare();
-			$shares = $mountPoint->getGroupedShares();
-			$sharedBy = array_map(function (IShare $share) {
-				$shareType = $this->formatShareType($share);
-				if ($shareType) {
-					return $share->getSharedBy() . ' (via ' . $shareType . ' ' . $share->getSharedWith() . ')';
-				} else {
-					return $share->getSharedBy();
-				}
-			}, $shares);
-			$description = 'shared by ' . implode(', ', $sharedBy);
-			if ($share->getSharedBy() !== $share->getShareOwner()) {
-				$description .= ' owned by ' . $share->getShareOwner();
-			}
-			return $description;
-		} elseif ($mountPoint instanceof GroupMountPoint) {
-			return 'groupfolder ' . $mountPoint->getFolderId();
-		} elseif ($mountPoint instanceof ExternalMountPoint) {
-			return 'external storage ' . $mountPoint->getStorageConfig()->getId();
-		} elseif ($mountPoint instanceof CircleMount) {
-			return 'circle';
-		}
-		return get_class($mountPoint);
-	}
+    /**
+     * @psalm-suppress UndefinedClass
+     * @psalm-suppress UndefinedInterfaceMethod
+     */
+    public function formatMountType(IMountPoint $mountPoint): string {
+        $storage = $mountPoint->getStorage();
+        if ($storage && $storage->instanceOfStorage(IHomeStorage::class)) {
+            return 'home storage';
+        } elseif ($mountPoint instanceof SharedMount) {
+            $share = $mountPoint->getShare();
+            $shares = $mountPoint->getGroupedShares();
+            $sharedBy = array_map(function (IShare $share) {
+                $shareType = $this->formatShareType($share);
+                if ($shareType) {
+                    return $share->getSharedBy() . ' (via ' . $shareType . ' ' . $share->getSharedWith() . ')';
+                } else {
+                    return $share->getSharedBy();
+                }
+            }, $shares);
+            $description = 'shared by ' . implode(', ', $sharedBy);
+            if ($share->getSharedBy() !== $share->getShareOwner()) {
+                $description .= ' owned by ' . $share->getShareOwner();
+            }
+            return $description;
+        } elseif ($mountPoint instanceof GroupMountPoint) {
+            return 'groupfolder ' . $mountPoint->getFolderId();
+        } elseif ($mountPoint instanceof ExternalMountPoint) {
+            return 'external storage ' . $mountPoint->getStorageConfig()->getId();
+        } elseif ($mountPoint instanceof CircleMount) {
+            return 'circle';
+        }
+        return get_class($mountPoint);
+    }
 
-	public function formatShareType(IShare $share): ?string {
-		switch ($share->getShareType()) {
-			case IShare::TYPE_GROUP:
-				return 'group';
-			case IShare::TYPE_CIRCLE:
-				return 'circle';
-			case IShare::TYPE_DECK:
-				return 'deck';
-			case IShare::TYPE_ROOM:
-				return 'room';
-			case IShare::TYPE_USER:
-				return null;
-			default:
-				return 'Unknown (' . $share->getShareType() . ')';
-		}
-	}
+    public function formatShareType(IShare $share): ?string {
+        switch ($share->getShareType()) {
+            case IShare::TYPE_GROUP:
+                return 'group';
+            case IShare::TYPE_CIRCLE:
+                return 'circle';
+            case IShare::TYPE_DECK:
+                return 'deck';
+            case IShare::TYPE_ROOM:
+                return 'room';
+            case IShare::TYPE_USER:
+                return null;
+            default:
+                return 'Unknown (' . $share->getShareType() . ')';
+        }
+    }
 
-	/**
-	 * Print out the largest count($sizeLimits) files in the directory tree
-	 *
-	 * @param OutputInterface $output
-	 * @param Folder $node
-	 * @param string $prefix
-	 * @param array $sizeLimits largest items that are still in the queue to be printed, ordered ascending
-	 * @return int how many items we've printed
-	 */
-	public function outputLargeFilesTree(
-		OutputInterface $output,
-		Folder $node,
-		string $prefix,
-		array &$sizeLimits,
-		bool $all,
-	): int {
-		/**
-		 * Algorithm to print the N largest items in a folder without requiring to query or sort the entire three
-		 *
-		 * This is done by keeping a list ($sizeLimits) of size N that contain the largest items outside of this
-		 * folders that are could be printed if there aren't enough items in this folder that are larger.
-		 *
-		 * We loop over the items in this folder by size descending until the size of the item falls before the smallest
-		 * size in $sizeLimits (at that point there are enough items outside this folder to complete the N items).
-		 *
-		 * When encountering a folder, we create an updated $sizeLimits with the largest items in the current folder still
-		 * remaining which we pass into the recursion. (We don't update the current $sizeLimits because that should only
-		 * hold items *outside* of the current folder.)
-		 *
-		 * For every item printed we remove the first item of $sizeLimits are there is no longer room in the output to print
-		 * items that small.
-		 */
+    /**
+     * Print out the largest count($sizeLimits) files in the directory tree
+     *
+     * @param OutputInterface $output
+     * @param Folder $node
+     * @param string $prefix
+     * @param array $sizeLimits largest items that are still in the queue to be printed, ordered ascending
+     * @return int how many items we've printed
+     */
+    public function outputLargeFilesTree(
+        OutputInterface $output,
+        Folder $node,
+        string $prefix,
+        array &$sizeLimits,
+        bool $all,
+    ): int {
+        /**
+         * Algorithm to print the N largest items in a folder without requiring to query or sort the entire three
+         *
+         * This is done by keeping a list ($sizeLimits) of size N that contain the largest items outside of this
+         * folders that are could be printed if there aren't enough items in this folder that are larger.
+         *
+         * We loop over the items in this folder by size descending until the size of the item falls before the smallest
+         * size in $sizeLimits (at that point there are enough items outside this folder to complete the N items).
+         *
+         * When encountering a folder, we create an updated $sizeLimits with the largest items in the current folder still
+         * remaining which we pass into the recursion. (We don't update the current $sizeLimits because that should only
+         * hold items *outside* of the current folder.)
+         *
+         * For every item printed we remove the first item of $sizeLimits are there is no longer room in the output to print
+         * items that small.
+         */
 
-		$count = 0;
-		$children = $node->getDirectoryListing();
-		usort($children, function (Node $a, Node $b) {
-			return $b->getSize() <=> $a->getSize();
-		});
-		foreach ($children as $i => $child) {
-			if (!$all) {
-				if (count($sizeLimits) === 0 || $child->getSize() < $sizeLimits[0]) {
-					return $count;
-				}
-				array_shift($sizeLimits);
-			}
-			$count += 1;
+        $count = 0;
+        $children = $node->getDirectoryListing();
+        usort($children, function (Node $a, Node $b) {
+            return $b->getSize() <=> $a->getSize();
+        });
+        foreach ($children as $i => $child) {
+            if (!$all) {
+                if (count($sizeLimits) === 0 || $child->getSize() < $sizeLimits[0]) {
+                    return $count;
+                }
+                array_shift($sizeLimits);
+            }
+            $count += 1;
 
-			/** @var Node $child */
-			$output->writeln("$prefix- " . $child->getName() . ': <info>' . Util::humanFileSize($child->getSize()) . '</info>');
-			if ($child instanceof Folder) {
-				$recurseSizeLimits = $sizeLimits;
-				if (!$all) {
-					for ($j = 0; $j < count($recurseSizeLimits); $j++) {
-						if (isset($children[$i + $j + 1])) {
-							$nextChildSize = $children[$i + $j + 1]->getSize();
-							if ($nextChildSize > $recurseSizeLimits[0]) {
-								array_shift($recurseSizeLimits);
-								$recurseSizeLimits[] = $nextChildSize;
-							}
-						}
-					}
-					sort($recurseSizeLimits);
-				}
-				$recurseCount = $this->outputLargeFilesTree($output, $child, $prefix . '  ', $recurseSizeLimits, $all);
-				$sizeLimits = array_slice($sizeLimits, $recurseCount);
-				$count += $recurseCount;
-			}
-		}
-		return $count;
-	}
+            /** @var Node $child */
+            $output->writeln("$prefix- " . $child->getName() . ': <info>' . Util::humanFileSize($child->getSize()) . '</info>');
+            if ($child instanceof Folder) {
+                $recurseSizeLimits = $sizeLimits;
+                if (!$all) {
+                    for ($j = 0; $j < count($recurseSizeLimits); $j++) {
+                        if (isset($children[$i + $j + 1])) {
+                            $nextChildSize = $children[$i + $j + 1]->getSize();
+                            if ($nextChildSize > $recurseSizeLimits[0]) {
+                                array_shift($recurseSizeLimits);
+                                $recurseSizeLimits[] = $nextChildSize;
+                            }
+                        }
+                    }
+                    sort($recurseSizeLimits);
+                }
+                $recurseCount = $this->outputLargeFilesTree($output, $child, $prefix . '  ', $recurseSizeLimits, $all);
+                $sizeLimits = array_slice($sizeLimits, $recurseCount);
+                $count += $recurseCount;
+            }
+        }
+        return $count;
+    }
 
-	public function getNumericStorageId(string $id): ?int {
-		if (is_numeric($id)) {
-			return (int)$id;
-		}
-		$query = $this->connection->getQueryBuilder();
-		$query->select('numeric_id')
-			->from('storages')
-			->where($query->expr()->eq('id', $query->createNamedParameter($id)));
-		$result = $query->executeQuery()->fetchOne();
-		return $result ? (int)$result : null;
-	}
+    public function getNumericStorageId(string $id): ?int {
+        if (is_numeric($id)) {
+            return (int)$id;
+        }
+        $query = $this->connection->getQueryBuilder();
+        $query->select('numeric_id')
+            ->from('storages')
+            ->where($query->expr()->eq('id', $query->createNamedParameter($id)));
+        $result = $query->executeQuery()->fetchOne();
+        return $result ? (int)$result : null;
+    }
 
-	/**
-	 * @param int|null $limit
-	 * @return ?StorageInfo
-	 * @throws \OCP\DB\Exception
-	 */
-	public function getStorage(int $id): ?array {
-		$query = $this->connection->getQueryBuilder();
-		$query->select('numeric_id', 's.id', 'available', 'last_checked', 'mount_id')
-			->selectAlias($query->func()->count('fileid'), 'files')
-			->from('storages', 's')
-			->innerJoin('s', 'filecache', 'f', $query->expr()->eq('f.storage', 's.numeric_id'))
-			->leftJoin('s', 'mounts', 'm', $query->expr()->eq('s.numeric_id', 'm.storage_id'))
-			->where($query->expr()->eq('s.numeric_id', $query->createNamedParameter($id, IQueryBuilder::PARAM_INT)))
-			->groupBy('s.numeric_id', 's.id', 's.available', 's.last_checked', 'mount_id');
-		$row = $query->executeQuery()->fetchAssociative();
-		if ($row) {
-			return [
-				'numeric_id' => $row['numeric_id'],
-				'id' => $row['id'],
-				'files' => $row['files'],
-				'available' => (bool)$row['available'],
-				'last_checked' => $row['last_checked'] ? new \DateTime('@' . $row['last_checked']) : null,
-				'mount_id' => $row['mount_id'],
-			];
-		} else {
-			return null;
-		}
-	}
+    /**
+     * @param int|null $limit
+     * @return ?StorageInfo
+     * @throws \OCP\DB\Exception
+     */
+    public function getStorage(int $id): ?array {
+        $query = $this->connection->getQueryBuilder();
+        $query->select('numeric_id', 's.id', 'available', 'last_checked', 'mount_id')
+            ->selectAlias($query->func()->count('fileid'), 'files')
+            ->from('storages', 's')
+            ->innerJoin('s', 'filecache', 'f', $query->expr()->eq('f.storage', 's.numeric_id'))
+            ->leftJoin('s', 'mounts', 'm', $query->expr()->eq('s.numeric_id', 'm.storage_id'))
+            ->where($query->expr()->eq('s.numeric_id', $query->createNamedParameter($id, IQueryBuilder::PARAM_INT)))
+            ->groupBy('s.numeric_id', 's.id', 's.available', 's.last_checked', 'mount_id');
+        $row = $query->executeQuery()->fetchAssociative();
+        if ($row) {
+            return [
+                'numeric_id' => $row['numeric_id'],
+                'id' => $row['id'],
+                'files' => $row['files'],
+                'available' => (bool)$row['available'],
+                'last_checked' => $row['last_checked'] ? new \DateTime('@' . $row['last_checked']) : null,
+                'mount_id' => $row['mount_id'],
+            ];
+        } else {
+            return null;
+        }
+    }
 
-	/**
-	 * @param int|null $limit
-	 * @return \Iterator<StorageInfo>
-	 * @throws \OCP\DB\Exception
-	 */
-	public function listStorages(?int $limit): \Iterator {
-		$query = $this->connection->getQueryBuilder();
-		$query->select('numeric_id', 's.id', 'available', 'last_checked', 'mount_id')
-			->selectAlias($query->func()->count('fileid'), 'files')
-			->from('storages', 's')
-			->innerJoin('s', 'filecache', 'f', $query->expr()->eq('f.storage', 's.numeric_id'))
-			->leftJoin('s', 'mounts', 'm', $query->expr()->eq('s.numeric_id', 'm.storage_id'))
-			->groupBy('s.numeric_id', 's.id', 's.available', 's.last_checked', 'mount_id')
-			->orderBy('files', 'DESC');
-		if ($limit !== null) {
-			$query->setMaxResults($limit);
-		}
-		$result = $query->executeQuery();
-		while ($row = $result->fetchAssociative()) {
-			yield [
-				'numeric_id' => $row['numeric_id'],
-				'id' => $row['id'],
-				'files' => $row['files'],
-				'available' => (bool)$row['available'],
-				'last_checked' => $row['last_checked'] ? new \DateTime('@' . $row['last_checked']) : null,
-				'mount_id' => $row['mount_id'],
-			];
-		}
-	}
+    /**
+     * @param int|null $limit
+     * @return \Iterator<StorageInfo>
+     * @throws \OCP\DB\Exception
+     */
+    public function listStorages(?int $limit): \Iterator {
+        $query = $this->connection->getQueryBuilder();
+        $query->select('numeric_id', 's.id', 'available', 'last_checked', 'mount_id')
+            ->selectAlias($query->func()->count('fileid'), 'files')
+            ->from('storages', 's')
+            ->innerJoin('s', 'filecache', 'f', $query->expr()->eq('f.storage', 's.numeric_id'))
+            ->leftJoin('s', 'mounts', 'm', $query->expr()->eq('s.numeric_id', 'm.storage_id'))
+            ->groupBy('s.numeric_id', 's.id', 's.available', 's.last_checked', 'mount_id')
+            ->orderBy('files', 'DESC');
+        if ($limit !== null) {
+            $query->setMaxResults($limit);
+        }
+        $result = $query->executeQuery();
+        while ($row = $result->fetchAssociative()) {
+            yield [
+                'numeric_id' => $row['numeric_id'],
+                'id' => $row['id'],
+                'files' => $row['files'],
+                'available' => (bool)$row['available'],
+                'last_checked' => $row['last_checked'] ? new \DateTime('@' . $row['last_checked']) : null,
+                'mount_id' => $row['mount_id'],
+            ];
+        }
+    }
 
-	/**
-	 * @param StorageInfo $storage
-	 * @return array
-	 */
-	public function formatStorage(array $storage): array {
-		return [
-			'numeric_id' => $storage['numeric_id'],
-			'id' => $storage['id'],
-			'files' => $storage['files'],
-			'available' => $storage['available'] ? 'true' : 'false',
-			'last_checked' => $storage['last_checked']?->format(\DATE_ATOM),
-			'external_mount_id' => $storage['mount_id'],
-		];
-	}
+    /**
+     * @param StorageInfo $storage
+     * @return array
+     */
+    public function formatStorage(array $storage): array {
+        return [
+            'numeric_id' => $storage['numeric_id'],
+            'id' => $storage['id'],
+            'files' => $storage['files'],
+            'available' => $storage['available'] ? 'true' : 'false',
+            'last_checked' => $storage['last_checked']?->format(\DATE_ATOM),
+            'external_mount_id' => $storage['mount_id'],
+        ];
+    }
 
-	/**
-	 * @param \Iterator<StorageInfo> $storages
-	 * @return \Iterator
-	 */
-	public function formatStorages(\Iterator $storages): \Iterator {
-		foreach ($storages as $storage) {
-			yield $this->formatStorage($storage);
-		}
-	}
+    /**
+     * @param \Iterator<StorageInfo> $storages
+     * @return \Iterator
+     */
+    public function formatStorages(\Iterator $storages): \Iterator {
+        foreach ($storages as $storage) {
+            yield $this->formatStorage($storage);
+        }
+    }
 }

core/Command/Maintenance/RepairShareOwnership.php

Indentation +151 added lines, -151 removed lines

@@ -22,155 +22,155 @@
 use Symfony\Component\Console\Question\ConfirmationQuestion;
 
 class RepairShareOwnership extends Command {
-	public function __construct(
-		private IDBConnection $dbConnection,
-		private IUserManager $userManager,
-	) {
-		parent::__construct();
-	}
-
-	protected function configure() {
-		$this
-			->setName('maintenance:repair-share-owner')
-			->setDescription('repair invalid share-owner entries in the database')
-			->addOption('no-confirm', 'y', InputOption::VALUE_NONE, "Don't ask for confirmation before repairing the shares")
-			->addArgument('user', InputArgument::OPTIONAL, 'User to fix incoming shares for, if omitted all users will be fixed');
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$noConfirm = $input->getOption('no-confirm');
-		$userId = $input->getArgument('user');
-		if ($userId) {
-			$user = $this->userManager->get($userId);
-			if (!$user) {
-				$output->writeln("<error>user $userId not found</error>");
-				return 1;
-			}
-			$shares = $this->getWrongShareOwnershipForUser($user);
-		} else {
-			$shares = $this->getWrongShareOwnership();
-		}
-
-		if ($shares) {
-			$output->writeln('');
-			$output->writeln('Found ' . count($shares) . ' shares with invalid share owner');
-			foreach ($shares as $share) {
-				/** @var array{shareId: int, fileTarget: string, initiator: string, receiver: string, owner: string, mountOwner: string} $share */
-				$output->writeln(" - share {$share['shareId']} from \"{$share['initiator']}\" to \"{$share['receiver']}\" at \"{$share['fileTarget']}\", owned by \"{$share['owner']}\", that should be owned by \"{$share['mountOwner']}\"");
-			}
-			$output->writeln('');
-
-			if (!$noConfirm) {
-				/** @var QuestionHelper $helper */
-				$helper = $this->getHelper('question');
-				$question = new ConfirmationQuestion('Repair these shares? [y/N]', false);
-
-				if (!$helper->ask($input, $output, $question)) {
-					return 0;
-				}
-			}
-			$output->writeln('Repairing ' . count($shares) . ' shares');
-			$this->repairShares($shares);
-		} else {
-			$output->writeln('Found no shares with invalid share owner');
-		}
-
-		return 0;
-	}
-
-	/**
-	 * @return array{shareId: int, fileTarget: string, initiator: string, receiver: string, owner: string, mountOwner: string}[]
-	 * @throws \OCP\DB\Exception
-	 */
-	protected function getWrongShareOwnership(): array {
-		$qb = $this->dbConnection->getQueryBuilder();
-		$brokenShares = $qb
-			->select('s.id', 'm.user_id', 's.uid_owner', 's.uid_initiator', 's.share_with', 's.file_target')
-			->from('share', 's')
-			->join('s', 'filecache', 'f', $qb->expr()->eq($qb->expr()->castColumn('s.item_source', IQueryBuilder::PARAM_INT), 'f.fileid'))
-			->join('s', 'mounts', 'm', $qb->expr()->eq('f.storage', 'm.storage_id'))
-			->where($qb->expr()->neq('m.user_id', 's.uid_owner'))
-			->andWhere($qb->expr()->eq($qb->func()->concat($qb->expr()->literal('/'), 'm.user_id', $qb->expr()->literal('/')), 'm.mount_point'))
-			->executeQuery()
-			->fetchAllAssociative();
-
-		$found = [];
-
-		foreach ($brokenShares as $share) {
-			$found[] = [
-				'shareId' => (int)$share['id'],
-				'fileTarget' => $share['file_target'],
-				'initiator' => $share['uid_initiator'],
-				'receiver' => $share['share_with'],
-				'owner' => $share['uid_owner'],
-				'mountOwner' => $share['user_id'],
-			];
-		}
-
-		return $found;
-	}
-
-	/**
-	 * @param IUser $user
-	 * @return array{shareId: int, fileTarget: string, initiator: string, receiver: string, owner: string, mountOwner: string}[]
-	 * @throws \OCP\DB\Exception
-	 */
-	protected function getWrongShareOwnershipForUser(IUser $user): array {
-		$qb = $this->dbConnection->getQueryBuilder();
-		$brokenShares = $qb
-			->select('s.id', 'm.user_id', 's.uid_owner', 's.uid_initiator', 's.share_with', 's.file_target')
-			->from('share', 's')
-			->join('s', 'filecache', 'f', $qb->expr()->eq('s.item_source', $qb->expr()->castColumn('f.fileid', IQueryBuilder::PARAM_STR)))
-			->join('s', 'mounts', 'm', $qb->expr()->eq('f.storage', 'm.storage_id'))
-			->where($qb->expr()->neq('m.user_id', 's.uid_owner'))
-			->andWhere($qb->expr()->eq($qb->func()->concat($qb->expr()->literal('/'), 'm.user_id', $qb->expr()->literal('/')), 'm.mount_point'))
-			->andWhere($qb->expr()->eq('s.share_with', $qb->createNamedParameter($user->getUID())))
-			->executeQuery()
-			->fetchAllAssociative();
-
-		$found = [];
-
-		foreach ($brokenShares as $share) {
-			$found[] = [
-				'shareId' => (int)$share['id'],
-				'fileTarget' => $share['file_target'],
-				'initiator' => $share['uid_initiator'],
-				'receiver' => $share['share_with'],
-				'owner' => $share['uid_owner'],
-				'mountOwner' => $share['user_id'],
-			];
-		}
-
-		return $found;
-	}
-
-	/**
-	 * @param array{shareId: int, fileTarget: string, initiator: string, receiver: string, owner: string, mountOwner: string}[] $shares
-	 * @return void
-	 */
-	protected function repairShares(array $shares) {
-		$this->dbConnection->beginTransaction();
-
-		$update = $this->dbConnection->getQueryBuilder();
-		$update->update('share')
-			->set('uid_owner', $update->createParameter('share_owner'))
-			->set('uid_initiator', $update->createParameter('share_initiator'))
-			->where($update->expr()->eq('id', $update->createParameter('share_id')));
-
-		foreach ($shares as $share) {
-			/** @var array{shareId: int, fileTarget: string, initiator: string, receiver: string, owner: string, mountOwner: string} $share */
-			$update->setParameter('share_id', $share['shareId'], IQueryBuilder::PARAM_INT);
-			$update->setParameter('share_owner', $share['mountOwner']);
-
-			// if the broken owner is also the initiator it's safe to update them both, otherwise we don't touch the initiator
-			if ($share['initiator'] === $share['owner']) {
-				$update->setParameter('share_initiator', $share['mountOwner']);
-			} else {
-				$update->setParameter('share_initiator', $share['initiator']);
-			}
-			$update->executeStatement();
-		}
-
-		$this->dbConnection->commit();
-	}
+    public function __construct(
+        private IDBConnection $dbConnection,
+        private IUserManager $userManager,
+    ) {
+        parent::__construct();
+    }
+
+    protected function configure() {
+        $this
+            ->setName('maintenance:repair-share-owner')
+            ->setDescription('repair invalid share-owner entries in the database')
+            ->addOption('no-confirm', 'y', InputOption::VALUE_NONE, "Don't ask for confirmation before repairing the shares")
+            ->addArgument('user', InputArgument::OPTIONAL, 'User to fix incoming shares for, if omitted all users will be fixed');
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $noConfirm = $input->getOption('no-confirm');
+        $userId = $input->getArgument('user');
+        if ($userId) {
+            $user = $this->userManager->get($userId);
+            if (!$user) {
+                $output->writeln("<error>user $userId not found</error>");
+                return 1;
+            }
+            $shares = $this->getWrongShareOwnershipForUser($user);
+        } else {
+            $shares = $this->getWrongShareOwnership();
+        }
+
+        if ($shares) {
+            $output->writeln('');
+            $output->writeln('Found ' . count($shares) . ' shares with invalid share owner');
+            foreach ($shares as $share) {
+                /** @var array{shareId: int, fileTarget: string, initiator: string, receiver: string, owner: string, mountOwner: string} $share */
+                $output->writeln(" - share {$share['shareId']} from \"{$share['initiator']}\" to \"{$share['receiver']}\" at \"{$share['fileTarget']}\", owned by \"{$share['owner']}\", that should be owned by \"{$share['mountOwner']}\"");
+            }
+            $output->writeln('');
+
+            if (!$noConfirm) {
+                /** @var QuestionHelper $helper */
+                $helper = $this->getHelper('question');
+                $question = new ConfirmationQuestion('Repair these shares? [y/N]', false);
+
+                if (!$helper->ask($input, $output, $question)) {
+                    return 0;
+                }
+            }
+            $output->writeln('Repairing ' . count($shares) . ' shares');
+            $this->repairShares($shares);
+        } else {
+            $output->writeln('Found no shares with invalid share owner');
+        }
+
+        return 0;
+    }
+
+    /**
+     * @return array{shareId: int, fileTarget: string, initiator: string, receiver: string, owner: string, mountOwner: string}[]
+     * @throws \OCP\DB\Exception
+     */
+    protected function getWrongShareOwnership(): array {
+        $qb = $this->dbConnection->getQueryBuilder();
+        $brokenShares = $qb
+            ->select('s.id', 'm.user_id', 's.uid_owner', 's.uid_initiator', 's.share_with', 's.file_target')
+            ->from('share', 's')
+            ->join('s', 'filecache', 'f', $qb->expr()->eq($qb->expr()->castColumn('s.item_source', IQueryBuilder::PARAM_INT), 'f.fileid'))
+            ->join('s', 'mounts', 'm', $qb->expr()->eq('f.storage', 'm.storage_id'))
+            ->where($qb->expr()->neq('m.user_id', 's.uid_owner'))
+            ->andWhere($qb->expr()->eq($qb->func()->concat($qb->expr()->literal('/'), 'm.user_id', $qb->expr()->literal('/')), 'm.mount_point'))
+            ->executeQuery()
+            ->fetchAllAssociative();
+
+        $found = [];
+
+        foreach ($brokenShares as $share) {
+            $found[] = [
+                'shareId' => (int)$share['id'],
+                'fileTarget' => $share['file_target'],
+                'initiator' => $share['uid_initiator'],
+                'receiver' => $share['share_with'],
+                'owner' => $share['uid_owner'],
+                'mountOwner' => $share['user_id'],
+            ];
+        }
+
+        return $found;
+    }
+
+    /**
+     * @param IUser $user
+     * @return array{shareId: int, fileTarget: string, initiator: string, receiver: string, owner: string, mountOwner: string}[]
+     * @throws \OCP\DB\Exception
+     */
+    protected function getWrongShareOwnershipForUser(IUser $user): array {
+        $qb = $this->dbConnection->getQueryBuilder();
+        $brokenShares = $qb
+            ->select('s.id', 'm.user_id', 's.uid_owner', 's.uid_initiator', 's.share_with', 's.file_target')
+            ->from('share', 's')
+            ->join('s', 'filecache', 'f', $qb->expr()->eq('s.item_source', $qb->expr()->castColumn('f.fileid', IQueryBuilder::PARAM_STR)))
+            ->join('s', 'mounts', 'm', $qb->expr()->eq('f.storage', 'm.storage_id'))
+            ->where($qb->expr()->neq('m.user_id', 's.uid_owner'))
+            ->andWhere($qb->expr()->eq($qb->func()->concat($qb->expr()->literal('/'), 'm.user_id', $qb->expr()->literal('/')), 'm.mount_point'))
+            ->andWhere($qb->expr()->eq('s.share_with', $qb->createNamedParameter($user->getUID())))
+            ->executeQuery()
+            ->fetchAllAssociative();
+
+        $found = [];
+
+        foreach ($brokenShares as $share) {
+            $found[] = [
+                'shareId' => (int)$share['id'],
+                'fileTarget' => $share['file_target'],
+                'initiator' => $share['uid_initiator'],
+                'receiver' => $share['share_with'],
+                'owner' => $share['uid_owner'],
+                'mountOwner' => $share['user_id'],
+            ];
+        }
+
+        return $found;
+    }
+
+    /**
+     * @param array{shareId: int, fileTarget: string, initiator: string, receiver: string, owner: string, mountOwner: string}[] $shares
+     * @return void
+     */
+    protected function repairShares(array $shares) {
+        $this->dbConnection->beginTransaction();
+
+        $update = $this->dbConnection->getQueryBuilder();
+        $update->update('share')
+            ->set('uid_owner', $update->createParameter('share_owner'))
+            ->set('uid_initiator', $update->createParameter('share_initiator'))
+            ->where($update->expr()->eq('id', $update->createParameter('share_id')));
+
+        foreach ($shares as $share) {
+            /** @var array{shareId: int, fileTarget: string, initiator: string, receiver: string, owner: string, mountOwner: string} $share */
+            $update->setParameter('share_id', $share['shareId'], IQueryBuilder::PARAM_INT);
+            $update->setParameter('share_owner', $share['mountOwner']);
+
+            // if the broken owner is also the initiator it's safe to update them both, otherwise we don't touch the initiator
+            if ($share['initiator'] === $share['owner']) {
+                $update->setParameter('share_initiator', $share['mountOwner']);
+            } else {
+                $update->setParameter('share_initiator', $share['initiator']);
+            }
+            $update->executeStatement();
+        }
+
+        $this->dbConnection->commit();
+    }
 }

core/Command/Db/ConvertType.php

Indentation +428 added lines, -428 removed lines

@@ -35,432 +35,432 @@
 use function preg_quote;
 
 class ConvertType extends Command implements CompletionAwareInterface {
-	protected array $columnTypes = [];
-
-	public function __construct(
-		protected IConfig $config,
-		protected ConnectionFactory $connectionFactory,
-		protected IAppManager $appManager,
-	) {
-		parent::__construct();
-	}
-
-	protected function configure() {
-		$this
-			->setName('db:convert-type')
-			->setDescription('Convert the Nextcloud database to the newly configured one')
-			->addArgument(
-				'type',
-				InputArgument::REQUIRED,
-				'the type of the database to convert to'
-			)
-			->addArgument(
-				'username',
-				InputArgument::REQUIRED,
-				'the username of the database to convert to'
-			)
-			->addArgument(
-				'hostname',
-				InputArgument::REQUIRED,
-				'the hostname of the database to convert to'
-			)
-			->addArgument(
-				'database',
-				InputArgument::REQUIRED,
-				'the name of the database to convert to'
-			)
-			->addOption(
-				'port',
-				null,
-				InputOption::VALUE_REQUIRED,
-				'the port of the database to convert to'
-			)
-			->addOption(
-				'password',
-				null,
-				InputOption::VALUE_REQUIRED,
-				'the password of the database to convert to. Will be asked when not specified. Can also be passed via stdin.'
-			)
-			->addOption(
-				'clear-schema',
-				null,
-				InputOption::VALUE_NONE,
-				'remove all tables from the destination database'
-			)
-			->addOption(
-				'all-apps',
-				null,
-				InputOption::VALUE_NONE,
-				'whether to create schema for all apps instead of only installed apps'
-			)
-			->addOption(
-				'chunk-size',
-				null,
-				InputOption::VALUE_REQUIRED,
-				'the maximum number of database rows to handle in a single query, bigger tables will be handled in chunks of this size. Lower this if the process runs out of memory during conversion.',
-				'1000'
-			)
-		;
-	}
-
-	protected function validateInput(InputInterface $input, OutputInterface $output) {
-		$type = $this->connectionFactory->normalizeType($input->getArgument('type'));
-		if ($type === 'sqlite3') {
-			throw new \InvalidArgumentException(
-				'Converting to SQLite (sqlite3) is currently not supported.'
-			);
-		}
-		if ($type === $this->config->getSystemValue('dbtype', '')) {
-			throw new \InvalidArgumentException(sprintf(
-				'Can not convert from %1$s to %1$s.',
-				$type
-			));
-		}
-		if ($type === 'oci' && $input->getOption('clear-schema')) {
-			// Doctrine unconditionally tries (at least in version 2.3)
-			// to drop sequence triggers when dropping a table, even though
-			// such triggers may not exist. This results in errors like
-			// "ORA-04080: trigger 'OC_STORAGES_AI_PK' does not exist".
-			throw new \InvalidArgumentException(
-				'The --clear-schema option is not supported when converting to Oracle (oci).'
-			);
-		}
-	}
-
-	protected function readPassword(InputInterface $input, OutputInterface $output) {
-		// Explicitly specified password
-		if ($input->getOption('password')) {
-			return;
-		}
-
-		// Read from stdin. stream_set_blocking is used to prevent blocking
-		// when nothing is passed via stdin.
-		stream_set_blocking(STDIN, 0);
-		$password = file_get_contents('php://stdin');
-		stream_set_blocking(STDIN, 1);
-		if (trim($password) !== '') {
-			$input->setOption('password', $password);
-			return;
-		}
-
-		// Read password by interacting
-		if ($input->isInteractive()) {
-			/** @var QuestionHelper $helper */
-			$helper = $this->getHelper('question');
-			$question = new Question('What is the database password (press <enter> for none)? ');
-			$question->setHidden(true);
-			$question->setHiddenFallback(false);
-			$password = $helper->ask($input, $output, $question);
-			if ($password === null) {
-				$password = ''; // possibly unnecessary
-			}
-			$input->setOption('password', $password);
-			return;
-		}
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$this->validateInput($input, $output);
-		$this->readPassword($input, $output);
-
-		/** @var Connection $fromDB */
-		$fromDB = Server::get(Connection::class);
-		$toDB = $this->getToDBConnection($input, $output);
-
-		if ($input->getOption('clear-schema')) {
-			$this->clearSchema($toDB, $input, $output);
-		}
-
-		$this->createSchema($fromDB, $toDB, $input, $output);
-
-		$toTables = $this->getTables($toDB);
-		$fromTables = $this->getTables($fromDB);
-
-		// warn/fail if there are more tables in 'from' database
-		$extraFromTables = array_diff($fromTables, $toTables);
-		if (!empty($extraFromTables)) {
-			$output->writeln('<comment>The following tables will not be converted:</comment>');
-			$output->writeln($extraFromTables);
-			if (!$input->getOption('all-apps')) {
-				$output->writeln('<comment>Please note that tables belonging to disabled (but not removed) apps</comment>');
-				$output->writeln('<comment>can be included by specifying the --all-apps option.</comment>');
-			}
-
-			$continueConversion = !$input->isInteractive(); // assume yes for --no-interaction and no otherwise.
-			$question = new ConfirmationQuestion('Continue with the conversion (y/n)? [n] ', $continueConversion);
-
-			/** @var QuestionHelper $helper */
-			$helper = $this->getHelper('question');
-
-			if (!$helper->ask($input, $output, $question)) {
-				return 1;
-			}
-		}
-		$intersectingTables = array_intersect($toTables, $fromTables);
-		$this->convertDB($fromDB, $toDB, $intersectingTables, $input, $output);
-		return 0;
-	}
-
-	protected function createSchema(Connection $fromDB, Connection $toDB, InputInterface $input, OutputInterface $output) {
-		$output->writeln('<info>Creating schema in new database</info>');
-
-		$fromMS = new MigrationService('core', $fromDB);
-		$currentMigration = $fromMS->getMigration('current');
-		if ($currentMigration !== '0') {
-			$toMS = new MigrationService('core', $toDB);
-			$toMS->migrate($currentMigration);
-		}
-
-		$apps = $input->getOption('all-apps')
-			? $this->appManager->getAllAppsInAppsFolders()
-			: $this->appManager->getEnabledApps();
-		foreach ($apps as $app) {
-			$output->writeln('<info> - ' . $app . '</info>');
-			// Make sure autoloading works...
-			$this->appManager->loadApp($app);
-			$fromMS = new MigrationService($app, $fromDB);
-			$currentMigration = $fromMS->getMigration('current');
-			if ($currentMigration !== '0') {
-				$toMS = new MigrationService($app, $toDB);
-				$toMS->migrate($currentMigration, true);
-			}
-		}
-	}
-
-	protected function getToDBConnection(InputInterface $input, OutputInterface $output) {
-		$type = $input->getArgument('type');
-		$connectionParams = $this->connectionFactory->createConnectionParams(type: $type);
-		$connectionParams = array_merge($connectionParams, [
-			'host' => $input->getArgument('hostname'),
-			'user' => $input->getArgument('username'),
-			'password' => $input->getOption('password'),
-			'dbname' => $input->getArgument('database'),
-		]);
-
-		// parse port
-		if ($input->getOption('port')) {
-			$connectionParams['port'] = $input->getOption('port');
-		}
-
-		// parse hostname for unix socket
-		if (preg_match('/^(.+)(:(\d+|[^:]+))?$/', $input->getArgument('hostname'), $matches)) {
-			$connectionParams['host'] = $matches[1];
-			if (isset($matches[3])) {
-				if (is_numeric($matches[3])) {
-					$connectionParams['port'] = $matches[3];
-				} else {
-					$connectionParams['unix_socket'] = $matches[3];
-				}
-			}
-		}
-
-		return $this->connectionFactory->getConnection($type, $connectionParams);
-	}
-
-	protected function clearSchema(Connection $db, InputInterface $input, OutputInterface $output) {
-		$toTables = $this->getTables($db);
-		if (!empty($toTables)) {
-			$output->writeln('<info>Clearing schema in new database</info>');
-		}
-		foreach ($toTables as $table) {
-			$db->createSchemaManager()->dropTable($table);
-		}
-	}
-
-	protected function getTables(Connection $db) {
-		$db->getConfiguration()->setSchemaAssetsFilter(function ($asset) {
-			/** @var string|AbstractAsset $asset */
-			$filterExpression = '/^' . preg_quote($this->config->getSystemValue('dbtableprefix', 'oc_')) . '/';
-			if ($asset instanceof AbstractAsset) {
-				return preg_match($filterExpression, $asset->getName()) !== false;
-			}
-			return preg_match($filterExpression, $asset) !== false;
-		});
-		return $db->createSchemaManager()->listTableNames();
-	}
-
-	/**
-	 * @param Connection $fromDB
-	 * @param Connection $toDB
-	 * @param Table $table
-	 * @param InputInterface $input
-	 * @param OutputInterface $output
-	 */
-	protected function copyTable(Connection $fromDB, Connection $toDB, Table $table, InputInterface $input, OutputInterface $output) {
-		if ($table->getName() === $toDB->getPrefix() . 'migrations') {
-			$output->writeln('<comment>Skipping migrations table because it was already filled by running the migrations</comment>');
-			return;
-		}
-
-		$chunkSize = (int)$input->getOption('chunk-size');
-
-		$query = $fromDB->getQueryBuilder();
-		$query->automaticTablePrefix(false);
-		$query->select($query->func()->count('*', 'num_entries'))
-			->from($table->getName());
-		$result = $query->executeQuery();
-		$count = $result->fetchOne();
-		$result->closeCursor();
-
-		$numChunks = ceil($count / $chunkSize);
-		if ($numChunks > 1) {
-			$output->writeln('chunked query, ' . $numChunks . ' chunks');
-		}
-
-		$progress = new ProgressBar($output, $count);
-		$progress->setFormat('very_verbose');
-		$progress->start();
-		$redraw = $count > $chunkSize ? 100 : ($count > 100 ? 5 : 1);
-		$progress->setRedrawFrequency($redraw);
-
-		$query = $fromDB->getQueryBuilder();
-		$query->automaticTablePrefix(false);
-		$query->select('*')
-			->from($table->getName())
-			->setMaxResults($chunkSize);
-
-		try {
-			$orderColumns = $table->getPrimaryKeyColumns();
-		} catch (Exception $e) {
-			$orderColumns = $table->getColumns();
-		}
-
-		foreach ($orderColumns as $column) {
-			$query->addOrderBy($column->getName());
-		}
-
-		$insertQuery = $toDB->getQueryBuilder();
-		$insertQuery->automaticTablePrefix(false);
-		$insertQuery->insert($table->getName());
-		$parametersCreated = false;
-
-		for ($chunk = 0; $chunk < $numChunks; $chunk++) {
-			$query->setFirstResult($chunk * $chunkSize);
-
-			$result = $query->executeQuery();
-
-			try {
-				$toDB->beginTransaction();
-
-				foreach ($result->iterateAssociative() as $row) {
-					$progress->advance();
-					if (!$parametersCreated) {
-						foreach ($row as $key => $value) {
-							$insertQuery->setValue($key, $insertQuery->createParameter($key));
-						}
-						$parametersCreated = true;
-					}
-
-					foreach ($row as $key => $value) {
-						$type = $this->getColumnType($table, $key);
-						if ($type !== false) {
-							$insertQuery->setParameter($key, $value, $type);
-						} else {
-							$insertQuery->setParameter($key, $value);
-						}
-					}
-					$insertQuery->executeStatement();
-				}
-				$result->closeCursor();
-
-				$toDB->commit();
-			} catch (\Throwable $e) {
-				$toDB->rollBack();
-				throw $e;
-			}
-		}
-
-		$progress->finish();
-		$output->writeln('');
-	}
-
-	protected function getColumnType(Table $table, $columnName) {
-		$tableName = $table->getName();
-		if (isset($this->columnTypes[$tableName][$columnName])) {
-			return $this->columnTypes[$tableName][$columnName];
-		}
-
-		$type = Type::lookupName($table->getColumn($columnName)->getType());
-
-		switch ($type) {
-			case Types::BLOB:
-			case Types::TEXT:
-				$this->columnTypes[$tableName][$columnName] = IQueryBuilder::PARAM_LOB;
-				break;
-			case Types::BOOLEAN:
-				$this->columnTypes[$tableName][$columnName] = IQueryBuilder::PARAM_BOOL;
-				break;
-			default:
-				$this->columnTypes[$tableName][$columnName] = false;
-		}
-
-		return $this->columnTypes[$tableName][$columnName];
-	}
-
-	protected function convertDB(Connection $fromDB, Connection $toDB, array $tables, InputInterface $input, OutputInterface $output) {
-		$this->config->setSystemValue('maintenance', true);
-		$schema = $fromDB->createSchema();
-
-		try {
-			// copy table rows
-			foreach ($tables as $table) {
-				$output->writeln('<info> - ' . $table . '</info>');
-				$this->copyTable($fromDB, $toDB, $schema->getTable($table), $input, $output);
-			}
-			if ($input->getArgument('type') === 'pgsql') {
-				$tools = new PgSqlTools($this->config);
-				$tools->resynchronizeDatabaseSequences($toDB);
-			}
-			// save new database config
-			$this->saveDBInfo($input);
-		} catch (\Exception $e) {
-			$this->config->setSystemValue('maintenance', false);
-			throw $e;
-		}
-		$this->config->setSystemValue('maintenance', false);
-	}
-
-	protected function saveDBInfo(InputInterface $input) {
-		$type = $input->getArgument('type');
-		$username = $input->getArgument('username');
-		$dbHost = $input->getArgument('hostname');
-		$dbName = $input->getArgument('database');
-		$password = $input->getOption('password');
-		if ($input->getOption('port')) {
-			$dbHost .= ':' . $input->getOption('port');
-		}
-
-		$this->config->setSystemValues([
-			'dbtype' => $type,
-			'dbname' => $dbName,
-			'dbhost' => $dbHost,
-			'dbuser' => $username,
-			'dbpassword' => $password,
-		]);
-	}
-
-	/**
-	 * Return possible values for the named option
-	 *
-	 * @param string $optionName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeOptionValues($optionName, CompletionContext $context) {
-		return [];
-	}
-
-	/**
-	 * Return possible values for the named argument
-	 *
-	 * @param string $argumentName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeArgumentValues($argumentName, CompletionContext $context) {
-		if ($argumentName === 'type') {
-			return ['mysql', 'oci', 'pgsql'];
-		}
-		return [];
-	}
+    protected array $columnTypes = [];
+
+    public function __construct(
+        protected IConfig $config,
+        protected ConnectionFactory $connectionFactory,
+        protected IAppManager $appManager,
+    ) {
+        parent::__construct();
+    }
+
+    protected function configure() {
+        $this
+            ->setName('db:convert-type')
+            ->setDescription('Convert the Nextcloud database to the newly configured one')
+            ->addArgument(
+                'type',
+                InputArgument::REQUIRED,
+                'the type of the database to convert to'
+            )
+            ->addArgument(
+                'username',
+                InputArgument::REQUIRED,
+                'the username of the database to convert to'
+            )
+            ->addArgument(
+                'hostname',
+                InputArgument::REQUIRED,
+                'the hostname of the database to convert to'
+            )
+            ->addArgument(
+                'database',
+                InputArgument::REQUIRED,
+                'the name of the database to convert to'
+            )
+            ->addOption(
+                'port',
+                null,
+                InputOption::VALUE_REQUIRED,
+                'the port of the database to convert to'
+            )
+            ->addOption(
+                'password',
+                null,
+                InputOption::VALUE_REQUIRED,
+                'the password of the database to convert to. Will be asked when not specified. Can also be passed via stdin.'
+            )
+            ->addOption(
+                'clear-schema',
+                null,
+                InputOption::VALUE_NONE,
+                'remove all tables from the destination database'
+            )
+            ->addOption(
+                'all-apps',
+                null,
+                InputOption::VALUE_NONE,
+                'whether to create schema for all apps instead of only installed apps'
+            )
+            ->addOption(
+                'chunk-size',
+                null,
+                InputOption::VALUE_REQUIRED,
+                'the maximum number of database rows to handle in a single query, bigger tables will be handled in chunks of this size. Lower this if the process runs out of memory during conversion.',
+                '1000'
+            )
+        ;
+    }
+
+    protected function validateInput(InputInterface $input, OutputInterface $output) {
+        $type = $this->connectionFactory->normalizeType($input->getArgument('type'));
+        if ($type === 'sqlite3') {
+            throw new \InvalidArgumentException(
+                'Converting to SQLite (sqlite3) is currently not supported.'
+            );
+        }
+        if ($type === $this->config->getSystemValue('dbtype', '')) {
+            throw new \InvalidArgumentException(sprintf(
+                'Can not convert from %1$s to %1$s.',
+                $type
+            ));
+        }
+        if ($type === 'oci' && $input->getOption('clear-schema')) {
+            // Doctrine unconditionally tries (at least in version 2.3)
+            // to drop sequence triggers when dropping a table, even though
+            // such triggers may not exist. This results in errors like
+            // "ORA-04080: trigger 'OC_STORAGES_AI_PK' does not exist".
+            throw new \InvalidArgumentException(
+                'The --clear-schema option is not supported when converting to Oracle (oci).'
+            );
+        }
+    }
+
+    protected function readPassword(InputInterface $input, OutputInterface $output) {
+        // Explicitly specified password
+        if ($input->getOption('password')) {
+            return;
+        }
+
+        // Read from stdin. stream_set_blocking is used to prevent blocking
+        // when nothing is passed via stdin.
+        stream_set_blocking(STDIN, 0);
+        $password = file_get_contents('php://stdin');
+        stream_set_blocking(STDIN, 1);
+        if (trim($password) !== '') {
+            $input->setOption('password', $password);
+            return;
+        }
+
+        // Read password by interacting
+        if ($input->isInteractive()) {
+            /** @var QuestionHelper $helper */
+            $helper = $this->getHelper('question');
+            $question = new Question('What is the database password (press <enter> for none)? ');
+            $question->setHidden(true);
+            $question->setHiddenFallback(false);
+            $password = $helper->ask($input, $output, $question);
+            if ($password === null) {
+                $password = ''; // possibly unnecessary
+            }
+            $input->setOption('password', $password);
+            return;
+        }
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $this->validateInput($input, $output);
+        $this->readPassword($input, $output);
+
+        /** @var Connection $fromDB */
+        $fromDB = Server::get(Connection::class);
+        $toDB = $this->getToDBConnection($input, $output);
+
+        if ($input->getOption('clear-schema')) {
+            $this->clearSchema($toDB, $input, $output);
+        }
+
+        $this->createSchema($fromDB, $toDB, $input, $output);
+
+        $toTables = $this->getTables($toDB);
+        $fromTables = $this->getTables($fromDB);
+
+        // warn/fail if there are more tables in 'from' database
+        $extraFromTables = array_diff($fromTables, $toTables);
+        if (!empty($extraFromTables)) {
+            $output->writeln('<comment>The following tables will not be converted:</comment>');
+            $output->writeln($extraFromTables);
+            if (!$input->getOption('all-apps')) {
+                $output->writeln('<comment>Please note that tables belonging to disabled (but not removed) apps</comment>');
+                $output->writeln('<comment>can be included by specifying the --all-apps option.</comment>');
+            }
+
+            $continueConversion = !$input->isInteractive(); // assume yes for --no-interaction and no otherwise.
+            $question = new ConfirmationQuestion('Continue with the conversion (y/n)? [n] ', $continueConversion);
+
+            /** @var QuestionHelper $helper */
+            $helper = $this->getHelper('question');
+
+            if (!$helper->ask($input, $output, $question)) {
+                return 1;
+            }
+        }
+        $intersectingTables = array_intersect($toTables, $fromTables);
+        $this->convertDB($fromDB, $toDB, $intersectingTables, $input, $output);
+        return 0;
+    }
+
+    protected function createSchema(Connection $fromDB, Connection $toDB, InputInterface $input, OutputInterface $output) {
+        $output->writeln('<info>Creating schema in new database</info>');
+
+        $fromMS = new MigrationService('core', $fromDB);
+        $currentMigration = $fromMS->getMigration('current');
+        if ($currentMigration !== '0') {
+            $toMS = new MigrationService('core', $toDB);
+            $toMS->migrate($currentMigration);
+        }
+
+        $apps = $input->getOption('all-apps')
+            ? $this->appManager->getAllAppsInAppsFolders()
+            : $this->appManager->getEnabledApps();
+        foreach ($apps as $app) {
+            $output->writeln('<info> - ' . $app . '</info>');
+            // Make sure autoloading works...
+            $this->appManager->loadApp($app);
+            $fromMS = new MigrationService($app, $fromDB);
+            $currentMigration = $fromMS->getMigration('current');
+            if ($currentMigration !== '0') {
+                $toMS = new MigrationService($app, $toDB);
+                $toMS->migrate($currentMigration, true);
+            }
+        }
+    }
+
+    protected function getToDBConnection(InputInterface $input, OutputInterface $output) {
+        $type = $input->getArgument('type');
+        $connectionParams = $this->connectionFactory->createConnectionParams(type: $type);
+        $connectionParams = array_merge($connectionParams, [
+            'host' => $input->getArgument('hostname'),
+            'user' => $input->getArgument('username'),
+            'password' => $input->getOption('password'),
+            'dbname' => $input->getArgument('database'),
+        ]);
+
+        // parse port
+        if ($input->getOption('port')) {
+            $connectionParams['port'] = $input->getOption('port');
+        }
+
+        // parse hostname for unix socket
+        if (preg_match('/^(.+)(:(\d+|[^:]+))?$/', $input->getArgument('hostname'), $matches)) {
+            $connectionParams['host'] = $matches[1];
+            if (isset($matches[3])) {
+                if (is_numeric($matches[3])) {
+                    $connectionParams['port'] = $matches[3];
+                } else {
+                    $connectionParams['unix_socket'] = $matches[3];
+                }
+            }
+        }
+
+        return $this->connectionFactory->getConnection($type, $connectionParams);
+    }
+
+    protected function clearSchema(Connection $db, InputInterface $input, OutputInterface $output) {
+        $toTables = $this->getTables($db);
+        if (!empty($toTables)) {
+            $output->writeln('<info>Clearing schema in new database</info>');
+        }
+        foreach ($toTables as $table) {
+            $db->createSchemaManager()->dropTable($table);
+        }
+    }
+
+    protected function getTables(Connection $db) {
+        $db->getConfiguration()->setSchemaAssetsFilter(function ($asset) {
+            /** @var string|AbstractAsset $asset */
+            $filterExpression = '/^' . preg_quote($this->config->getSystemValue('dbtableprefix', 'oc_')) . '/';
+            if ($asset instanceof AbstractAsset) {
+                return preg_match($filterExpression, $asset->getName()) !== false;
+            }
+            return preg_match($filterExpression, $asset) !== false;
+        });
+        return $db->createSchemaManager()->listTableNames();
+    }
+
+    /**
+     * @param Connection $fromDB
+     * @param Connection $toDB
+     * @param Table $table
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     */
+    protected function copyTable(Connection $fromDB, Connection $toDB, Table $table, InputInterface $input, OutputInterface $output) {
+        if ($table->getName() === $toDB->getPrefix() . 'migrations') {
+            $output->writeln('<comment>Skipping migrations table because it was already filled by running the migrations</comment>');
+            return;
+        }
+
+        $chunkSize = (int)$input->getOption('chunk-size');
+
+        $query = $fromDB->getQueryBuilder();
+        $query->automaticTablePrefix(false);
+        $query->select($query->func()->count('*', 'num_entries'))
+            ->from($table->getName());
+        $result = $query->executeQuery();
+        $count = $result->fetchOne();
+        $result->closeCursor();
+
+        $numChunks = ceil($count / $chunkSize);
+        if ($numChunks > 1) {
+            $output->writeln('chunked query, ' . $numChunks . ' chunks');
+        }
+
+        $progress = new ProgressBar($output, $count);
+        $progress->setFormat('very_verbose');
+        $progress->start();
+        $redraw = $count > $chunkSize ? 100 : ($count > 100 ? 5 : 1);
+        $progress->setRedrawFrequency($redraw);
+
+        $query = $fromDB->getQueryBuilder();
+        $query->automaticTablePrefix(false);
+        $query->select('*')
+            ->from($table->getName())
+            ->setMaxResults($chunkSize);
+
+        try {
+            $orderColumns = $table->getPrimaryKeyColumns();
+        } catch (Exception $e) {
+            $orderColumns = $table->getColumns();
+        }
+
+        foreach ($orderColumns as $column) {
+            $query->addOrderBy($column->getName());
+        }
+
+        $insertQuery = $toDB->getQueryBuilder();
+        $insertQuery->automaticTablePrefix(false);
+        $insertQuery->insert($table->getName());
+        $parametersCreated = false;
+
+        for ($chunk = 0; $chunk < $numChunks; $chunk++) {
+            $query->setFirstResult($chunk * $chunkSize);
+
+            $result = $query->executeQuery();
+
+            try {
+                $toDB->beginTransaction();
+
+                foreach ($result->iterateAssociative() as $row) {
+                    $progress->advance();
+                    if (!$parametersCreated) {
+                        foreach ($row as $key => $value) {
+                            $insertQuery->setValue($key, $insertQuery->createParameter($key));
+                        }
+                        $parametersCreated = true;
+                    }
+
+                    foreach ($row as $key => $value) {
+                        $type = $this->getColumnType($table, $key);
+                        if ($type !== false) {
+                            $insertQuery->setParameter($key, $value, $type);
+                        } else {
+                            $insertQuery->setParameter($key, $value);
+                        }
+                    }
+                    $insertQuery->executeStatement();
+                }
+                $result->closeCursor();
+
+                $toDB->commit();
+            } catch (\Throwable $e) {
+                $toDB->rollBack();
+                throw $e;
+            }
+        }
+
+        $progress->finish();
+        $output->writeln('');
+    }
+
+    protected function getColumnType(Table $table, $columnName) {
+        $tableName = $table->getName();
+        if (isset($this->columnTypes[$tableName][$columnName])) {
+            return $this->columnTypes[$tableName][$columnName];
+        }
+
+        $type = Type::lookupName($table->getColumn($columnName)->getType());
+
+        switch ($type) {
+            case Types::BLOB:
+            case Types::TEXT:
+                $this->columnTypes[$tableName][$columnName] = IQueryBuilder::PARAM_LOB;
+                break;
+            case Types::BOOLEAN:
+                $this->columnTypes[$tableName][$columnName] = IQueryBuilder::PARAM_BOOL;
+                break;
+            default:
+                $this->columnTypes[$tableName][$columnName] = false;
+        }
+
+        return $this->columnTypes[$tableName][$columnName];
+    }
+
+    protected function convertDB(Connection $fromDB, Connection $toDB, array $tables, InputInterface $input, OutputInterface $output) {
+        $this->config->setSystemValue('maintenance', true);
+        $schema = $fromDB->createSchema();
+
+        try {
+            // copy table rows
+            foreach ($tables as $table) {
+                $output->writeln('<info> - ' . $table . '</info>');
+                $this->copyTable($fromDB, $toDB, $schema->getTable($table), $input, $output);
+            }
+            if ($input->getArgument('type') === 'pgsql') {
+                $tools = new PgSqlTools($this->config);
+                $tools->resynchronizeDatabaseSequences($toDB);
+            }
+            // save new database config
+            $this->saveDBInfo($input);
+        } catch (\Exception $e) {
+            $this->config->setSystemValue('maintenance', false);
+            throw $e;
+        }
+        $this->config->setSystemValue('maintenance', false);
+    }
+
+    protected function saveDBInfo(InputInterface $input) {
+        $type = $input->getArgument('type');
+        $username = $input->getArgument('username');
+        $dbHost = $input->getArgument('hostname');
+        $dbName = $input->getArgument('database');
+        $password = $input->getOption('password');
+        if ($input->getOption('port')) {
+            $dbHost .= ':' . $input->getOption('port');
+        }
+
+        $this->config->setSystemValues([
+            'dbtype' => $type,
+            'dbname' => $dbName,
+            'dbhost' => $dbHost,
+            'dbuser' => $username,
+            'dbpassword' => $password,
+        ]);
+    }
+
+    /**
+     * Return possible values for the named option
+     *
+     * @param string $optionName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeOptionValues($optionName, CompletionContext $context) {
+        return [];
+    }
+
+    /**
+     * Return possible values for the named argument
+     *
+     * @param string $argumentName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeArgumentValues($argumentName, CompletionContext $context) {
+        if ($argumentName === 'type') {
+            return ['mysql', 'oci', 'pgsql'];
+        }
+        return [];
+    }
 }

core/BackgroundJobs/MovePreviewJob.php

Indentation +212 added lines, -212 removed lines

@@ -31,216 +31,216 @@
 use Psr\Log\LoggerInterface;
 
 class MovePreviewJob extends TimedJob {
-	private IAppData $appData;
-	private string $previewRootPath;
-
-	public function __construct(
-		ITimeFactory $time,
-		private readonly IAppConfig $appConfig,
-		private readonly IConfig $config,
-		private readonly PreviewMapper $previewMapper,
-		private readonly StorageFactory $storageFactory,
-		private readonly IDBConnection $connection,
-		private readonly IRootFolder $rootFolder,
-		private readonly IMimeTypeDetector $mimeTypeDetector,
-		private readonly IMimeTypeLoader $mimeTypeLoader,
-		private readonly LoggerInterface $logger,
-		private readonly IGenerator $generator,
-		IAppDataFactory $appDataFactory,
-	) {
-		parent::__construct($time);
-
-		$this->appData = $appDataFactory->get('preview');
-		$this->setTimeSensitivity(self::TIME_INSENSITIVE);
-		$this->setInterval(24 * 60 * 60);
-		$this->previewRootPath = 'appdata_' . $this->config->getSystemValueString('instanceid') . '/preview/';
-	}
-
-	#[Override]
-	protected function run(mixed $argument): void {
-		if ($this->appConfig->getValueBool('core', 'previewMovedDone')) {
-			return;
-		}
-
-		$startTime = time();
-		while (true) {
-			$qb = $this->connection->getQueryBuilder();
-			$qb->select('path')
-				->from('filecache')
-				// Hierarchical preview folder structure
-				->where($qb->expr()->like('path', $qb->createNamedParameter($this->previewRootPath . '%/%/%/%/%/%/%/%/%')))
-				// Legacy flat preview folder structure
-				->orWhere($qb->expr()->like('path', $qb->createNamedParameter($this->previewRootPath . '%/%.%')))
-				->hintShardKey('storage', $this->rootFolder->getMountPoint()->getNumericStorageId())
-				->setMaxResults(100);
-
-			$result = $qb->executeQuery();
-			$foundPreviews = $this->processQueryResult($result);
-
-			if (!$foundPreviews) {
-				break;
-			}
-
-			// Stop if execution time is more than one hour.
-			if (time() - $startTime > 3600) {
-				return;
-			}
-		}
-
-		$this->appConfig->setValueBool('core', 'previewMovedDone', true);
-	}
-
-	private function processQueryResult(IResult $result): bool {
-		$foundPreview = false;
-		$fileIds = [];
-		$flatFileIds = [];
-		while ($row = $result->fetchAssociative()) {
-			$pathSplit = explode('/', $row['path']);
-			assert(count($pathSplit) >= 2);
-			$fileId = (int)$pathSplit[count($pathSplit) - 2];
-			if (count($pathSplit) === 11) {
-				// Hierarchical structure
-				if (!in_array($fileId, $fileIds)) {
-					$fileIds[] = $fileId;
-				}
-			} else {
-				// Flat structure
-				if (!in_array($fileId, $flatFileIds)) {
-					$flatFileIds[] = $fileId;
-				}
-			}
-			$foundPreview = true;
-		}
-
-		foreach ($fileIds as $fileId) {
-			$this->processPreviews($fileId, flatPath: false);
-		}
-
-		foreach ($flatFileIds as $fileId) {
-			$this->processPreviews($fileId, flatPath: true);
-		}
-		return $foundPreview;
-	}
-
-	/**
-	 * @param array<string|int, string[]> $previewFolders
-	 */
-	private function processPreviews(int $fileId, bool $flatPath): void {
-		$internalPath = $this->getInternalFolder((string)$fileId, $flatPath);
-		$folder = $this->appData->getFolder($internalPath);
-
-		/**
-		 * @var list<array{file: SimpleFile, preview: Preview}> $previewFiles
-		 */
-		$previewFiles = [];
-
-		foreach ($folder->getDirectoryListing() as $previewFile) {
-			$path = $fileId . '/' . $previewFile->getName();
-			/** @var SimpleFile $previewFile */
-			$preview = Preview::fromPath($path, $this->mimeTypeDetector);
-			$preview->setId($this->generator->nextId());
-			if (!$preview) {
-				$this->logger->error('Unable to import old preview at path.');
-				continue;
-			}
-			$preview->setSize($previewFile->getSize());
-			$preview->setMtime($previewFile->getMtime());
-			$preview->setOldFileId($previewFile->getId());
-			$preview->setEncrypted(false);
-
-			$previewFiles[] = [
-				'file' => $previewFile,
-				'preview' => $preview,
-			];
-		}
-
-		$qb = $this->connection->getQueryBuilder();
-		$qb->select('storage', 'etag', 'mimetype')
-			->from('filecache')
-			->where($qb->expr()->eq('fileid', $qb->createNamedParameter($fileId)))
-			->setMaxResults(1);
-
-		$result = $qb->executeQuery();
-		$result = $result->fetchAllAssociative();
-
-		if (count($result) > 0) {
-			foreach ($previewFiles as $previewFile) {
-				/** @var Preview $preview */
-				$preview = $previewFile['preview'];
-				/** @var SimpleFile $file */
-				$file = $previewFile['file'];
-				$preview->setStorageId($result[0]['storage']);
-				$preview->setEtag($result[0]['etag']);
-				$preview->setSourceMimeType($this->mimeTypeLoader->getMimetypeById((int)$result[0]['mimetype']));
-				try {
-					$preview = $this->previewMapper->insert($preview);
-				} catch (Exception) {
-					// We already have this preview in the preview table, skip
-					$qb->delete('filecache')
-						->where($qb->expr()->eq('fileid', $qb->createNamedParameter($file->getId())))
-						->hintShardKey('storage', $this->rootFolder->getMountPoint()->getNumericStorageId())
-						->executeStatement();
-					continue;
-				}
-
-				try {
-					$this->storageFactory->migratePreview($preview, $file);
-					$qb = $this->connection->getQueryBuilder();
-					$qb->delete('filecache')
-						->where($qb->expr()->eq('fileid', $qb->createNamedParameter($file->getId())))
-						->hintShardKey('storage', $this->rootFolder->getMountPoint()->getNumericStorageId())
-						->executeStatement();
-					// Do not call $file->delete() as this will also delete the file from the file system
-				} catch (\Exception $e) {
-					$this->previewMapper->delete($preview);
-					throw $e;
-				}
-			}
-		} else {
-			// No matching fileId, delete preview
-			try {
-				$this->connection->beginTransaction();
-				foreach ($previewFiles as $previewFile) {
-					/** @var SimpleFile $file */
-					$file = $previewFile['file'];
-					$file->delete();
-				}
-				$this->connection->commit();
-			} catch (Exception) {
-				$this->connection->rollback();
-			}
-		}
-
-		$this->deleteFolder($internalPath);
-	}
-
-	public static function getInternalFolder(string $name, bool $flatPath): string {
-		if ($flatPath) {
-			return $name;
-		}
-		return implode('/', str_split(substr(md5($name), 0, 7))) . '/' . $name;
-	}
-
-	private function deleteFolder(string $path): void {
-		$current = $path;
-
-		while (true) {
-			$appDataPath = $this->previewRootPath . $current;
-			$qb = $this->connection->getQueryBuilder();
-			$qb->delete('filecache')
-				->where($qb->expr()->eq('path_hash', $qb->createNamedParameter(md5($appDataPath))))
-				->hintShardKey('storage', $this->rootFolder->getMountPoint()->getNumericStorageId())
-				->executeStatement();
-
-			$current = dirname($current);
-			if ($current === '/' || $current === '.' || $current === '') {
-				break;
-			}
-
-			$folder = $this->appData->getFolder($current);
-			if (count($folder->getDirectoryListing()) !== 0) {
-				break;
-			}
-		}
-	}
+    private IAppData $appData;
+    private string $previewRootPath;
+
+    public function __construct(
+        ITimeFactory $time,
+        private readonly IAppConfig $appConfig,
+        private readonly IConfig $config,
+        private readonly PreviewMapper $previewMapper,
+        private readonly StorageFactory $storageFactory,
+        private readonly IDBConnection $connection,
+        private readonly IRootFolder $rootFolder,
+        private readonly IMimeTypeDetector $mimeTypeDetector,
+        private readonly IMimeTypeLoader $mimeTypeLoader,
+        private readonly LoggerInterface $logger,
+        private readonly IGenerator $generator,
+        IAppDataFactory $appDataFactory,
+    ) {
+        parent::__construct($time);
+
+        $this->appData = $appDataFactory->get('preview');
+        $this->setTimeSensitivity(self::TIME_INSENSITIVE);
+        $this->setInterval(24 * 60 * 60);
+        $this->previewRootPath = 'appdata_' . $this->config->getSystemValueString('instanceid') . '/preview/';
+    }
+
+    #[Override]
+    protected function run(mixed $argument): void {
+        if ($this->appConfig->getValueBool('core', 'previewMovedDone')) {
+            return;
+        }
+
+        $startTime = time();
+        while (true) {
+            $qb = $this->connection->getQueryBuilder();
+            $qb->select('path')
+                ->from('filecache')
+                // Hierarchical preview folder structure
+                ->where($qb->expr()->like('path', $qb->createNamedParameter($this->previewRootPath . '%/%/%/%/%/%/%/%/%')))
+                // Legacy flat preview folder structure
+                ->orWhere($qb->expr()->like('path', $qb->createNamedParameter($this->previewRootPath . '%/%.%')))
+                ->hintShardKey('storage', $this->rootFolder->getMountPoint()->getNumericStorageId())
+                ->setMaxResults(100);
+
+            $result = $qb->executeQuery();
+            $foundPreviews = $this->processQueryResult($result);
+
+            if (!$foundPreviews) {
+                break;
+            }
+
+            // Stop if execution time is more than one hour.
+            if (time() - $startTime > 3600) {
+                return;
+            }
+        }
+
+        $this->appConfig->setValueBool('core', 'previewMovedDone', true);
+    }
+
+    private function processQueryResult(IResult $result): bool {
+        $foundPreview = false;
+        $fileIds = [];
+        $flatFileIds = [];
+        while ($row = $result->fetchAssociative()) {
+            $pathSplit = explode('/', $row['path']);
+            assert(count($pathSplit) >= 2);
+            $fileId = (int)$pathSplit[count($pathSplit) - 2];
+            if (count($pathSplit) === 11) {
+                // Hierarchical structure
+                if (!in_array($fileId, $fileIds)) {
+                    $fileIds[] = $fileId;
+                }
+            } else {
+                // Flat structure
+                if (!in_array($fileId, $flatFileIds)) {
+                    $flatFileIds[] = $fileId;
+                }
+            }
+            $foundPreview = true;
+        }
+
+        foreach ($fileIds as $fileId) {
+            $this->processPreviews($fileId, flatPath: false);
+        }
+
+        foreach ($flatFileIds as $fileId) {
+            $this->processPreviews($fileId, flatPath: true);
+        }
+        return $foundPreview;
+    }
+
+    /**
+     * @param array<string|int, string[]> $previewFolders
+     */
+    private function processPreviews(int $fileId, bool $flatPath): void {
+        $internalPath = $this->getInternalFolder((string)$fileId, $flatPath);
+        $folder = $this->appData->getFolder($internalPath);
+
+        /**
+         * @var list<array{file: SimpleFile, preview: Preview}> $previewFiles
+         */
+        $previewFiles = [];
+
+        foreach ($folder->getDirectoryListing() as $previewFile) {
+            $path = $fileId . '/' . $previewFile->getName();
+            /** @var SimpleFile $previewFile */
+            $preview = Preview::fromPath($path, $this->mimeTypeDetector);
+            $preview->setId($this->generator->nextId());
+            if (!$preview) {
+                $this->logger->error('Unable to import old preview at path.');
+                continue;
+            }
+            $preview->setSize($previewFile->getSize());
+            $preview->setMtime($previewFile->getMtime());
+            $preview->setOldFileId($previewFile->getId());
+            $preview->setEncrypted(false);
+
+            $previewFiles[] = [
+                'file' => $previewFile,
+                'preview' => $preview,
+            ];
+        }
+
+        $qb = $this->connection->getQueryBuilder();
+        $qb->select('storage', 'etag', 'mimetype')
+            ->from('filecache')
+            ->where($qb->expr()->eq('fileid', $qb->createNamedParameter($fileId)))
+            ->setMaxResults(1);
+
+        $result = $qb->executeQuery();
+        $result = $result->fetchAllAssociative();
+
+        if (count($result) > 0) {
+            foreach ($previewFiles as $previewFile) {
+                /** @var Preview $preview */
+                $preview = $previewFile['preview'];
+                /** @var SimpleFile $file */
+                $file = $previewFile['file'];
+                $preview->setStorageId($result[0]['storage']);
+                $preview->setEtag($result[0]['etag']);
+                $preview->setSourceMimeType($this->mimeTypeLoader->getMimetypeById((int)$result[0]['mimetype']));
+                try {
+                    $preview = $this->previewMapper->insert($preview);
+                } catch (Exception) {
+                    // We already have this preview in the preview table, skip
+                    $qb->delete('filecache')
+                        ->where($qb->expr()->eq('fileid', $qb->createNamedParameter($file->getId())))
+                        ->hintShardKey('storage', $this->rootFolder->getMountPoint()->getNumericStorageId())
+                        ->executeStatement();
+                    continue;
+                }
+
+                try {
+                    $this->storageFactory->migratePreview($preview, $file);
+                    $qb = $this->connection->getQueryBuilder();
+                    $qb->delete('filecache')
+                        ->where($qb->expr()->eq('fileid', $qb->createNamedParameter($file->getId())))
+                        ->hintShardKey('storage', $this->rootFolder->getMountPoint()->getNumericStorageId())
+                        ->executeStatement();
+                    // Do not call $file->delete() as this will also delete the file from the file system
+                } catch (\Exception $e) {
+                    $this->previewMapper->delete($preview);
+                    throw $e;
+                }
+            }
+        } else {
+            // No matching fileId, delete preview
+            try {
+                $this->connection->beginTransaction();
+                foreach ($previewFiles as $previewFile) {
+                    /** @var SimpleFile $file */
+                    $file = $previewFile['file'];
+                    $file->delete();
+                }
+                $this->connection->commit();
+            } catch (Exception) {
+                $this->connection->rollback();
+            }
+        }
+
+        $this->deleteFolder($internalPath);
+    }
+
+    public static function getInternalFolder(string $name, bool $flatPath): string {
+        if ($flatPath) {
+            return $name;
+        }
+        return implode('/', str_split(substr(md5($name), 0, 7))) . '/' . $name;
+    }
+
+    private function deleteFolder(string $path): void {
+        $current = $path;
+
+        while (true) {
+            $appDataPath = $this->previewRootPath . $current;
+            $qb = $this->connection->getQueryBuilder();
+            $qb->delete('filecache')
+                ->where($qb->expr()->eq('path_hash', $qb->createNamedParameter(md5($appDataPath))))
+                ->hintShardKey('storage', $this->rootFolder->getMountPoint()->getNumericStorageId())
+                ->executeStatement();
+
+            $current = dirname($current);
+            if ($current === '/' || $current === '.' || $current === '') {
+                break;
+            }
+
+            $folder = $this->appData->getFolder($current);
+            if (count($folder->getDirectoryListing()) !== 0) {
+                break;
+            }
+        }
+    }
 }

Spacing +9 added lines, -9 removed lines

@@ -53,7 +53,7 @@ 
 		$this->appData = $appDataFactory->get('preview');
 		$this->setTimeSensitivity(self::TIME_INSENSITIVE);
 		$this->setInterval(24 * 60 * 60);
-		$this->previewRootPath = 'appdata_' . $this->config->getSystemValueString('instanceid') . '/preview/';
+		$this->previewRootPath = 'appdata_'.$this->config->getSystemValueString('instanceid').'/preview/';
 	}
 
 	#[Override]
@@ -68,9 +68,9 @@ 
 			$qb->select('path')
 				->from('filecache')
 				// Hierarchical preview folder structure
-				->where($qb->expr()->like('path', $qb->createNamedParameter($this->previewRootPath . '%/%/%/%/%/%/%/%/%')))
+				->where($qb->expr()->like('path', $qb->createNamedParameter($this->previewRootPath.'%/%/%/%/%/%/%/%/%')))
 				// Legacy flat preview folder structure
-				->orWhere($qb->expr()->like('path', $qb->createNamedParameter($this->previewRootPath . '%/%.%')))
+				->orWhere($qb->expr()->like('path', $qb->createNamedParameter($this->previewRootPath.'%/%.%')))
 				->hintShardKey('storage', $this->rootFolder->getMountPoint()->getNumericStorageId())
 				->setMaxResults(100);
 
@@ -97,7 +97,7 @@ 
 		while ($row = $result->fetchAssociative()) {
 			$pathSplit = explode('/', $row['path']);
 			assert(count($pathSplit) >= 2);
-			$fileId = (int)$pathSplit[count($pathSplit) - 2];
+			$fileId = (int) $pathSplit[count($pathSplit) - 2];
 			if (count($pathSplit) === 11) {
 				// Hierarchical structure
 				if (!in_array($fileId, $fileIds)) {
@@ -126,7 +126,7 @@ 
 	 * @param array<string|int, string[]> $previewFolders
 	 */
 	private function processPreviews(int $fileId, bool $flatPath): void {
-		$internalPath = $this->getInternalFolder((string)$fileId, $flatPath);
+		$internalPath = $this->getInternalFolder((string) $fileId, $flatPath);
 		$folder = $this->appData->getFolder($internalPath);
 
 		/**
@@ -135,7 +135,7 @@ 
 		$previewFiles = [];
 
 		foreach ($folder->getDirectoryListing() as $previewFile) {
-			$path = $fileId . '/' . $previewFile->getName();
+			$path = $fileId.'/'.$previewFile->getName();
 			/** @var SimpleFile $previewFile */
 			$preview = Preview::fromPath($path, $this->mimeTypeDetector);
 			$preview->setId($this->generator->nextId());
@@ -171,7 +171,7 @@ 
 				$file = $previewFile['file'];
 				$preview->setStorageId($result[0]['storage']);
 				$preview->setEtag($result[0]['etag']);
-				$preview->setSourceMimeType($this->mimeTypeLoader->getMimetypeById((int)$result[0]['mimetype']));
+				$preview->setSourceMimeType($this->mimeTypeLoader->getMimetypeById((int) $result[0]['mimetype']));
 				try {
 					$preview = $this->previewMapper->insert($preview);
 				} catch (Exception) {
@@ -218,14 +218,14 @@ 
 		if ($flatPath) {
 			return $name;
 		}
-		return implode('/', str_split(substr(md5($name), 0, 7))) . '/' . $name;
+		return implode('/', str_split(substr(md5($name), 0, 7))).'/'.$name;
 	}
 
 	private function deleteFolder(string $path): void {
 		$current = $path;
 
 		while (true) {
-			$appDataPath = $this->previewRootPath . $current;
+			$appDataPath = $this->previewRootPath.$current;
 			$qb = $this->connection->getQueryBuilder();
 			$qb->delete('filecache')
 				->where($qb->expr()->eq('path_hash', $qb->createNamedParameter(md5($appDataPath))))

core/Migrations/Version32000Date20250731062008.php

Indentation +120 added lines, -120 removed lines

@@ -25,124 +25,124 @@
 #[DataCleansing(table: 'vcategory', description: 'Cleanup of duplicate vcategory records')]
 #[DataCleansing(table: 'vcategory_to_object', description: 'Update object references')]
 class Version32000Date20250731062008 extends SimpleMigrationStep {
-	public function __construct(
-		private IDBConnection $connection,
-	) {
-	}
-
-	/**
-	 * @param IOutput $output
-	 * @param Closure(): ISchemaWrapper $schemaClosure
-	 * @param array $options
-	 */
-	#[Override]
-	public function preSchemaChange(IOutput $output, Closure $schemaClosure, array $options): void {
-		// Clean up duplicate categories before adding unique constraint
-		$this->cleanupDuplicateCategories($output);
-	}
-
-	/**
-	 * Clean up duplicate categories
-	 */
-	private function cleanupDuplicateCategories(IOutput $output): void {
-		$output->info('Starting cleanup of duplicate vcategory records...');
-
-		// Find all categories, ordered to identify duplicates
-		$qb = $this->connection->getQueryBuilder();
-		$qb->select('id', 'uid', 'type', 'category')
-			->from('vcategory')
-			->orderBy('uid')
-			->addOrderBy('type')
-			->addOrderBy('category')
-			->addOrderBy('id');
-
-		$result = $qb->executeQuery();
-
-		$seen = [];
-		$duplicateCount = 0;
-
-		while ($category = $result->fetchAssociative()) {
-			$key = $category['uid'] . '|' . $category['type'] . '|' . $category['category'];
-			$categoryId = (int)$category['id'];
-
-			if (!isset($seen[$key])) {
-				// First occurrence - keep this one
-				$seen[$key] = $categoryId;
-				continue;
-			}
-
-			// Duplicate found
-			$keepId = $seen[$key];
-			$duplicateCount++;
-
-			$output->info("Found duplicate: keeping ID $keepId, removing ID $categoryId");
-
-			$this->cleanupDuplicateAssignments($output, $categoryId, $keepId);
-
-			// Update object references
-			$updateQb = $this->connection->getQueryBuilder();
-			$updateQb->update('vcategory_to_object')
-				->set('categoryid', $updateQb->createNamedParameter($keepId))
-				->where($updateQb->expr()->eq('categoryid', $updateQb->createNamedParameter($categoryId)));
-
-			$affectedRows = $updateQb->executeStatement();
-			if ($affectedRows > 0) {
-				$output->info(" - Updated $affectedRows object references from category $categoryId to $keepId");
-			}
-
-			// Remove duplicate category record
-			$deleteQb = $this->connection->getQueryBuilder();
-			$deleteQb->delete('vcategory')
-				->where($deleteQb->expr()->eq('id', $deleteQb->createNamedParameter($categoryId)));
-
-			$deleteQb->executeStatement();
-			$output->info(" - Deleted duplicate category record ID $categoryId");
-
-		}
-
-		$result->closeCursor();
-
-		if ($duplicateCount === 0) {
-			$output->info('No duplicate categories found');
-		} else {
-			$output->info("Duplicate cleanup completed - processed $duplicateCount duplicates");
-		}
-	}
-
-	/**
-	 * Clean up duplicate assignments
-	 * That will delete rows with $categoryId when there is the same row with $keepId
-	 */
-	private function cleanupDuplicateAssignments(IOutput $output, int $categoryId, int $keepId): void {
-		$selectQb = $this->connection->getQueryBuilder();
-		$selectQb->select('o1.*')
-			->from('vcategory_to_object', 'o1')
-			->join(
-				'o1', 'vcategory_to_object', 'o2',
-				$selectQb->expr()->andX(
-					$selectQb->expr()->eq('o1.type', 'o2.type'),
-					$selectQb->expr()->eq('o1.objid', 'o2.objid'),
-				)
-			)
-			->where($selectQb->expr()->eq('o1.categoryid', $selectQb->createNamedParameter($categoryId)))
-			->andWhere($selectQb->expr()->eq('o2.categoryid', $selectQb->createNamedParameter($keepId)));
-
-		$deleteQb = $this->connection->getQueryBuilder();
-		$deleteQb->delete('vcategory_to_object')
-			->where($deleteQb->expr()->eq('objid', $deleteQb->createParameter('objid')))
-			->andWhere($deleteQb->expr()->eq('categoryid', $deleteQb->createParameter('categoryid')))
-			->andWhere($deleteQb->expr()->eq('type', $deleteQb->createParameter('type')));
-
-		$duplicatedAssignments = $selectQb->executeQuery();
-		$count = 0;
-		while ($row = $duplicatedAssignments->fetchAssociative()) {
-			$deleteQb
-				->setParameters($row)
-				->executeStatement();
-			$count++;
-		}
-		if ($count > 0) {
-			$output->info(" - Deleted $count duplicate category assignments for $categoryId and $keepId");
-		}
-	}
+    public function __construct(
+        private IDBConnection $connection,
+    ) {
+    }
+
+    /**
+     * @param IOutput $output
+     * @param Closure(): ISchemaWrapper $schemaClosure
+     * @param array $options
+     */
+    #[Override]
+    public function preSchemaChange(IOutput $output, Closure $schemaClosure, array $options): void {
+        // Clean up duplicate categories before adding unique constraint
+        $this->cleanupDuplicateCategories($output);
+    }
+
+    /**
+     * Clean up duplicate categories
+     */
+    private function cleanupDuplicateCategories(IOutput $output): void {
+        $output->info('Starting cleanup of duplicate vcategory records...');
+
+        // Find all categories, ordered to identify duplicates
+        $qb = $this->connection->getQueryBuilder();
+        $qb->select('id', 'uid', 'type', 'category')
+            ->from('vcategory')
+            ->orderBy('uid')
+            ->addOrderBy('type')
+            ->addOrderBy('category')
+            ->addOrderBy('id');
+
+        $result = $qb->executeQuery();
+
+        $seen = [];
+        $duplicateCount = 0;
+
+        while ($category = $result->fetchAssociative()) {
+            $key = $category['uid'] . '|' . $category['type'] . '|' . $category['category'];
+            $categoryId = (int)$category['id'];
+
+            if (!isset($seen[$key])) {
+                // First occurrence - keep this one
+                $seen[$key] = $categoryId;
+                continue;
+            }
+
+            // Duplicate found
+            $keepId = $seen[$key];
+            $duplicateCount++;
+
+            $output->info("Found duplicate: keeping ID $keepId, removing ID $categoryId");
+
+            $this->cleanupDuplicateAssignments($output, $categoryId, $keepId);
+
+            // Update object references
+            $updateQb = $this->connection->getQueryBuilder();
+            $updateQb->update('vcategory_to_object')
+                ->set('categoryid', $updateQb->createNamedParameter($keepId))
+                ->where($updateQb->expr()->eq('categoryid', $updateQb->createNamedParameter($categoryId)));
+
+            $affectedRows = $updateQb->executeStatement();
+            if ($affectedRows > 0) {
+                $output->info(" - Updated $affectedRows object references from category $categoryId to $keepId");
+            }
+
+            // Remove duplicate category record
+            $deleteQb = $this->connection->getQueryBuilder();
+            $deleteQb->delete('vcategory')
+                ->where($deleteQb->expr()->eq('id', $deleteQb->createNamedParameter($categoryId)));
+
+            $deleteQb->executeStatement();
+            $output->info(" - Deleted duplicate category record ID $categoryId");
+
+        }
+
+        $result->closeCursor();
+
+        if ($duplicateCount === 0) {
+            $output->info('No duplicate categories found');
+        } else {
+            $output->info("Duplicate cleanup completed - processed $duplicateCount duplicates");
+        }
+    }
+
+    /**
+     * Clean up duplicate assignments
+     * That will delete rows with $categoryId when there is the same row with $keepId
+     */
+    private function cleanupDuplicateAssignments(IOutput $output, int $categoryId, int $keepId): void {
+        $selectQb = $this->connection->getQueryBuilder();
+        $selectQb->select('o1.*')
+            ->from('vcategory_to_object', 'o1')
+            ->join(
+                'o1', 'vcategory_to_object', 'o2',
+                $selectQb->expr()->andX(
+                    $selectQb->expr()->eq('o1.type', 'o2.type'),
+                    $selectQb->expr()->eq('o1.objid', 'o2.objid'),
+                )
+            )
+            ->where($selectQb->expr()->eq('o1.categoryid', $selectQb->createNamedParameter($categoryId)))
+            ->andWhere($selectQb->expr()->eq('o2.categoryid', $selectQb->createNamedParameter($keepId)));
+
+        $deleteQb = $this->connection->getQueryBuilder();
+        $deleteQb->delete('vcategory_to_object')
+            ->where($deleteQb->expr()->eq('objid', $deleteQb->createParameter('objid')))
+            ->andWhere($deleteQb->expr()->eq('categoryid', $deleteQb->createParameter('categoryid')))
+            ->andWhere($deleteQb->expr()->eq('type', $deleteQb->createParameter('type')));
+
+        $duplicatedAssignments = $selectQb->executeQuery();
+        $count = 0;
+        while ($row = $duplicatedAssignments->fetchAssociative()) {
+            $deleteQb
+                ->setParameters($row)
+                ->executeStatement();
+            $count++;
+        }
+        if ($count > 0) {
+            $output->info(" - Deleted $count duplicate category assignments for $categoryId and $keepId");
+        }
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -62,8 +62,8 @@
 		$duplicateCount = 0;
 
 		while ($category = $result->fetchAssociative()) {
-			$key = $category['uid'] . '|' . $category['type'] . '|' . $category['category'];
-			$categoryId = (int)$category['id'];
+			$key = $category['uid'].'|'.$category['type'].'|'.$category['category'];
+			$categoryId = (int) $category['id'];
 
 			if (!isset($seen[$key])) {
 				// First occurrence - keep this one

core/Migrations/Version28000Date20240828142927.php

Indentation +46 added lines, -46 removed lines

@@ -24,60 +24,60 @@
 #[ModifyColumn(table: 'jobs', name: 'argument_hash', type: ColumnType::STRING, description: 'Increase the column size from 32 to 64')]
 #[ModifyColumn(table: 'jobs', name: 'argument_hash', type: ColumnType::STRING, description: 'Rehash the argument_hash column using sha256')]
 class Version28000Date20240828142927 extends SimpleMigrationStep {
-	public function __construct(
-		protected IDBConnection $connection,
-	) {
-	}
+    public function __construct(
+        protected IDBConnection $connection,
+    ) {
+    }
 
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		// Increase the column size from 32 to 64
-		$table = $schema->getTable('jobs');
-		$table->modifyColumn('argument_hash', [
-			'notnull' => false,
-			'length' => 64,
-		]);
+        // Increase the column size from 32 to 64
+        $table = $schema->getTable('jobs');
+        $table->modifyColumn('argument_hash', [
+            'notnull' => false,
+            'length' => 64,
+        ]);
 
-		return $schema;
-	}
+        return $schema;
+    }
 
-	public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options): void {
-		$chunkSize = 1000;
-		$offset = 0;
-		$nullHash = hash('sha256', 'null');
+    public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options): void {
+        $chunkSize = 1000;
+        $offset = 0;
+        $nullHash = hash('sha256', 'null');
 
-		$selectQuery = $this->connection->getQueryBuilder()
-			->select('*')
-			->from('jobs')
-			->setMaxResults($chunkSize);
+        $selectQuery = $this->connection->getQueryBuilder()
+            ->select('*')
+            ->from('jobs')
+            ->setMaxResults($chunkSize);
 
-		$insertQuery = $this->connection->getQueryBuilder();
-		$insertQuery->update('jobs')
-			->set('argument_hash', $insertQuery->createParameter('argument_hash'))
-			->where($insertQuery->expr()->eq('id', $insertQuery->createParameter('id')));
+        $insertQuery = $this->connection->getQueryBuilder();
+        $insertQuery->update('jobs')
+            ->set('argument_hash', $insertQuery->createParameter('argument_hash'))
+            ->where($insertQuery->expr()->eq('id', $insertQuery->createParameter('id')));
 
-		do {
-			$result = $selectQuery
-				->setFirstResult($offset)
-				->executeQuery();
+        do {
+            $result = $selectQuery
+                ->setFirstResult($offset)
+                ->executeQuery();
 
-			$jobs = $result->fetchAllAssociative();
-			$count = count($jobs);
+            $jobs = $result->fetchAllAssociative();
+            $count = count($jobs);
 
-			foreach ($jobs as $jobRow) {
-				if ($jobRow['argument'] === 'null') {
-					$hash = $nullHash;
-				} else {
-					$hash = hash('sha256', $jobRow['argument']);
-				}
-				$insertQuery->setParameter('id', (string)$jobRow['id'], IQueryBuilder::PARAM_INT);
-				$insertQuery->setParameter('argument_hash', $hash);
-				$insertQuery->executeStatement();
-			}
+            foreach ($jobs as $jobRow) {
+                if ($jobRow['argument'] === 'null') {
+                    $hash = $nullHash;
+                } else {
+                    $hash = hash('sha256', $jobRow['argument']);
+                }
+                $insertQuery->setParameter('id', (string)$jobRow['id'], IQueryBuilder::PARAM_INT);
+                $insertQuery->setParameter('argument_hash', $hash);
+                $insertQuery->executeStatement();
+            }
 
-			$offset += $chunkSize;
-		} while ($count === $chunkSize);
-	}
+            $offset += $chunkSize;
+        } while ($count === $chunkSize);
+    }
 }

core/Migrations/Version13000Date20170718121200.php

Indentation +977 added lines, -977 removed lines

@@ -13,1017 +13,1017 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version13000Date20170718121200 extends SimpleMigrationStep {
-	public function __construct(
-		private IDBConnection $connection,
-	) {
-	}
+    public function __construct(
+        private IDBConnection $connection,
+    ) {
+    }
 
-	public function preSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    public function preSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		if (!$schema->hasTable('properties')) {
-			return;
-		}
-		// in case we have a properties table from oc we drop it since we will only migrate
-		// the dav_properties values in the postSchemaChange step
-		$table = $schema->getTable('properties');
-		if ($table->hasColumn('fileid')) {
-			$qb = $this->connection->getQueryBuilder();
-			$qb->delete('properties');
-			$qb->executeStatement();
-		}
-	}
+        if (!$schema->hasTable('properties')) {
+            return;
+        }
+        // in case we have a properties table from oc we drop it since we will only migrate
+        // the dav_properties values in the postSchemaChange step
+        $table = $schema->getTable('properties');
+        if ($table->hasColumn('fileid')) {
+            $qb = $this->connection->getQueryBuilder();
+            $qb->delete('properties');
+            $qb->executeStatement();
+        }
+    }
 
 
-	/**
-	 * @param IOutput $output
-	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 * @since 13.0.0
-	 */
-	public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     * @since 13.0.0
+     */
+    public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		if (!$schema->hasTable('appconfig')) {
-			$table = $schema->createTable('appconfig');
-			$table->addColumn('appid', 'string', [
-				'notnull' => true,
-				'length' => 32,
-				'default' => '',
-			]);
-			$table->addColumn('configkey', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('configvalue', 'text', [
-				'notnull' => false,
-			]);
-			$table->setPrimaryKey(['appid', 'configkey']);
-			$table->addIndex(['configkey'], 'appconfig_config_key_index');
-			$table->addIndex(['appid'], 'appconfig_appid_key');
-		}
+        if (!$schema->hasTable('appconfig')) {
+            $table = $schema->createTable('appconfig');
+            $table->addColumn('appid', 'string', [
+                'notnull' => true,
+                'length' => 32,
+                'default' => '',
+            ]);
+            $table->addColumn('configkey', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('configvalue', 'text', [
+                'notnull' => false,
+            ]);
+            $table->setPrimaryKey(['appid', 'configkey']);
+            $table->addIndex(['configkey'], 'appconfig_config_key_index');
+            $table->addIndex(['appid'], 'appconfig_appid_key');
+        }
 
-		if (!$schema->hasTable('storages')) {
-			$table = $schema->createTable('storages');
-			$table->addColumn('id', 'string', [
-				'notnull' => false,
-				'length' => 64,
-			]);
-			$table->addColumn('numeric_id', Types::BIGINT, [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 20,
-			]);
-			$table->addColumn('available', 'integer', [
-				'notnull' => true,
-				'default' => 1,
-			]);
-			$table->addColumn('last_checked', 'integer', [
-				'notnull' => false,
-			]);
-			$table->setPrimaryKey(['numeric_id']);
-			$table->addUniqueIndex(['id'], 'storages_id_index');
-		}
+        if (!$schema->hasTable('storages')) {
+            $table = $schema->createTable('storages');
+            $table->addColumn('id', 'string', [
+                'notnull' => false,
+                'length' => 64,
+            ]);
+            $table->addColumn('numeric_id', Types::BIGINT, [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 20,
+            ]);
+            $table->addColumn('available', 'integer', [
+                'notnull' => true,
+                'default' => 1,
+            ]);
+            $table->addColumn('last_checked', 'integer', [
+                'notnull' => false,
+            ]);
+            $table->setPrimaryKey(['numeric_id']);
+            $table->addUniqueIndex(['id'], 'storages_id_index');
+        }
 
-		if (!$schema->hasTable('mounts')) {
-			$table = $schema->createTable('mounts');
-			$table->addColumn('id', 'integer', [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 4,
-			]);
-			$table->addColumn('storage_id', Types::BIGINT, [
-				'notnull' => true,
-				'length' => 20,
-			]);
-			$table->addColumn('root_id', Types::BIGINT, [
-				'notnull' => true,
-				'length' => 20,
-			]);
-			$table->addColumn('user_id', 'string', [
-				'notnull' => true,
-				'length' => 64,
-			]);
-			$table->addColumn('mount_point', 'string', [
-				'notnull' => true,
-				'length' => 4000,
-			]);
-			$table->addColumn('mount_id', Types::BIGINT, [
-				'notnull' => false,
-				'length' => 20,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addIndex(['user_id'], 'mounts_user_index');
-			$table->addIndex(['storage_id'], 'mounts_storage_index');
-			$table->addIndex(['root_id'], 'mounts_root_index');
-			$table->addIndex(['mount_id'], 'mounts_mount_id_index');
-			$table->addIndex(['user_id', 'root_id', 'mount_point'], 'mounts_user_root_path_index', [], ['lengths' => [null, null, 128]]);
-		} else {
-			$table = $schema->getTable('mounts');
-			if (!$table->hasColumn('mount_id')) {
-				$table->addColumn('mount_id', Types::BIGINT, [
-					'notnull' => false,
-					'length' => 20,
-				]);
-			}
-			if (!$table->hasIndex('mounts_mount_id_index')) {
-				$table->addIndex(['mount_id'], 'mounts_mount_id_index');
-			}
-		}
+        if (!$schema->hasTable('mounts')) {
+            $table = $schema->createTable('mounts');
+            $table->addColumn('id', 'integer', [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 4,
+            ]);
+            $table->addColumn('storage_id', Types::BIGINT, [
+                'notnull' => true,
+                'length' => 20,
+            ]);
+            $table->addColumn('root_id', Types::BIGINT, [
+                'notnull' => true,
+                'length' => 20,
+            ]);
+            $table->addColumn('user_id', 'string', [
+                'notnull' => true,
+                'length' => 64,
+            ]);
+            $table->addColumn('mount_point', 'string', [
+                'notnull' => true,
+                'length' => 4000,
+            ]);
+            $table->addColumn('mount_id', Types::BIGINT, [
+                'notnull' => false,
+                'length' => 20,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addIndex(['user_id'], 'mounts_user_index');
+            $table->addIndex(['storage_id'], 'mounts_storage_index');
+            $table->addIndex(['root_id'], 'mounts_root_index');
+            $table->addIndex(['mount_id'], 'mounts_mount_id_index');
+            $table->addIndex(['user_id', 'root_id', 'mount_point'], 'mounts_user_root_path_index', [], ['lengths' => [null, null, 128]]);
+        } else {
+            $table = $schema->getTable('mounts');
+            if (!$table->hasColumn('mount_id')) {
+                $table->addColumn('mount_id', Types::BIGINT, [
+                    'notnull' => false,
+                    'length' => 20,
+                ]);
+            }
+            if (!$table->hasIndex('mounts_mount_id_index')) {
+                $table->addIndex(['mount_id'], 'mounts_mount_id_index');
+            }
+        }
 
-		if (!$schema->hasTable('mimetypes')) {
-			$table = $schema->createTable('mimetypes');
-			$table->addColumn('id', Types::BIGINT, [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 20,
-			]);
-			$table->addColumn('mimetype', 'string', [
-				'notnull' => true,
-				'length' => 255,
-				'default' => '',
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addUniqueIndex(['mimetype'], 'mimetype_id_index');
-		}
+        if (!$schema->hasTable('mimetypes')) {
+            $table = $schema->createTable('mimetypes');
+            $table->addColumn('id', Types::BIGINT, [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 20,
+            ]);
+            $table->addColumn('mimetype', 'string', [
+                'notnull' => true,
+                'length' => 255,
+                'default' => '',
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addUniqueIndex(['mimetype'], 'mimetype_id_index');
+        }
 
-		if (!$schema->hasTable('filecache')) {
-			$table = $schema->createTable('filecache');
-			$table->addColumn('fileid', Types::BIGINT, [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 20,
-			]);
-			$table->addColumn('storage', Types::BIGINT, [
-				'notnull' => true,
-				'length' => 20,
-				'default' => 0,
-			]);
-			$table->addColumn('path', 'string', [
-				'notnull' => false,
-				'length' => 4000,
-			]);
-			$table->addColumn('path_hash', 'string', [
-				'notnull' => true,
-				'length' => 32,
-				'default' => '',
-			]);
-			$table->addColumn('parent', Types::BIGINT, [
-				'notnull' => true,
-				'length' => 20,
-				'default' => 0,
-			]);
-			$table->addColumn('name', 'string', [
-				'notnull' => false,
-				'length' => 250,
-			]);
-			$table->addColumn('mimetype', Types::BIGINT, [
-				'notnull' => true,
-				'length' => 20,
-				'default' => 0,
-			]);
-			$table->addColumn('mimepart', Types::BIGINT, [
-				'notnull' => true,
-				'length' => 20,
-				'default' => 0,
-			]);
-			$table->addColumn('size', 'bigint', [
-				'notnull' => true,
-				'length' => 8,
-				'default' => 0,
-			]);
-			$table->addColumn('mtime', Types::BIGINT, [
-				'notnull' => true,
-				'length' => 20,
-				'default' => 0,
-			]);
-			$table->addColumn('storage_mtime', Types::BIGINT, [
-				'notnull' => true,
-				'length' => 20,
-				'default' => 0,
-			]);
-			$table->addColumn('encrypted', 'integer', [
-				'notnull' => true,
-				'length' => 4,
-				'default' => 0,
-			]);
-			$table->addColumn('unencrypted_size', 'bigint', [
-				'notnull' => true,
-				'length' => 8,
-				'default' => 0,
-			]);
-			$table->addColumn('etag', 'string', [
-				'notnull' => false,
-				'length' => 40,
-			]);
-			$table->addColumn('permissions', 'integer', [
-				'notnull' => false,
-				'length' => 4,
-				'default' => 0,
-			]);
-			$table->addColumn('checksum', 'string', [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->setPrimaryKey(['fileid']);
-			$table->addUniqueIndex(['storage', 'path_hash'], 'fs_storage_path_hash');
-			$table->addIndex(['parent', 'name'], 'fs_parent_name_hash');
-			$table->addIndex(['storage', 'mimetype'], 'fs_storage_mimetype');
-			$table->addIndex(['storage', 'mimepart'], 'fs_storage_mimepart');
-			$table->addIndex(['storage', 'size', 'fileid'], 'fs_storage_size');
-			$table->addIndex(['fileid', 'storage', 'size'], 'fs_id_storage_size');
-			$table->addIndex(['parent'], 'fs_parent');
-			$table->addIndex(['name'], 'fs_name_hash');
-			$table->addIndex(['mtime'], 'fs_mtime');
-			$table->addIndex(['size'], 'fs_size');
-			if ($this->connection->getDatabaseProvider() !== IDBConnection::PLATFORM_POSTGRES) {
-				$table->addIndex(['storage', 'path'], 'fs_storage_path_prefix', [], ['lengths' => [null, 64]]);
-			}
-		}
+        if (!$schema->hasTable('filecache')) {
+            $table = $schema->createTable('filecache');
+            $table->addColumn('fileid', Types::BIGINT, [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 20,
+            ]);
+            $table->addColumn('storage', Types::BIGINT, [
+                'notnull' => true,
+                'length' => 20,
+                'default' => 0,
+            ]);
+            $table->addColumn('path', 'string', [
+                'notnull' => false,
+                'length' => 4000,
+            ]);
+            $table->addColumn('path_hash', 'string', [
+                'notnull' => true,
+                'length' => 32,
+                'default' => '',
+            ]);
+            $table->addColumn('parent', Types::BIGINT, [
+                'notnull' => true,
+                'length' => 20,
+                'default' => 0,
+            ]);
+            $table->addColumn('name', 'string', [
+                'notnull' => false,
+                'length' => 250,
+            ]);
+            $table->addColumn('mimetype', Types::BIGINT, [
+                'notnull' => true,
+                'length' => 20,
+                'default' => 0,
+            ]);
+            $table->addColumn('mimepart', Types::BIGINT, [
+                'notnull' => true,
+                'length' => 20,
+                'default' => 0,
+            ]);
+            $table->addColumn('size', 'bigint', [
+                'notnull' => true,
+                'length' => 8,
+                'default' => 0,
+            ]);
+            $table->addColumn('mtime', Types::BIGINT, [
+                'notnull' => true,
+                'length' => 20,
+                'default' => 0,
+            ]);
+            $table->addColumn('storage_mtime', Types::BIGINT, [
+                'notnull' => true,
+                'length' => 20,
+                'default' => 0,
+            ]);
+            $table->addColumn('encrypted', 'integer', [
+                'notnull' => true,
+                'length' => 4,
+                'default' => 0,
+            ]);
+            $table->addColumn('unencrypted_size', 'bigint', [
+                'notnull' => true,
+                'length' => 8,
+                'default' => 0,
+            ]);
+            $table->addColumn('etag', 'string', [
+                'notnull' => false,
+                'length' => 40,
+            ]);
+            $table->addColumn('permissions', 'integer', [
+                'notnull' => false,
+                'length' => 4,
+                'default' => 0,
+            ]);
+            $table->addColumn('checksum', 'string', [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->setPrimaryKey(['fileid']);
+            $table->addUniqueIndex(['storage', 'path_hash'], 'fs_storage_path_hash');
+            $table->addIndex(['parent', 'name'], 'fs_parent_name_hash');
+            $table->addIndex(['storage', 'mimetype'], 'fs_storage_mimetype');
+            $table->addIndex(['storage', 'mimepart'], 'fs_storage_mimepart');
+            $table->addIndex(['storage', 'size', 'fileid'], 'fs_storage_size');
+            $table->addIndex(['fileid', 'storage', 'size'], 'fs_id_storage_size');
+            $table->addIndex(['parent'], 'fs_parent');
+            $table->addIndex(['name'], 'fs_name_hash');
+            $table->addIndex(['mtime'], 'fs_mtime');
+            $table->addIndex(['size'], 'fs_size');
+            if ($this->connection->getDatabaseProvider() !== IDBConnection::PLATFORM_POSTGRES) {
+                $table->addIndex(['storage', 'path'], 'fs_storage_path_prefix', [], ['lengths' => [null, 64]]);
+            }
+        }
 
-		if (!$schema->hasTable('group_user')) {
-			$table = $schema->createTable('group_user');
-			$table->addColumn('gid', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('uid', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->setPrimaryKey(['gid', 'uid']);
-			$table->addIndex(['uid'], 'gu_uid_index');
-		}
+        if (!$schema->hasTable('group_user')) {
+            $table = $schema->createTable('group_user');
+            $table->addColumn('gid', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('uid', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->setPrimaryKey(['gid', 'uid']);
+            $table->addIndex(['uid'], 'gu_uid_index');
+        }
 
-		if (!$schema->hasTable('group_admin')) {
-			$table = $schema->createTable('group_admin');
-			$table->addColumn('gid', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('uid', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->setPrimaryKey(['gid', 'uid']);
-			$table->addIndex(['uid'], 'group_admin_uid');
-		}
+        if (!$schema->hasTable('group_admin')) {
+            $table = $schema->createTable('group_admin');
+            $table->addColumn('gid', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('uid', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->setPrimaryKey(['gid', 'uid']);
+            $table->addIndex(['uid'], 'group_admin_uid');
+        }
 
-		if (!$schema->hasTable('groups')) {
-			$table = $schema->createTable('groups');
-			$table->addColumn('gid', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->setPrimaryKey(['gid']);
-		}
+        if (!$schema->hasTable('groups')) {
+            $table = $schema->createTable('groups');
+            $table->addColumn('gid', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->setPrimaryKey(['gid']);
+        }
 
-		if (!$schema->hasTable('preferences')) {
-			$table = $schema->createTable('preferences');
-			$table->addColumn('userid', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('appid', 'string', [
-				'notnull' => true,
-				'length' => 32,
-				'default' => '',
-			]);
-			$table->addColumn('configkey', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('configvalue', 'text', [
-				'notnull' => false,
-			]);
-			$table->setPrimaryKey(['userid', 'appid', 'configkey']);
-			$table->addIndex(['appid', 'configkey'], 'preferences_app_key');
-		}
+        if (!$schema->hasTable('preferences')) {
+            $table = $schema->createTable('preferences');
+            $table->addColumn('userid', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('appid', 'string', [
+                'notnull' => true,
+                'length' => 32,
+                'default' => '',
+            ]);
+            $table->addColumn('configkey', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('configvalue', 'text', [
+                'notnull' => false,
+            ]);
+            $table->setPrimaryKey(['userid', 'appid', 'configkey']);
+            $table->addIndex(['appid', 'configkey'], 'preferences_app_key');
+        }
 
-		if (!$schema->hasTable('properties')) {
-			$table = $schema->createTable('properties');
-			$table->addColumn('id', 'integer', [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 4,
-			]);
-			$table->addColumn('userid', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('propertypath', 'string', [
-				'notnull' => true,
-				'length' => 255,
-				'default' => '',
-			]);
-			$table->addColumn('propertyname', 'string', [
-				'notnull' => true,
-				'length' => 255,
-				'default' => '',
-			]);
-			$table->addColumn('propertyvalue', 'text', [
-				'notnull' => true,
-			]);
-			$table->setPrimaryKey(['id']);
-			// Dropped in Version29000Date20240131122720 because property_index is redundant with properties_path_index
-			// $table->addIndex(['userid'], 'property_index');
-			$table->addIndex(['userid', 'propertypath'], 'properties_path_index');
-			$table->addIndex(['propertypath'], 'properties_pathonly_index');
-		} else {
-			$table = $schema->getTable('properties');
-			if ($table->hasColumn('propertytype')) {
-				$table->dropColumn('propertytype');
-			}
-			if ($table->hasColumn('fileid')) {
-				$table->dropColumn('fileid');
-			}
-			if (!$table->hasColumn('propertypath')) {
-				$table->addColumn('propertypath', 'string', [
-					'notnull' => true,
-					'length' => 255,
-				]);
-			}
-			if (!$table->hasColumn('userid')) {
-				$table->addColumn('userid', 'string', [
-					'notnull' => false,
-					'length' => 64,
-					'default' => '',
-				]);
-			}
-		}
+        if (!$schema->hasTable('properties')) {
+            $table = $schema->createTable('properties');
+            $table->addColumn('id', 'integer', [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 4,
+            ]);
+            $table->addColumn('userid', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('propertypath', 'string', [
+                'notnull' => true,
+                'length' => 255,
+                'default' => '',
+            ]);
+            $table->addColumn('propertyname', 'string', [
+                'notnull' => true,
+                'length' => 255,
+                'default' => '',
+            ]);
+            $table->addColumn('propertyvalue', 'text', [
+                'notnull' => true,
+            ]);
+            $table->setPrimaryKey(['id']);
+            // Dropped in Version29000Date20240131122720 because property_index is redundant with properties_path_index
+            // $table->addIndex(['userid'], 'property_index');
+            $table->addIndex(['userid', 'propertypath'], 'properties_path_index');
+            $table->addIndex(['propertypath'], 'properties_pathonly_index');
+        } else {
+            $table = $schema->getTable('properties');
+            if ($table->hasColumn('propertytype')) {
+                $table->dropColumn('propertytype');
+            }
+            if ($table->hasColumn('fileid')) {
+                $table->dropColumn('fileid');
+            }
+            if (!$table->hasColumn('propertypath')) {
+                $table->addColumn('propertypath', 'string', [
+                    'notnull' => true,
+                    'length' => 255,
+                ]);
+            }
+            if (!$table->hasColumn('userid')) {
+                $table->addColumn('userid', 'string', [
+                    'notnull' => false,
+                    'length' => 64,
+                    'default' => '',
+                ]);
+            }
+        }
 
-		if (!$schema->hasTable('share')) {
-			$table = $schema->createTable('share');
-			$table->addColumn('id', 'integer', [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 4,
-			]);
-			$table->addColumn('share_type', 'smallint', [
-				'notnull' => true,
-				'length' => 1,
-				'default' => 0,
-			]);
-			$table->addColumn('share_with', 'string', [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->addColumn('password', 'string', [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->addColumn('uid_owner', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('uid_initiator', 'string', [
-				'notnull' => false,
-				'length' => 64,
-			]);
-			$table->addColumn('parent', 'integer', [
-				'notnull' => false,
-				'length' => 4,
-			]);
-			$table->addColumn('item_type', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('item_source', 'string', [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->addColumn('item_target', 'string', [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->addColumn('file_source', 'integer', [
-				'notnull' => false,
-				'length' => 4,
-			]);
-			$table->addColumn('file_target', 'string', [
-				'notnull' => false,
-				'length' => 512,
-			]);
-			$table->addColumn('permissions', 'smallint', [
-				'notnull' => true,
-				'length' => 1,
-				'default' => 0,
-			]);
-			$table->addColumn('stime', 'bigint', [
-				'notnull' => true,
-				'length' => 8,
-				'default' => 0,
-			]);
-			$table->addColumn('accepted', 'smallint', [
-				'notnull' => true,
-				'length' => 1,
-				'default' => 0,
-			]);
-			$table->addColumn('expiration', 'datetime', [
-				'notnull' => false,
-			]);
-			$table->addColumn('token', 'string', [
-				'notnull' => false,
-				'length' => 32,
-			]);
-			$table->addColumn('mail_send', 'smallint', [
-				'notnull' => true,
-				'length' => 1,
-				'default' => 0,
-			]);
-			$table->addColumn('share_name', 'string', [
-				'notnull' => false,
-				'length' => 64,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addIndex(['item_type', 'share_type'], 'item_share_type_index');
-			$table->addIndex(['file_source'], 'file_source_index');
-			$table->addIndex(['token'], 'token_index');
-			$table->addIndex(['share_with'], 'share_with_index');
-			$table->addIndex(['parent'], 'parent_index');
-			$table->addIndex(['uid_owner'], 'owner_index');
-			$table->addIndex(['uid_initiator'], 'initiator_index');
-		} else {
-			$table = $schema->getTable('share');
-			if (!$table->hasColumn('password')) {
-				$table->addColumn('password', 'string', [
-					'notnull' => false,
-					'length' => 255,
-				]);
-			}
-		}
+        if (!$schema->hasTable('share')) {
+            $table = $schema->createTable('share');
+            $table->addColumn('id', 'integer', [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 4,
+            ]);
+            $table->addColumn('share_type', 'smallint', [
+                'notnull' => true,
+                'length' => 1,
+                'default' => 0,
+            ]);
+            $table->addColumn('share_with', 'string', [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->addColumn('password', 'string', [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->addColumn('uid_owner', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('uid_initiator', 'string', [
+                'notnull' => false,
+                'length' => 64,
+            ]);
+            $table->addColumn('parent', 'integer', [
+                'notnull' => false,
+                'length' => 4,
+            ]);
+            $table->addColumn('item_type', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('item_source', 'string', [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->addColumn('item_target', 'string', [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->addColumn('file_source', 'integer', [
+                'notnull' => false,
+                'length' => 4,
+            ]);
+            $table->addColumn('file_target', 'string', [
+                'notnull' => false,
+                'length' => 512,
+            ]);
+            $table->addColumn('permissions', 'smallint', [
+                'notnull' => true,
+                'length' => 1,
+                'default' => 0,
+            ]);
+            $table->addColumn('stime', 'bigint', [
+                'notnull' => true,
+                'length' => 8,
+                'default' => 0,
+            ]);
+            $table->addColumn('accepted', 'smallint', [
+                'notnull' => true,
+                'length' => 1,
+                'default' => 0,
+            ]);
+            $table->addColumn('expiration', 'datetime', [
+                'notnull' => false,
+            ]);
+            $table->addColumn('token', 'string', [
+                'notnull' => false,
+                'length' => 32,
+            ]);
+            $table->addColumn('mail_send', 'smallint', [
+                'notnull' => true,
+                'length' => 1,
+                'default' => 0,
+            ]);
+            $table->addColumn('share_name', 'string', [
+                'notnull' => false,
+                'length' => 64,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addIndex(['item_type', 'share_type'], 'item_share_type_index');
+            $table->addIndex(['file_source'], 'file_source_index');
+            $table->addIndex(['token'], 'token_index');
+            $table->addIndex(['share_with'], 'share_with_index');
+            $table->addIndex(['parent'], 'parent_index');
+            $table->addIndex(['uid_owner'], 'owner_index');
+            $table->addIndex(['uid_initiator'], 'initiator_index');
+        } else {
+            $table = $schema->getTable('share');
+            if (!$table->hasColumn('password')) {
+                $table->addColumn('password', 'string', [
+                    'notnull' => false,
+                    'length' => 255,
+                ]);
+            }
+        }
 
-		if (!$schema->hasTable('jobs')) {
-			$table = $schema->createTable('jobs');
-			$table->addColumn('id', 'integer', [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 4,
-				'unsigned' => true,
-			]);
-			$table->addColumn('class', 'string', [
-				'notnull' => true,
-				'length' => 255,
-				'default' => '',
-			]);
-			$table->addColumn('argument', 'string', [
-				'notnull' => true,
-				'length' => 4000,
-				'default' => '',
-			]);
-			$table->addColumn('last_run', 'integer', [
-				'notnull' => false,
-				'default' => 0,
-			]);
-			$table->addColumn('last_checked', 'integer', [
-				'notnull' => false,
-				'default' => 0,
-			]);
-			$table->addColumn('reserved_at', 'integer', [
-				'notnull' => false,
-				'default' => 0,
-			]);
-			$table->addColumn('execution_duration', 'integer', [
-				'notnull' => true,
-				'default' => 0,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addIndex(['class'], 'job_class_index');
-			$table->addIndex(['last_checked', 'reserved_at'], 'job_lastcheck_reserved');
-		}
+        if (!$schema->hasTable('jobs')) {
+            $table = $schema->createTable('jobs');
+            $table->addColumn('id', 'integer', [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 4,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('class', 'string', [
+                'notnull' => true,
+                'length' => 255,
+                'default' => '',
+            ]);
+            $table->addColumn('argument', 'string', [
+                'notnull' => true,
+                'length' => 4000,
+                'default' => '',
+            ]);
+            $table->addColumn('last_run', 'integer', [
+                'notnull' => false,
+                'default' => 0,
+            ]);
+            $table->addColumn('last_checked', 'integer', [
+                'notnull' => false,
+                'default' => 0,
+            ]);
+            $table->addColumn('reserved_at', 'integer', [
+                'notnull' => false,
+                'default' => 0,
+            ]);
+            $table->addColumn('execution_duration', 'integer', [
+                'notnull' => true,
+                'default' => 0,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addIndex(['class'], 'job_class_index');
+            $table->addIndex(['last_checked', 'reserved_at'], 'job_lastcheck_reserved');
+        }
 
-		if (!$schema->hasTable('users')) {
-			$table = $schema->createTable('users');
-			$table->addColumn('uid', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('displayname', 'string', [
-				'notnull' => false,
-				'length' => 64,
-			]);
-			$table->addColumn('password', 'string', [
-				'notnull' => true,
-				'length' => 255,
-				'default' => '',
-			]);
-			$table->setPrimaryKey(['uid']);
-		}
+        if (!$schema->hasTable('users')) {
+            $table = $schema->createTable('users');
+            $table->addColumn('uid', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('displayname', 'string', [
+                'notnull' => false,
+                'length' => 64,
+            ]);
+            $table->addColumn('password', 'string', [
+                'notnull' => true,
+                'length' => 255,
+                'default' => '',
+            ]);
+            $table->setPrimaryKey(['uid']);
+        }
 
-		if (!$schema->hasTable('authtoken')) {
-			$table = $schema->createTable('authtoken');
-			$table->addColumn('id', 'integer', [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 4,
-				'unsigned' => true,
-			]);
-			$table->addColumn('uid', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('login_name', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('password', 'text', [
-				'notnull' => false,
-			]);
-			$table->addColumn('name', 'text', [
-				'notnull' => true,
-				'default' => '',
-			]);
-			$table->addColumn('token', 'string', [
-				'notnull' => true,
-				'length' => 200,
-				'default' => '',
-			]);
-			$table->addColumn('type', 'smallint', [
-				'notnull' => false,
-				'length' => 2,
-				'default' => 0,
-				'unsigned' => true,
-			]);
-			$table->addColumn('remember', 'smallint', [
-				'notnull' => false,
-				'length' => 1,
-				'default' => 0,
-				'unsigned' => true,
-			]);
-			$table->addColumn('last_activity', 'integer', [
-				'notnull' => false,
-				'length' => 4,
-				'default' => 0,
-				'unsigned' => true,
-			]);
-			$table->addColumn('last_check', 'integer', [
-				'notnull' => false,
-				'length' => 4,
-				'default' => 0,
-				'unsigned' => true,
-			]);
-			$table->addColumn('scope', 'text', [
-				'notnull' => false,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addUniqueIndex(['token'], 'authtoken_token_index');
-			$table->addIndex(['last_activity'], 'authtoken_last_activity_idx');
-		} else {
-			$table = $schema->getTable('authtoken');
-			$table->addColumn('scope', 'text', [
-				'notnull' => false,
-			]);
-		}
+        if (!$schema->hasTable('authtoken')) {
+            $table = $schema->createTable('authtoken');
+            $table->addColumn('id', 'integer', [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 4,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('uid', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('login_name', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('password', 'text', [
+                'notnull' => false,
+            ]);
+            $table->addColumn('name', 'text', [
+                'notnull' => true,
+                'default' => '',
+            ]);
+            $table->addColumn('token', 'string', [
+                'notnull' => true,
+                'length' => 200,
+                'default' => '',
+            ]);
+            $table->addColumn('type', 'smallint', [
+                'notnull' => false,
+                'length' => 2,
+                'default' => 0,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('remember', 'smallint', [
+                'notnull' => false,
+                'length' => 1,
+                'default' => 0,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('last_activity', 'integer', [
+                'notnull' => false,
+                'length' => 4,
+                'default' => 0,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('last_check', 'integer', [
+                'notnull' => false,
+                'length' => 4,
+                'default' => 0,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('scope', 'text', [
+                'notnull' => false,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addUniqueIndex(['token'], 'authtoken_token_index');
+            $table->addIndex(['last_activity'], 'authtoken_last_activity_idx');
+        } else {
+            $table = $schema->getTable('authtoken');
+            $table->addColumn('scope', 'text', [
+                'notnull' => false,
+            ]);
+        }
 
-		if (!$schema->hasTable('bruteforce_attempts')) {
-			$table = $schema->createTable('bruteforce_attempts');
-			$table->addColumn('id', 'integer', [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 4,
-				'unsigned' => true,
-			]);
-			$table->addColumn('action', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('occurred', 'integer', [
-				'notnull' => true,
-				'length' => 4,
-				'default' => 0,
-				'unsigned' => true,
-			]);
-			$table->addColumn('ip', 'string', [
-				'notnull' => true,
-				'length' => 255,
-				'default' => '',
-			]);
-			$table->addColumn('subnet', 'string', [
-				'notnull' => true,
-				'length' => 255,
-				'default' => '',
-			]);
-			$table->addColumn('metadata', 'string', [
-				'notnull' => true,
-				'length' => 255,
-				'default' => '',
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addIndex(['ip'], 'bruteforce_attempts_ip');
-			$table->addIndex(['subnet'], 'bruteforce_attempts_subnet');
-		}
+        if (!$schema->hasTable('bruteforce_attempts')) {
+            $table = $schema->createTable('bruteforce_attempts');
+            $table->addColumn('id', 'integer', [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 4,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('action', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('occurred', 'integer', [
+                'notnull' => true,
+                'length' => 4,
+                'default' => 0,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('ip', 'string', [
+                'notnull' => true,
+                'length' => 255,
+                'default' => '',
+            ]);
+            $table->addColumn('subnet', 'string', [
+                'notnull' => true,
+                'length' => 255,
+                'default' => '',
+            ]);
+            $table->addColumn('metadata', 'string', [
+                'notnull' => true,
+                'length' => 255,
+                'default' => '',
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addIndex(['ip'], 'bruteforce_attempts_ip');
+            $table->addIndex(['subnet'], 'bruteforce_attempts_subnet');
+        }
 
-		if (!$schema->hasTable('vcategory')) {
-			$table = $schema->createTable('vcategory');
-			$table->addColumn('id', 'integer', [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 4,
-				'unsigned' => true,
-			]);
-			$table->addColumn('uid', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('type', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('category', 'string', [
-				'notnull' => true,
-				'length' => 255,
-				'default' => '',
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addIndex(['uid'], 'uid_index');
-			$table->addIndex(['type'], 'type_index');
-			$table->addIndex(['category'], 'category_index');
-			$table->addUniqueIndex(['uid', 'type', 'category'], 'unique_category_per_user');
-		}
+        if (!$schema->hasTable('vcategory')) {
+            $table = $schema->createTable('vcategory');
+            $table->addColumn('id', 'integer', [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 4,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('uid', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('type', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('category', 'string', [
+                'notnull' => true,
+                'length' => 255,
+                'default' => '',
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addIndex(['uid'], 'uid_index');
+            $table->addIndex(['type'], 'type_index');
+            $table->addIndex(['category'], 'category_index');
+            $table->addUniqueIndex(['uid', 'type', 'category'], 'unique_category_per_user');
+        }
 
-		if (!$schema->hasTable('vcategory_to_object')) {
-			$table = $schema->createTable('vcategory_to_object');
-			$table->addColumn('objid', 'integer', [
-				'notnull' => true,
-				'length' => 4,
-				'default' => 0,
-				'unsigned' => true,
-			]);
-			$table->addColumn('categoryid', 'integer', [
-				'notnull' => true,
-				'length' => 4,
-				'default' => 0,
-				'unsigned' => true,
-			]);
-			$table->addColumn('type', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->setPrimaryKey(['categoryid', 'objid', 'type']);
-			$table->addIndex(['objid', 'type'], 'vcategory_objectd_index');
-		}
+        if (!$schema->hasTable('vcategory_to_object')) {
+            $table = $schema->createTable('vcategory_to_object');
+            $table->addColumn('objid', 'integer', [
+                'notnull' => true,
+                'length' => 4,
+                'default' => 0,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('categoryid', 'integer', [
+                'notnull' => true,
+                'length' => 4,
+                'default' => 0,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('type', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->setPrimaryKey(['categoryid', 'objid', 'type']);
+            $table->addIndex(['objid', 'type'], 'vcategory_objectd_index');
+        }
 
-		if (!$schema->hasTable('systemtag')) {
-			$table = $schema->createTable('systemtag');
-			$table->addColumn('id', 'integer', [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 4,
-				'unsigned' => true,
-			]);
-			$table->addColumn('name', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('visibility', 'smallint', [
-				'notnull' => true,
-				'length' => 1,
-				'default' => 1,
-			]);
-			$table->addColumn('editable', 'smallint', [
-				'notnull' => true,
-				'length' => 1,
-				'default' => 1,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addUniqueIndex(['name', 'visibility', 'editable'], 'tag_ident');
-		}
+        if (!$schema->hasTable('systemtag')) {
+            $table = $schema->createTable('systemtag');
+            $table->addColumn('id', 'integer', [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 4,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('name', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('visibility', 'smallint', [
+                'notnull' => true,
+                'length' => 1,
+                'default' => 1,
+            ]);
+            $table->addColumn('editable', 'smallint', [
+                'notnull' => true,
+                'length' => 1,
+                'default' => 1,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addUniqueIndex(['name', 'visibility', 'editable'], 'tag_ident');
+        }
 
-		if (!$schema->hasTable('systemtag_object_mapping')) {
-			$table = $schema->createTable('systemtag_object_mapping');
-			$table->addColumn('objectid', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('objecttype', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('systemtagid', 'integer', [
-				'notnull' => true,
-				'length' => 4,
-				'default' => 0,
-				'unsigned' => true,
-			]);
-			$table->setPrimaryKey(['objecttype', 'objectid', 'systemtagid'], 'som_pk');
-			//			$table->addUniqueIndex(['objecttype', 'objectid', 'systemtagid'], 'mapping');
-			$table->addIndex(['systemtagid', 'objecttype'], 'systag_by_tagid');
-			// systag_by_objectid was added later and might be missing in older deployments
-			$table->addIndex(['objectid'], 'systag_by_objectid');
-			// systag_objecttype was added later and might be missing in older deployments
-			$table->addIndex(['objecttype'], 'systag_objecttype');
-		}
+        if (!$schema->hasTable('systemtag_object_mapping')) {
+            $table = $schema->createTable('systemtag_object_mapping');
+            $table->addColumn('objectid', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('objecttype', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('systemtagid', 'integer', [
+                'notnull' => true,
+                'length' => 4,
+                'default' => 0,
+                'unsigned' => true,
+            ]);
+            $table->setPrimaryKey(['objecttype', 'objectid', 'systemtagid'], 'som_pk');
+            //			$table->addUniqueIndex(['objecttype', 'objectid', 'systemtagid'], 'mapping');
+            $table->addIndex(['systemtagid', 'objecttype'], 'systag_by_tagid');
+            // systag_by_objectid was added later and might be missing in older deployments
+            $table->addIndex(['objectid'], 'systag_by_objectid');
+            // systag_objecttype was added later and might be missing in older deployments
+            $table->addIndex(['objecttype'], 'systag_objecttype');
+        }
 
-		if (!$schema->hasTable('systemtag_group')) {
-			$table = $schema->createTable('systemtag_group');
-			$table->addColumn('systemtagid', 'integer', [
-				'notnull' => true,
-				'length' => 4,
-				'default' => 0,
-				'unsigned' => true,
-			]);
-			$table->addColumn('gid', 'string', [
-				'notnull' => true,
-			]);
-			$table->setPrimaryKey(['gid', 'systemtagid']);
-		}
+        if (!$schema->hasTable('systemtag_group')) {
+            $table = $schema->createTable('systemtag_group');
+            $table->addColumn('systemtagid', 'integer', [
+                'notnull' => true,
+                'length' => 4,
+                'default' => 0,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('gid', 'string', [
+                'notnull' => true,
+            ]);
+            $table->setPrimaryKey(['gid', 'systemtagid']);
+        }
 
-		if (!$schema->hasTable('file_locks')) {
-			$table = $schema->createTable('file_locks');
-			$table->addColumn('id', 'integer', [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 4,
-				'unsigned' => true,
-			]);
-			$table->addColumn('lock', 'integer', [
-				'notnull' => true,
-				'length' => 4,
-				'default' => 0,
-			]);
-			$table->addColumn('key', 'string', [
-				'notnull' => true,
-				'length' => 64,
-			]);
-			$table->addColumn('ttl', 'integer', [
-				'notnull' => true,
-				'length' => 4,
-				'default' => -1,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addUniqueIndex(['key'], 'lock_key_index');
-			$table->addIndex(['ttl'], 'lock_ttl_index');
-		}
+        if (!$schema->hasTable('file_locks')) {
+            $table = $schema->createTable('file_locks');
+            $table->addColumn('id', 'integer', [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 4,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('lock', 'integer', [
+                'notnull' => true,
+                'length' => 4,
+                'default' => 0,
+            ]);
+            $table->addColumn('key', 'string', [
+                'notnull' => true,
+                'length' => 64,
+            ]);
+            $table->addColumn('ttl', 'integer', [
+                'notnull' => true,
+                'length' => 4,
+                'default' => -1,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addUniqueIndex(['key'], 'lock_key_index');
+            $table->addIndex(['ttl'], 'lock_ttl_index');
+        }
 
-		if (!$schema->hasTable('comments')) {
-			$table = $schema->createTable('comments');
-			$table->addColumn('id', 'integer', [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 4,
-				'unsigned' => true,
-			]);
-			$table->addColumn('parent_id', 'integer', [
-				'notnull' => true,
-				'length' => 4,
-				'default' => 0,
-				'unsigned' => true,
-			]);
-			$table->addColumn('topmost_parent_id', 'integer', [
-				'notnull' => true,
-				'length' => 4,
-				'default' => 0,
-				'unsigned' => true,
-			]);
-			$table->addColumn('children_count', 'integer', [
-				'notnull' => true,
-				'length' => 4,
-				'default' => 0,
-				'unsigned' => true,
-			]);
-			$table->addColumn('actor_type', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('actor_id', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('message', 'text', [
-				'notnull' => false,
-			]);
-			$table->addColumn('verb', 'string', [
-				'notnull' => false,
-				'length' => 64,
-			]);
-			$table->addColumn('creation_timestamp', 'datetime', [
-				'notnull' => false,
-			]);
-			$table->addColumn('latest_child_timestamp', 'datetime', [
-				'notnull' => false,
-			]);
-			$table->addColumn('object_type', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('object_id', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('reference_id', 'string', [
-				'notnull' => false,
-				'length' => 64,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addIndex(['parent_id'], 'comments_parent_id_index');
-			$table->addIndex(['topmost_parent_id'], 'comments_topmost_parent_id_idx');
-			$table->addIndex(['object_type', 'object_id', 'creation_timestamp'], 'comments_object_index');
-			$table->addIndex(['actor_type', 'actor_id'], 'comments_actor_index');
-		}
+        if (!$schema->hasTable('comments')) {
+            $table = $schema->createTable('comments');
+            $table->addColumn('id', 'integer', [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 4,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('parent_id', 'integer', [
+                'notnull' => true,
+                'length' => 4,
+                'default' => 0,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('topmost_parent_id', 'integer', [
+                'notnull' => true,
+                'length' => 4,
+                'default' => 0,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('children_count', 'integer', [
+                'notnull' => true,
+                'length' => 4,
+                'default' => 0,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('actor_type', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('actor_id', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('message', 'text', [
+                'notnull' => false,
+            ]);
+            $table->addColumn('verb', 'string', [
+                'notnull' => false,
+                'length' => 64,
+            ]);
+            $table->addColumn('creation_timestamp', 'datetime', [
+                'notnull' => false,
+            ]);
+            $table->addColumn('latest_child_timestamp', 'datetime', [
+                'notnull' => false,
+            ]);
+            $table->addColumn('object_type', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('object_id', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('reference_id', 'string', [
+                'notnull' => false,
+                'length' => 64,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addIndex(['parent_id'], 'comments_parent_id_index');
+            $table->addIndex(['topmost_parent_id'], 'comments_topmost_parent_id_idx');
+            $table->addIndex(['object_type', 'object_id', 'creation_timestamp'], 'comments_object_index');
+            $table->addIndex(['actor_type', 'actor_id'], 'comments_actor_index');
+        }
 
-		if (!$schema->hasTable('comments_read_markers')) {
-			$table = $schema->createTable('comments_read_markers');
-			$table->addColumn('user_id', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('marker_datetime', 'datetime', [
-				'notnull' => false,
-			]);
-			$table->addColumn('object_type', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('object_id', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addIndex(['object_type', 'object_id'], 'comments_marker_object_index');
-			$table->setPrimaryKey(['user_id', 'object_type', 'object_id'], 'crm_pk');
-			//			$table->addUniqueIndex(['user_id', 'object_type', 'object_id'], 'comments_marker_index');
-		}
+        if (!$schema->hasTable('comments_read_markers')) {
+            $table = $schema->createTable('comments_read_markers');
+            $table->addColumn('user_id', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('marker_datetime', 'datetime', [
+                'notnull' => false,
+            ]);
+            $table->addColumn('object_type', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('object_id', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addIndex(['object_type', 'object_id'], 'comments_marker_object_index');
+            $table->setPrimaryKey(['user_id', 'object_type', 'object_id'], 'crm_pk');
+            //			$table->addUniqueIndex(['user_id', 'object_type', 'object_id'], 'comments_marker_index');
+        }
 
-		//		if (!$schema->hasTable('credentials')) {
-		//			$table = $schema->createTable('credentials');
-		//			$table->addColumn('user', 'string', [
-		//				'notnull' => false,
-		//				'length' => 64,
-		//			]);
-		//			$table->addColumn('identifier', 'string', [
-		//				'notnull' => true,
-		//				'length' => 64,
-		//			]);
-		//			$table->addColumn('credentials', 'text', [
-		//				'notnull' => false,
-		//			]);
-		//			$table->setPrimaryKey(['user', 'identifier']);
-		//			$table->addIndex(['user'], 'credentials_user');
-		//		}
+        //		if (!$schema->hasTable('credentials')) {
+        //			$table = $schema->createTable('credentials');
+        //			$table->addColumn('user', 'string', [
+        //				'notnull' => false,
+        //				'length' => 64,
+        //			]);
+        //			$table->addColumn('identifier', 'string', [
+        //				'notnull' => true,
+        //				'length' => 64,
+        //			]);
+        //			$table->addColumn('credentials', 'text', [
+        //				'notnull' => false,
+        //			]);
+        //			$table->setPrimaryKey(['user', 'identifier']);
+        //			$table->addIndex(['user'], 'credentials_user');
+        //		}
 
-		if (!$schema->hasTable('admin_sections')) {
-			$table = $schema->createTable('admin_sections');
-			$table->addColumn('id', 'string', [
-				'notnull' => true,
-				'length' => 64,
-			]);
-			$table->addColumn('class', 'string', [
-				'notnull' => true,
-				'length' => 255,
-				'default' => '',
-			]);
-			$table->addColumn('priority', 'smallint', [
-				'notnull' => true,
-				'length' => 1,
-				'default' => 0,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addUniqueIndex(['class'], 'admin_sections_class');
-		}
+        if (!$schema->hasTable('admin_sections')) {
+            $table = $schema->createTable('admin_sections');
+            $table->addColumn('id', 'string', [
+                'notnull' => true,
+                'length' => 64,
+            ]);
+            $table->addColumn('class', 'string', [
+                'notnull' => true,
+                'length' => 255,
+                'default' => '',
+            ]);
+            $table->addColumn('priority', 'smallint', [
+                'notnull' => true,
+                'length' => 1,
+                'default' => 0,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addUniqueIndex(['class'], 'admin_sections_class');
+        }
 
-		if (!$schema->hasTable('admin_settings')) {
-			$table = $schema->createTable('admin_settings');
-			$table->addColumn('id', 'integer', [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 4,
-			]);
-			$table->addColumn('class', 'string', [
-				'notnull' => true,
-				'length' => 255,
-				'default' => '',
-			]);
-			$table->addColumn('section', 'string', [
-				'notnull' => false,
-				'length' => 64,
-			]);
-			$table->addColumn('priority', 'smallint', [
-				'notnull' => true,
-				'length' => 1,
-				'default' => 0,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addUniqueIndex(['class'], 'admin_settings_class');
-			$table->addIndex(['section'], 'admin_settings_section');
-		}
+        if (!$schema->hasTable('admin_settings')) {
+            $table = $schema->createTable('admin_settings');
+            $table->addColumn('id', 'integer', [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 4,
+            ]);
+            $table->addColumn('class', 'string', [
+                'notnull' => true,
+                'length' => 255,
+                'default' => '',
+            ]);
+            $table->addColumn('section', 'string', [
+                'notnull' => false,
+                'length' => 64,
+            ]);
+            $table->addColumn('priority', 'smallint', [
+                'notnull' => true,
+                'length' => 1,
+                'default' => 0,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addUniqueIndex(['class'], 'admin_settings_class');
+            $table->addIndex(['section'], 'admin_settings_section');
+        }
 
-		if (!$schema->hasTable('personal_sections')) {
-			$table = $schema->createTable('personal_sections');
-			$table->addColumn('id', 'string', [
-				'notnull' => true,
-				'length' => 64,
-			]);
-			$table->addColumn('class', 'string', [
-				'notnull' => true,
-				'length' => 255,
-				'default' => '',
-			]);
-			$table->addColumn('priority', 'smallint', [
-				'notnull' => true,
-				'length' => 1,
-				'default' => 0,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addUniqueIndex(['class'], 'personal_sections_class');
-		}
+        if (!$schema->hasTable('personal_sections')) {
+            $table = $schema->createTable('personal_sections');
+            $table->addColumn('id', 'string', [
+                'notnull' => true,
+                'length' => 64,
+            ]);
+            $table->addColumn('class', 'string', [
+                'notnull' => true,
+                'length' => 255,
+                'default' => '',
+            ]);
+            $table->addColumn('priority', 'smallint', [
+                'notnull' => true,
+                'length' => 1,
+                'default' => 0,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addUniqueIndex(['class'], 'personal_sections_class');
+        }
 
-		if (!$schema->hasTable('personal_settings')) {
-			$table = $schema->createTable('personal_settings');
-			$table->addColumn('id', 'integer', [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 4,
-			]);
-			$table->addColumn('class', 'string', [
-				'notnull' => true,
-				'length' => 255,
-				'default' => '',
-			]);
-			$table->addColumn('section', 'string', [
-				'notnull' => false,
-				'length' => 64,
-			]);
-			$table->addColumn('priority', 'smallint', [
-				'notnull' => true,
-				'length' => 1,
-				'default' => 0,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addUniqueIndex(['class'], 'personal_settings_class');
-			$table->addIndex(['section'], 'personal_settings_section');
-		}
+        if (!$schema->hasTable('personal_settings')) {
+            $table = $schema->createTable('personal_settings');
+            $table->addColumn('id', 'integer', [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 4,
+            ]);
+            $table->addColumn('class', 'string', [
+                'notnull' => true,
+                'length' => 255,
+                'default' => '',
+            ]);
+            $table->addColumn('section', 'string', [
+                'notnull' => false,
+                'length' => 64,
+            ]);
+            $table->addColumn('priority', 'smallint', [
+                'notnull' => true,
+                'length' => 1,
+                'default' => 0,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addUniqueIndex(['class'], 'personal_settings_class');
+            $table->addIndex(['section'], 'personal_settings_section');
+        }
 
-		if (!$schema->hasTable('accounts')) {
-			$table = $schema->createTable('accounts');
-			$table->addColumn('uid', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('data', 'text', [
-				'notnull' => true,
-				'default' => '',
-			]);
-			$table->setPrimaryKey(['uid']);
-		}
-		return $schema;
-	}
+        if (!$schema->hasTable('accounts')) {
+            $table = $schema->createTable('accounts');
+            $table->addColumn('uid', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('data', 'text', [
+                'notnull' => true,
+                'default' => '',
+            ]);
+            $table->setPrimaryKey(['uid']);
+        }
+        return $schema;
+    }
 
-	public function postSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
-		if (!$schema->hasTable('dav_properties')) {
-			return;
-		}
-		$query = $this->connection->getQueryBuilder();
-		$query->select('*')
-			->from('dav_properties');
-		$result = $query->executeQuery();
+    public function postSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
+        if (!$schema->hasTable('dav_properties')) {
+            return;
+        }
+        $query = $this->connection->getQueryBuilder();
+        $query->select('*')
+            ->from('dav_properties');
+        $result = $query->executeQuery();
 
-		$insert = $this->connection->getQueryBuilder();
-		$insert->insert('properties')
-			->setValue('propertypath', $insert->createParameter('propertypath'))
-			->setValue('propertyname', $insert->createParameter('propertyname'))
-			->setValue('propertyvalue', $insert->createParameter('propertyvalue'))
-			->setValue('userid', $insert->createParameter('userid'));
+        $insert = $this->connection->getQueryBuilder();
+        $insert->insert('properties')
+            ->setValue('propertypath', $insert->createParameter('propertypath'))
+            ->setValue('propertyname', $insert->createParameter('propertyname'))
+            ->setValue('propertyvalue', $insert->createParameter('propertyvalue'))
+            ->setValue('userid', $insert->createParameter('userid'));
 
-		while ($row = $result->fetchAssociative()) {
-			preg_match('/(calendar)\/([A-z0-9-@_]+)\//', $row['propertypath'], $match);
-			$insert->setParameter('propertypath', (string)$row['propertypath'])
-				->setParameter('propertyname', (string)$row['propertyname'])
-				->setParameter('propertyvalue', (string)$row['propertyvalue'])
-				->setParameter('userid', ($match[2] ?? ''));
-			$insert->executeStatement();
-		}
-	}
+        while ($row = $result->fetchAssociative()) {
+            preg_match('/(calendar)\/([A-z0-9-@_]+)\//', $row['propertypath'], $match);
+            $insert->setParameter('propertypath', (string)$row['propertypath'])
+                ->setParameter('propertyname', (string)$row['propertyname'])
+                ->setParameter('propertyvalue', (string)$row['propertyvalue'])
+                ->setParameter('userid', ($match[2] ?? ''));
+            $insert->executeStatement();
+        }
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -1019,9 +1019,9 @@
 
 		while ($row = $result->fetchAssociative()) {
 			preg_match('/(calendar)\/([A-z0-9-@_]+)\//', $row['propertypath'], $match);
-			$insert->setParameter('propertypath', (string)$row['propertypath'])
-				->setParameter('propertyname', (string)$row['propertyname'])
-				->setParameter('propertyvalue', (string)$row['propertyvalue'])
+			$insert->setParameter('propertypath', (string) $row['propertypath'])
+				->setParameter('propertyname', (string) $row['propertyname'])
+				->setParameter('propertyvalue', (string) $row['propertyvalue'])
 				->setParameter('userid', ($match[2] ?? ''));
 			$insert->executeStatement();
 		}

core/Migrations/Version20000Date20201109081918.php

Indentation +63 added lines, -63 removed lines

@@ -16,74 +16,74 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version20000Date20201109081918 extends SimpleMigrationStep {
-	public function __construct(
-		protected IDBConnection $connection,
-	) {
-	}
+    public function __construct(
+        protected IDBConnection $connection,
+    ) {
+    }
 
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		if (!$schema->hasTable('storages_credentials')) {
-			$table = $schema->createTable('storages_credentials');
-			$table->addColumn('id', Types::BIGINT, [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 64,
-			]);
-			$table->addColumn('user', Types::STRING, [
-				'notnull' => false,
-				'length' => 64,
-			]);
-			$table->addColumn('identifier', Types::STRING, [
-				'notnull' => true,
-				'length' => 64,
-			]);
-			$table->addColumn('credentials', Types::TEXT, [
-				'notnull' => false,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addUniqueIndex(['user', 'identifier'], 'stocred_ui');
-			$table->addIndex(['user'], 'stocred_user');
-		}
+        if (!$schema->hasTable('storages_credentials')) {
+            $table = $schema->createTable('storages_credentials');
+            $table->addColumn('id', Types::BIGINT, [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 64,
+            ]);
+            $table->addColumn('user', Types::STRING, [
+                'notnull' => false,
+                'length' => 64,
+            ]);
+            $table->addColumn('identifier', Types::STRING, [
+                'notnull' => true,
+                'length' => 64,
+            ]);
+            $table->addColumn('credentials', Types::TEXT, [
+                'notnull' => false,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addUniqueIndex(['user', 'identifier'], 'stocred_ui');
+            $table->addIndex(['user'], 'stocred_user');
+        }
 
-		return $schema;
-	}
+        return $schema;
+    }
 
-	/**
-	 * {@inheritDoc}
-	 *
-	 * @since 13.0.0
-	 */
-	public function postSchemaChange(IOutput $output, \Closure $schemaClosure, array $options): void {
-		if (!$this->connection->tableExists('credentials')) {
-			return;
-		}
+    /**
+     * {@inheritDoc}
+     *
+     * @since 13.0.0
+     */
+    public function postSchemaChange(IOutput $output, \Closure $schemaClosure, array $options): void {
+        if (!$this->connection->tableExists('credentials')) {
+            return;
+        }
 
-		$query = $this->connection->getQueryBuilder();
-		$query->select('*')
-			->from('credentials');
+        $query = $this->connection->getQueryBuilder();
+        $query->select('*')
+            ->from('credentials');
 
-		$insert = $this->connection->getQueryBuilder();
-		$insert->insert('storages_credentials')
-			->setValue('user', $insert->createParameter('user'))
-			->setValue('identifier', $insert->createParameter('identifier'))
-			->setValue('credentials', $insert->createParameter('credentials'));
+        $insert = $this->connection->getQueryBuilder();
+        $insert->insert('storages_credentials')
+            ->setValue('user', $insert->createParameter('user'))
+            ->setValue('identifier', $insert->createParameter('identifier'))
+            ->setValue('credentials', $insert->createParameter('credentials'));
 
-		$result = $query->executeQuery();
-		while ($row = $result->fetchAssociative()) {
-			$insert->setParameter('user', (string)$row['user'])
-				->setParameter('identifier', (string)$row['identifier'])
-				->setParameter('credentials', (string)$row['credentials']);
-			$insert->executeStatement();
-		}
-		$result->closeCursor();
-	}
+        $result = $query->executeQuery();
+        while ($row = $result->fetchAssociative()) {
+            $insert->setParameter('user', (string)$row['user'])
+                ->setParameter('identifier', (string)$row['identifier'])
+                ->setParameter('credentials', (string)$row['credentials']);
+            $insert->executeStatement();
+        }
+        $result->closeCursor();
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -79,9 +79,9 @@
 
 		$result = $query->executeQuery();
 		while ($row = $result->fetchAssociative()) {
-			$insert->setParameter('user', (string)$row['user'])
-				->setParameter('identifier', (string)$row['identifier'])
-				->setParameter('credentials', (string)$row['credentials']);
+			$insert->setParameter('user', (string) $row['user'])
+				->setParameter('identifier', (string) $row['identifier'])
+				->setParameter('credentials', (string) $row['credentials']);
 			$insert->executeStatement();
 		}
 		$result->closeCursor();

core/Migrations/Version33000Date20251023120529.php

Indentation +53 added lines, -53 removed lines

@@ -21,66 +21,66 @@
  */
 #[AddIndex(table: 'preview_locations', type: IndexType::UNIQUE)]
 class Version33000Date20251023120529 extends SimpleMigrationStep {
-	public function __construct(
-		private readonly IDBConnection $connection,
-	) {
-	}
+    public function __construct(
+        private readonly IDBConnection $connection,
+    ) {
+    }
 
-	/**
-	 * @param Closure(): ISchemaWrapper $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param Closure(): ISchemaWrapper $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		if ($schema->hasTable('preview_locations')) {
-			$table = $schema->getTable('preview_locations');
-			$table->addUniqueIndex(['bucket_name', 'object_store_name'], 'unique_bucket_store');
-		}
+        if ($schema->hasTable('preview_locations')) {
+            $table = $schema->getTable('preview_locations');
+            $table->addUniqueIndex(['bucket_name', 'object_store_name'], 'unique_bucket_store');
+        }
 
-		return $schema;
-	}
+        return $schema;
+    }
 
-	public function preSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
-		// This shouldn't run on a production instance, only daily
-		$qb = $this->connection->getQueryBuilder();
-		$qb->select('*')
-			->from('preview_locations');
-		$result = $qb->executeQuery();
+    public function preSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
+        // This shouldn't run on a production instance, only daily
+        $qb = $this->connection->getQueryBuilder();
+        $qb->select('*')
+            ->from('preview_locations');
+        $result = $qb->executeQuery();
 
-		$set = [];
+        $set = [];
 
-		while ($row = $result->fetchAssociative()) {
-			// Iterate over all the rows with duplicated rows
-			$id = $row['id'];
+        while ($row = $result->fetchAssociative()) {
+            // Iterate over all the rows with duplicated rows
+            $id = $row['id'];
 
-			if (isset($set[$row['bucket_name'] . '_' . $row['object_store_name']])) {
-				// duplicate
-				$authoritativeId = $set[$row['bucket_name'] . '_' . $row['object_store_name']];
-				$qb = $this->connection->getQueryBuilder();
-				$qb->select('id')
-					->from('preview_locations')
-					->where($qb->expr()->eq('bucket_name', $qb->createNamedParameter($row['bucket_name'])))
-					->andWhere($qb->expr()->eq('object_store_name', $qb->createNamedParameter($row['object_store_name'])))
-					->andWhere($qb->expr()->neq('id', $qb->createNamedParameter($authoritativeId)));
+            if (isset($set[$row['bucket_name'] . '_' . $row['object_store_name']])) {
+                // duplicate
+                $authoritativeId = $set[$row['bucket_name'] . '_' . $row['object_store_name']];
+                $qb = $this->connection->getQueryBuilder();
+                $qb->select('id')
+                    ->from('preview_locations')
+                    ->where($qb->expr()->eq('bucket_name', $qb->createNamedParameter($row['bucket_name'])))
+                    ->andWhere($qb->expr()->eq('object_store_name', $qb->createNamedParameter($row['object_store_name'])))
+                    ->andWhere($qb->expr()->neq('id', $qb->createNamedParameter($authoritativeId)));
 
-				$result = $qb->executeQuery();
-				while ($row = $result->fetchAssociative()) {
-					// Update previews entries to the now de-duplicated id
-					$qb = $this->connection->getQueryBuilder();
-					$qb->update('previews')
-						->set('location_id', $qb->createNamedParameter($id))
-						->where($qb->expr()->eq('id', $qb->createNamedParameter($row['id'])));
-					$qb->executeStatement();
+                $result = $qb->executeQuery();
+                while ($row = $result->fetchAssociative()) {
+                    // Update previews entries to the now de-duplicated id
+                    $qb = $this->connection->getQueryBuilder();
+                    $qb->update('previews')
+                        ->set('location_id', $qb->createNamedParameter($id))
+                        ->where($qb->expr()->eq('id', $qb->createNamedParameter($row['id'])));
+                    $qb->executeStatement();
 
-					$qb = $this->connection->getQueryBuilder();
-					$qb->delete('preview_locations')
-						->where($qb->expr()->eq('id', $qb->createNamedParameter($row['id'])));
-					$qb->executeStatement();
-				}
-				break;
-			}
-			$set[$row['bucket_name'] . '_' . $row['object_store_name']] = $row['id'];
-		}
-	}
+                    $qb = $this->connection->getQueryBuilder();
+                    $qb->delete('preview_locations')
+                        ->where($qb->expr()->eq('id', $qb->createNamedParameter($row['id'])));
+                    $qb->executeStatement();
+                }
+                break;
+            }
+            $set[$row['bucket_name'] . '_' . $row['object_store_name']] = $row['id'];
+        }
+    }
 }