nextcloud / server

lib/private/Files/Config/UserMountCache.php

Indentation +444 added lines, -444 removed lines

@@ -46,448 +46,448 @@
  * Cache mounts points per user in the cache so we can easily look them up
  */
 class UserMountCache implements IUserMountCache {
-	private IDBConnection $connection;
-	private IUserManager $userManager;
-
-	/**
-	 * Cached mount info.
-	 * @var CappedMemoryCache<ICachedMountInfo[]>
-	 **/
-	private CappedMemoryCache $mountsForUsers;
-	private LoggerInterface $logger;
-	/** @var CappedMemoryCache<array> */
-	private CappedMemoryCache $cacheInfoCache;
-	private IEventLogger $eventLogger;
-
-	/**
-	 * UserMountCache constructor.
-	 */
-	public function __construct(
-		IDBConnection $connection,
-		IUserManager $userManager,
-		LoggerInterface $logger,
-		IEventLogger $eventLogger
-	) {
-		$this->connection = $connection;
-		$this->userManager = $userManager;
-		$this->logger = $logger;
-		$this->eventLogger = $eventLogger;
-		$this->cacheInfoCache = new CappedMemoryCache();
-		$this->mountsForUsers = new CappedMemoryCache();
-	}
-
-	public function registerMounts(IUser $user, array $mounts, array $mountProviderClasses = null) {
-		$this->eventLogger->start('fs:setup:user:register', 'Registering mounts for user');
-		// filter out non-proper storages coming from unit tests
-		$mounts = array_filter($mounts, function (IMountPoint $mount) {
-			return $mount instanceof SharedMount || ($mount->getStorage() && $mount->getStorage()->getCache());
-		});
-		/** @var ICachedMountInfo[] $newMounts */
-		$newMounts = array_map(function (IMountPoint $mount) use ($user) {
-			// filter out any storages which aren't scanned yet since we aren't interested in files from those storages (yet)
-			if ($mount->getStorageRootId() === -1) {
-				return null;
-			} else {
-				return new LazyStorageMountInfo($user, $mount);
-			}
-		}, $mounts);
-		$newMounts = array_values(array_filter($newMounts));
-		$newMountKeys = array_map(function (ICachedMountInfo $mount) {
-			return $mount->getRootId() . '::' . $mount->getMountPoint();
-		}, $newMounts);
-		$newMounts = array_combine($newMountKeys, $newMounts);
-
-		$cachedMounts = $this->getMountsForUser($user);
-		if (is_array($mountProviderClasses)) {
-			$cachedMounts = array_filter($cachedMounts, function (ICachedMountInfo $mountInfo) use ($mountProviderClasses, $newMounts) {
-				// for existing mounts that didn't have a mount provider set
-				// we still want the ones that map to new mounts
-				$mountKey = $mountInfo->getRootId() . '::' . $mountInfo->getMountPoint();
-				if ($mountInfo->getMountProvider() === '' && isset($newMounts[$mountKey])) {
-					return true;
-				}
-				return in_array($mountInfo->getMountProvider(), $mountProviderClasses);
-			});
-		}
-		$cachedRootKeys = array_map(function (ICachedMountInfo $mount) {
-			return $mount->getRootId() . '::' . $mount->getMountPoint();
-		}, $cachedMounts);
-		$cachedMounts = array_combine($cachedRootKeys, $cachedMounts);
-
-		$addedMounts = [];
-		$removedMounts = [];
-
-		foreach ($newMounts as $mountKey => $newMount) {
-			if (!isset($cachedMounts[$mountKey])) {
-				$addedMounts[] = $newMount;
-			}
-		}
-
-		foreach ($cachedMounts as $mountKey => $cachedMount) {
-			if (!isset($newMounts[$mountKey])) {
-				$removedMounts[] = $cachedMount;
-			}
-		}
-
-		$changedMounts = $this->findChangedMounts($newMounts, $cachedMounts);
-
-		$this->connection->beginTransaction();
-		try {
-			foreach ($addedMounts as $mount) {
-				$this->addToCache($mount);
-				/** @psalm-suppress InvalidArgument */
-				$this->mountsForUsers[$user->getUID()][] = $mount;
-			}
-			foreach ($removedMounts as $mount) {
-				$this->removeFromCache($mount);
-				$index = array_search($mount, $this->mountsForUsers[$user->getUID()]);
-				unset($this->mountsForUsers[$user->getUID()][$index]);
-			}
-			foreach ($changedMounts as $mount) {
-				$this->updateCachedMount($mount);
-			}
-			$this->connection->commit();
-		} catch (\Throwable $e) {
-			$this->connection->rollBack();
-			throw $e;
-		}
-		$this->eventLogger->end('fs:setup:user:register');
-	}
-
-	/**
-	 * @param ICachedMountInfo[] $newMounts
-	 * @param ICachedMountInfo[] $cachedMounts
-	 * @return ICachedMountInfo[]
-	 */
-	private function findChangedMounts(array $newMounts, array $cachedMounts) {
-		$new = [];
-		foreach ($newMounts as $mount) {
-			$new[$mount->getRootId() . '::' . $mount->getMountPoint()] = $mount;
-		}
-		$changed = [];
-		foreach ($cachedMounts as $cachedMount) {
-			$key = $cachedMount->getRootId() . '::' . $cachedMount->getMountPoint();
-			if (isset($new[$key])) {
-				$newMount = $new[$key];
-				if (
-					$newMount->getMountPoint() !== $cachedMount->getMountPoint() ||
-					$newMount->getStorageId() !== $cachedMount->getStorageId() ||
-					$newMount->getMountId() !== $cachedMount->getMountId() ||
-					$newMount->getMountProvider() !== $cachedMount->getMountProvider()
-				) {
-					$changed[] = $newMount;
-				}
-			}
-		}
-		return $changed;
-	}
-
-	private function addToCache(ICachedMountInfo $mount) {
-		if ($mount->getStorageId() !== -1) {
-			$this->connection->insertIfNotExist('*PREFIX*mounts', [
-				'storage_id' => $mount->getStorageId(),
-				'root_id' => $mount->getRootId(),
-				'user_id' => $mount->getUser()->getUID(),
-				'mount_point' => $mount->getMountPoint(),
-				'mount_id' => $mount->getMountId(),
-				'mount_provider_class' => $mount->getMountProvider(),
-			], ['root_id', 'user_id', 'mount_point']);
-		} else {
-			// in some cases this is legitimate, like orphaned shares
-			$this->logger->debug('Could not get storage info for mount at ' . $mount->getMountPoint());
-		}
-	}
-
-	private function updateCachedMount(ICachedMountInfo $mount) {
-		$builder = $this->connection->getQueryBuilder();
-
-		$query = $builder->update('mounts')
-			->set('storage_id', $builder->createNamedParameter($mount->getStorageId()))
-			->set('mount_point', $builder->createNamedParameter($mount->getMountPoint()))
-			->set('mount_id', $builder->createNamedParameter($mount->getMountId(), IQueryBuilder::PARAM_INT))
-			->set('mount_provider_class', $builder->createNamedParameter($mount->getMountProvider()))
-			->where($builder->expr()->eq('user_id', $builder->createNamedParameter($mount->getUser()->getUID())))
-			->andWhere($builder->expr()->eq('root_id', $builder->createNamedParameter($mount->getRootId(), IQueryBuilder::PARAM_INT)));
-
-		$query->execute();
-	}
-
-	private function removeFromCache(ICachedMountInfo $mount) {
-		$builder = $this->connection->getQueryBuilder();
-
-		$query = $builder->delete('mounts')
-			->where($builder->expr()->eq('user_id', $builder->createNamedParameter($mount->getUser()->getUID())))
-			->andWhere($builder->expr()->eq('root_id', $builder->createNamedParameter($mount->getRootId(), IQueryBuilder::PARAM_INT)))
-			->andWhere($builder->expr()->eq('mount_point', $builder->createNamedParameter($mount->getMountPoint())));
-		$query->execute();
-	}
-
-	private function dbRowToMountInfo(array $row) {
-		$user = $this->userManager->get($row['user_id']);
-		if (is_null($user)) {
-			return null;
-		}
-		$mount_id = $row['mount_id'];
-		if (!is_null($mount_id)) {
-			$mount_id = (int)$mount_id;
-		}
-		return new CachedMountInfo(
-			$user,
-			(int)$row['storage_id'],
-			(int)$row['root_id'],
-			$row['mount_point'],
-			$row['mount_provider_class'] ?? '',
-			$mount_id,
-			isset($row['path']) ? $row['path'] : '',
-		);
-	}
-
-	/**
-	 * @param IUser $user
-	 * @return ICachedMountInfo[]
-	 */
-	public function getMountsForUser(IUser $user) {
-		if (!isset($this->mountsForUsers[$user->getUID()])) {
-			$builder = $this->connection->getQueryBuilder();
-			$query = $builder->select('storage_id', 'root_id', 'user_id', 'mount_point', 'mount_id', 'f.path', 'mount_provider_class')
-				->from('mounts', 'm')
-				->innerJoin('m', 'filecache', 'f', $builder->expr()->eq('m.root_id', 'f.fileid'))
-				->where($builder->expr()->eq('user_id', $builder->createPositionalParameter($user->getUID())));
-
-			$result = $query->execute();
-			$rows = $result->fetchAll();
-			$result->closeCursor();
-
-			$this->mountsForUsers[$user->getUID()] = array_filter(array_map([$this, 'dbRowToMountInfo'], $rows));
-		}
-		return $this->mountsForUsers[$user->getUID()];
-	}
-
-	/**
-	 * @param int $numericStorageId
-	 * @param string|null $user limit the results to a single user
-	 * @return CachedMountInfo[]
-	 */
-	public function getMountsForStorageId($numericStorageId, $user = null) {
-		$builder = $this->connection->getQueryBuilder();
-		$query = $builder->select('storage_id', 'root_id', 'user_id', 'mount_point', 'mount_id', 'f.path', 'mount_provider_class')
-			->from('mounts', 'm')
-			->innerJoin('m', 'filecache', 'f', $builder->expr()->eq('m.root_id', 'f.fileid'))
-			->where($builder->expr()->eq('storage_id', $builder->createPositionalParameter($numericStorageId, IQueryBuilder::PARAM_INT)));
-
-		if ($user) {
-			$query->andWhere($builder->expr()->eq('user_id', $builder->createPositionalParameter($user)));
-		}
-
-		$result = $query->execute();
-		$rows = $result->fetchAll();
-		$result->closeCursor();
-
-		return array_filter(array_map([$this, 'dbRowToMountInfo'], $rows));
-	}
-
-	/**
-	 * @param int $rootFileId
-	 * @return CachedMountInfo[]
-	 */
-	public function getMountsForRootId($rootFileId) {
-		$builder = $this->connection->getQueryBuilder();
-		$query = $builder->select('storage_id', 'root_id', 'user_id', 'mount_point', 'mount_id', 'f.path', 'mount_provider_class')
-			->from('mounts', 'm')
-			->innerJoin('m', 'filecache', 'f', $builder->expr()->eq('m.root_id', 'f.fileid'))
-			->where($builder->expr()->eq('root_id', $builder->createPositionalParameter($rootFileId, IQueryBuilder::PARAM_INT)));
-
-		$result = $query->execute();
-		$rows = $result->fetchAll();
-		$result->closeCursor();
-
-		return array_filter(array_map([$this, 'dbRowToMountInfo'], $rows));
-	}
-
-	/**
-	 * @param $fileId
-	 * @return array{int, string, int}
-	 * @throws \OCP\Files\NotFoundException
-	 */
-	private function getCacheInfoFromFileId($fileId): array {
-		if (!isset($this->cacheInfoCache[$fileId])) {
-			$builder = $this->connection->getQueryBuilder();
-			$query = $builder->select('storage', 'path', 'mimetype')
-				->from('filecache')
-				->where($builder->expr()->eq('fileid', $builder->createNamedParameter($fileId, IQueryBuilder::PARAM_INT)));
-
-			$result = $query->execute();
-			$row = $result->fetch();
-			$result->closeCursor();
-
-			if (is_array($row)) {
-				$this->cacheInfoCache[$fileId] = [
-					(int)$row['storage'],
-					(string)$row['path'],
-					(int)$row['mimetype']
-				];
-			} else {
-				throw new NotFoundException('File with id "' . $fileId . '" not found');
-			}
-		}
-		return $this->cacheInfoCache[$fileId];
-	}
-
-	/**
-	 * @param int $fileId
-	 * @param string|null $user optionally restrict the results to a single user
-	 * @return ICachedMountFileInfo[]
-	 * @since 9.0.0
-	 */
-	public function getMountsForFileId($fileId, $user = null) {
-		try {
-			[$storageId, $internalPath] = $this->getCacheInfoFromFileId($fileId);
-		} catch (NotFoundException $e) {
-			return [];
-		}
-		$builder = $this->connection->getQueryBuilder();
-		$query = $builder->select('storage_id', 'root_id', 'user_id', 'mount_point', 'mount_id', 'f.path', 'mount_provider_class')
-			->from('mounts', 'm')
-			->innerJoin('m', 'filecache', 'f', $builder->expr()->eq('m.root_id', 'f.fileid'))
-			->where($builder->expr()->eq('storage_id', $builder->createPositionalParameter($storageId, IQueryBuilder::PARAM_INT)));
-
-		if ($user) {
-			$query->andWhere($builder->expr()->eq('user_id', $builder->createPositionalParameter($user)));
-		}
-
-		$result = $query->execute();
-		$rows = $result->fetchAll();
-		$result->closeCursor();
-		// filter mounts that are from the same storage but a different directory
-		$filteredMounts = array_filter($rows, function (array $row) use ($internalPath, $fileId) {
-			if ($fileId === (int)$row['root_id']) {
-				return true;
-			}
-			$internalMountPath = $row['path'] ?? '';
-
-			return $internalMountPath === '' || substr($internalPath, 0, strlen($internalMountPath) + 1) === $internalMountPath . '/';
-		});
-
-		$filteredMounts = array_filter(array_map([$this, 'dbRowToMountInfo'], $filteredMounts));
-		return array_map(function (ICachedMountInfo $mount) use ($internalPath) {
-			return new CachedMountFileInfo(
-				$mount->getUser(),
-				$mount->getStorageId(),
-				$mount->getRootId(),
-				$mount->getMountPoint(),
-				$mount->getMountId(),
-				$mount->getMountProvider(),
-				$mount->getRootInternalPath(),
-				$internalPath
-			);
-		}, $filteredMounts);
-	}
-
-	/**
-	 * Remove all cached mounts for a user
-	 *
-	 * @param IUser $user
-	 */
-	public function removeUserMounts(IUser $user) {
-		$builder = $this->connection->getQueryBuilder();
-
-		$query = $builder->delete('mounts')
-			->where($builder->expr()->eq('user_id', $builder->createNamedParameter($user->getUID())));
-		$query->execute();
-	}
-
-	public function removeUserStorageMount($storageId, $userId) {
-		$builder = $this->connection->getQueryBuilder();
-
-		$query = $builder->delete('mounts')
-			->where($builder->expr()->eq('user_id', $builder->createNamedParameter($userId)))
-			->andWhere($builder->expr()->eq('storage_id', $builder->createNamedParameter($storageId, IQueryBuilder::PARAM_INT)));
-		$query->execute();
-	}
-
-	public function remoteStorageMounts($storageId) {
-		$builder = $this->connection->getQueryBuilder();
-
-		$query = $builder->delete('mounts')
-			->where($builder->expr()->eq('storage_id', $builder->createNamedParameter($storageId, IQueryBuilder::PARAM_INT)));
-		$query->execute();
-	}
-
-	/**
-	 * @param array $users
-	 * @return array
-	 */
-	public function getUsedSpaceForUsers(array $users) {
-		$builder = $this->connection->getQueryBuilder();
-
-		$slash = $builder->createNamedParameter('/');
-
-		$mountPoint = $builder->func()->concat(
-			$builder->func()->concat($slash, 'user_id'),
-			$slash
-		);
-
-		$userIds = array_map(function (IUser $user) {
-			return $user->getUID();
-		}, $users);
-
-		$query = $builder->select('m.user_id', 'f.size')
-			->from('mounts', 'm')
-			->innerJoin('m', 'filecache', 'f',
-				$builder->expr()->andX(
-					$builder->expr()->eq('m.storage_id', 'f.storage'),
-					$builder->expr()->eq('f.path_hash', $builder->createNamedParameter(md5('files')))
-				))
-			->where($builder->expr()->eq('m.mount_point', $mountPoint))
-			->andWhere($builder->expr()->in('m.user_id', $builder->createNamedParameter($userIds, IQueryBuilder::PARAM_STR_ARRAY)));
-
-		$result = $query->execute();
-
-		$results = [];
-		while ($row = $result->fetch()) {
-			$results[$row['user_id']] = $row['size'];
-		}
-		$result->closeCursor();
-		return $results;
-	}
-
-	public function clear(): void {
-		$this->cacheInfoCache = new CappedMemoryCache();
-		$this->mountsForUsers = new CappedMemoryCache();
-	}
-
-	public function getMountForPath(IUser $user, string $path): ICachedMountInfo {
-		$mounts = $this->getMountsForUser($user);
-		$mountPoints = array_map(function (ICachedMountInfo $mount) {
-			return $mount->getMountPoint();
-		}, $mounts);
-		$mounts = array_combine($mountPoints, $mounts);
-
-		$current = $path;
-		// walk up the directory tree until we find a path that has a mountpoint set
-		// the loop will return if a mountpoint is found or break if none are found
-		while (true) {
-			$mountPoint = $current . '/';
-			if (isset($mounts[$mountPoint])) {
-				return $mounts[$mountPoint];
-			} elseif ($current === '') {
-				break;
-			}
-
-			$current = dirname($current);
-			if ($current === '.' || $current === '/') {
-				$current = '';
-			}
-		}
-
-		throw new NotFoundException("No cached mount for path " . $path);
-	}
-
-	public function getMountsInPath(IUser $user, string $path): array {
-		$path = rtrim($path, '/') . '/';
-		$mounts = $this->getMountsForUser($user);
-		return array_filter($mounts, function (ICachedMountInfo $mount) use ($path) {
-			return $mount->getMountPoint() !== $path && strpos($mount->getMountPoint(), $path) === 0;
-		});
-	}
+    private IDBConnection $connection;
+    private IUserManager $userManager;
+
+    /**
+     * Cached mount info.
+     * @var CappedMemoryCache<ICachedMountInfo[]>
+     **/
+    private CappedMemoryCache $mountsForUsers;
+    private LoggerInterface $logger;
+    /** @var CappedMemoryCache<array> */
+    private CappedMemoryCache $cacheInfoCache;
+    private IEventLogger $eventLogger;
+
+    /**
+     * UserMountCache constructor.
+     */
+    public function __construct(
+        IDBConnection $connection,
+        IUserManager $userManager,
+        LoggerInterface $logger,
+        IEventLogger $eventLogger
+    ) {
+        $this->connection = $connection;
+        $this->userManager = $userManager;
+        $this->logger = $logger;
+        $this->eventLogger = $eventLogger;
+        $this->cacheInfoCache = new CappedMemoryCache();
+        $this->mountsForUsers = new CappedMemoryCache();
+    }
+
+    public function registerMounts(IUser $user, array $mounts, array $mountProviderClasses = null) {
+        $this->eventLogger->start('fs:setup:user:register', 'Registering mounts for user');
+        // filter out non-proper storages coming from unit tests
+        $mounts = array_filter($mounts, function (IMountPoint $mount) {
+            return $mount instanceof SharedMount || ($mount->getStorage() && $mount->getStorage()->getCache());
+        });
+        /** @var ICachedMountInfo[] $newMounts */
+        $newMounts = array_map(function (IMountPoint $mount) use ($user) {
+            // filter out any storages which aren't scanned yet since we aren't interested in files from those storages (yet)
+            if ($mount->getStorageRootId() === -1) {
+                return null;
+            } else {
+                return new LazyStorageMountInfo($user, $mount);
+            }
+        }, $mounts);
+        $newMounts = array_values(array_filter($newMounts));
+        $newMountKeys = array_map(function (ICachedMountInfo $mount) {
+            return $mount->getRootId() . '::' . $mount->getMountPoint();
+        }, $newMounts);
+        $newMounts = array_combine($newMountKeys, $newMounts);
+
+        $cachedMounts = $this->getMountsForUser($user);
+        if (is_array($mountProviderClasses)) {
+            $cachedMounts = array_filter($cachedMounts, function (ICachedMountInfo $mountInfo) use ($mountProviderClasses, $newMounts) {
+                // for existing mounts that didn't have a mount provider set
+                // we still want the ones that map to new mounts
+                $mountKey = $mountInfo->getRootId() . '::' . $mountInfo->getMountPoint();
+                if ($mountInfo->getMountProvider() === '' && isset($newMounts[$mountKey])) {
+                    return true;
+                }
+                return in_array($mountInfo->getMountProvider(), $mountProviderClasses);
+            });
+        }
+        $cachedRootKeys = array_map(function (ICachedMountInfo $mount) {
+            return $mount->getRootId() . '::' . $mount->getMountPoint();
+        }, $cachedMounts);
+        $cachedMounts = array_combine($cachedRootKeys, $cachedMounts);
+
+        $addedMounts = [];
+        $removedMounts = [];
+
+        foreach ($newMounts as $mountKey => $newMount) {
+            if (!isset($cachedMounts[$mountKey])) {
+                $addedMounts[] = $newMount;
+            }
+        }
+
+        foreach ($cachedMounts as $mountKey => $cachedMount) {
+            if (!isset($newMounts[$mountKey])) {
+                $removedMounts[] = $cachedMount;
+            }
+        }
+
+        $changedMounts = $this->findChangedMounts($newMounts, $cachedMounts);
+
+        $this->connection->beginTransaction();
+        try {
+            foreach ($addedMounts as $mount) {
+                $this->addToCache($mount);
+                /** @psalm-suppress InvalidArgument */
+                $this->mountsForUsers[$user->getUID()][] = $mount;
+            }
+            foreach ($removedMounts as $mount) {
+                $this->removeFromCache($mount);
+                $index = array_search($mount, $this->mountsForUsers[$user->getUID()]);
+                unset($this->mountsForUsers[$user->getUID()][$index]);
+            }
+            foreach ($changedMounts as $mount) {
+                $this->updateCachedMount($mount);
+            }
+            $this->connection->commit();
+        } catch (\Throwable $e) {
+            $this->connection->rollBack();
+            throw $e;
+        }
+        $this->eventLogger->end('fs:setup:user:register');
+    }
+
+    /**
+     * @param ICachedMountInfo[] $newMounts
+     * @param ICachedMountInfo[] $cachedMounts
+     * @return ICachedMountInfo[]
+     */
+    private function findChangedMounts(array $newMounts, array $cachedMounts) {
+        $new = [];
+        foreach ($newMounts as $mount) {
+            $new[$mount->getRootId() . '::' . $mount->getMountPoint()] = $mount;
+        }
+        $changed = [];
+        foreach ($cachedMounts as $cachedMount) {
+            $key = $cachedMount->getRootId() . '::' . $cachedMount->getMountPoint();
+            if (isset($new[$key])) {
+                $newMount = $new[$key];
+                if (
+                    $newMount->getMountPoint() !== $cachedMount->getMountPoint() ||
+                    $newMount->getStorageId() !== $cachedMount->getStorageId() ||
+                    $newMount->getMountId() !== $cachedMount->getMountId() ||
+                    $newMount->getMountProvider() !== $cachedMount->getMountProvider()
+                ) {
+                    $changed[] = $newMount;
+                }
+            }
+        }
+        return $changed;
+    }
+
+    private function addToCache(ICachedMountInfo $mount) {
+        if ($mount->getStorageId() !== -1) {
+            $this->connection->insertIfNotExist('*PREFIX*mounts', [
+                'storage_id' => $mount->getStorageId(),
+                'root_id' => $mount->getRootId(),
+                'user_id' => $mount->getUser()->getUID(),
+                'mount_point' => $mount->getMountPoint(),
+                'mount_id' => $mount->getMountId(),
+                'mount_provider_class' => $mount->getMountProvider(),
+            ], ['root_id', 'user_id', 'mount_point']);
+        } else {
+            // in some cases this is legitimate, like orphaned shares
+            $this->logger->debug('Could not get storage info for mount at ' . $mount->getMountPoint());
+        }
+    }
+
+    private function updateCachedMount(ICachedMountInfo $mount) {
+        $builder = $this->connection->getQueryBuilder();
+
+        $query = $builder->update('mounts')
+            ->set('storage_id', $builder->createNamedParameter($mount->getStorageId()))
+            ->set('mount_point', $builder->createNamedParameter($mount->getMountPoint()))
+            ->set('mount_id', $builder->createNamedParameter($mount->getMountId(), IQueryBuilder::PARAM_INT))
+            ->set('mount_provider_class', $builder->createNamedParameter($mount->getMountProvider()))
+            ->where($builder->expr()->eq('user_id', $builder->createNamedParameter($mount->getUser()->getUID())))
+            ->andWhere($builder->expr()->eq('root_id', $builder->createNamedParameter($mount->getRootId(), IQueryBuilder::PARAM_INT)));
+
+        $query->execute();
+    }
+
+    private function removeFromCache(ICachedMountInfo $mount) {
+        $builder = $this->connection->getQueryBuilder();
+
+        $query = $builder->delete('mounts')
+            ->where($builder->expr()->eq('user_id', $builder->createNamedParameter($mount->getUser()->getUID())))
+            ->andWhere($builder->expr()->eq('root_id', $builder->createNamedParameter($mount->getRootId(), IQueryBuilder::PARAM_INT)))
+            ->andWhere($builder->expr()->eq('mount_point', $builder->createNamedParameter($mount->getMountPoint())));
+        $query->execute();
+    }
+
+    private function dbRowToMountInfo(array $row) {
+        $user = $this->userManager->get($row['user_id']);
+        if (is_null($user)) {
+            return null;
+        }
+        $mount_id = $row['mount_id'];
+        if (!is_null($mount_id)) {
+            $mount_id = (int)$mount_id;
+        }
+        return new CachedMountInfo(
+            $user,
+            (int)$row['storage_id'],
+            (int)$row['root_id'],
+            $row['mount_point'],
+            $row['mount_provider_class'] ?? '',
+            $mount_id,
+            isset($row['path']) ? $row['path'] : '',
+        );
+    }
+
+    /**
+     * @param IUser $user
+     * @return ICachedMountInfo[]
+     */
+    public function getMountsForUser(IUser $user) {
+        if (!isset($this->mountsForUsers[$user->getUID()])) {
+            $builder = $this->connection->getQueryBuilder();
+            $query = $builder->select('storage_id', 'root_id', 'user_id', 'mount_point', 'mount_id', 'f.path', 'mount_provider_class')
+                ->from('mounts', 'm')
+                ->innerJoin('m', 'filecache', 'f', $builder->expr()->eq('m.root_id', 'f.fileid'))
+                ->where($builder->expr()->eq('user_id', $builder->createPositionalParameter($user->getUID())));
+
+            $result = $query->execute();
+            $rows = $result->fetchAll();
+            $result->closeCursor();
+
+            $this->mountsForUsers[$user->getUID()] = array_filter(array_map([$this, 'dbRowToMountInfo'], $rows));
+        }
+        return $this->mountsForUsers[$user->getUID()];
+    }
+
+    /**
+     * @param int $numericStorageId
+     * @param string|null $user limit the results to a single user
+     * @return CachedMountInfo[]
+     */
+    public function getMountsForStorageId($numericStorageId, $user = null) {
+        $builder = $this->connection->getQueryBuilder();
+        $query = $builder->select('storage_id', 'root_id', 'user_id', 'mount_point', 'mount_id', 'f.path', 'mount_provider_class')
+            ->from('mounts', 'm')
+            ->innerJoin('m', 'filecache', 'f', $builder->expr()->eq('m.root_id', 'f.fileid'))
+            ->where($builder->expr()->eq('storage_id', $builder->createPositionalParameter($numericStorageId, IQueryBuilder::PARAM_INT)));
+
+        if ($user) {
+            $query->andWhere($builder->expr()->eq('user_id', $builder->createPositionalParameter($user)));
+        }
+
+        $result = $query->execute();
+        $rows = $result->fetchAll();
+        $result->closeCursor();
+
+        return array_filter(array_map([$this, 'dbRowToMountInfo'], $rows));
+    }
+
+    /**
+     * @param int $rootFileId
+     * @return CachedMountInfo[]
+     */
+    public function getMountsForRootId($rootFileId) {
+        $builder = $this->connection->getQueryBuilder();
+        $query = $builder->select('storage_id', 'root_id', 'user_id', 'mount_point', 'mount_id', 'f.path', 'mount_provider_class')
+            ->from('mounts', 'm')
+            ->innerJoin('m', 'filecache', 'f', $builder->expr()->eq('m.root_id', 'f.fileid'))
+            ->where($builder->expr()->eq('root_id', $builder->createPositionalParameter($rootFileId, IQueryBuilder::PARAM_INT)));
+
+        $result = $query->execute();
+        $rows = $result->fetchAll();
+        $result->closeCursor();
+
+        return array_filter(array_map([$this, 'dbRowToMountInfo'], $rows));
+    }
+
+    /**
+     * @param $fileId
+     * @return array{int, string, int}
+     * @throws \OCP\Files\NotFoundException
+     */
+    private function getCacheInfoFromFileId($fileId): array {
+        if (!isset($this->cacheInfoCache[$fileId])) {
+            $builder = $this->connection->getQueryBuilder();
+            $query = $builder->select('storage', 'path', 'mimetype')
+                ->from('filecache')
+                ->where($builder->expr()->eq('fileid', $builder->createNamedParameter($fileId, IQueryBuilder::PARAM_INT)));
+
+            $result = $query->execute();
+            $row = $result->fetch();
+            $result->closeCursor();
+
+            if (is_array($row)) {
+                $this->cacheInfoCache[$fileId] = [
+                    (int)$row['storage'],
+                    (string)$row['path'],
+                    (int)$row['mimetype']
+                ];
+            } else {
+                throw new NotFoundException('File with id "' . $fileId . '" not found');
+            }
+        }
+        return $this->cacheInfoCache[$fileId];
+    }
+
+    /**
+     * @param int $fileId
+     * @param string|null $user optionally restrict the results to a single user
+     * @return ICachedMountFileInfo[]
+     * @since 9.0.0
+     */
+    public function getMountsForFileId($fileId, $user = null) {
+        try {
+            [$storageId, $internalPath] = $this->getCacheInfoFromFileId($fileId);
+        } catch (NotFoundException $e) {
+            return [];
+        }
+        $builder = $this->connection->getQueryBuilder();
+        $query = $builder->select('storage_id', 'root_id', 'user_id', 'mount_point', 'mount_id', 'f.path', 'mount_provider_class')
+            ->from('mounts', 'm')
+            ->innerJoin('m', 'filecache', 'f', $builder->expr()->eq('m.root_id', 'f.fileid'))
+            ->where($builder->expr()->eq('storage_id', $builder->createPositionalParameter($storageId, IQueryBuilder::PARAM_INT)));
+
+        if ($user) {
+            $query->andWhere($builder->expr()->eq('user_id', $builder->createPositionalParameter($user)));
+        }
+
+        $result = $query->execute();
+        $rows = $result->fetchAll();
+        $result->closeCursor();
+        // filter mounts that are from the same storage but a different directory
+        $filteredMounts = array_filter($rows, function (array $row) use ($internalPath, $fileId) {
+            if ($fileId === (int)$row['root_id']) {
+                return true;
+            }
+            $internalMountPath = $row['path'] ?? '';
+
+            return $internalMountPath === '' || substr($internalPath, 0, strlen($internalMountPath) + 1) === $internalMountPath . '/';
+        });
+
+        $filteredMounts = array_filter(array_map([$this, 'dbRowToMountInfo'], $filteredMounts));
+        return array_map(function (ICachedMountInfo $mount) use ($internalPath) {
+            return new CachedMountFileInfo(
+                $mount->getUser(),
+                $mount->getStorageId(),
+                $mount->getRootId(),
+                $mount->getMountPoint(),
+                $mount->getMountId(),
+                $mount->getMountProvider(),
+                $mount->getRootInternalPath(),
+                $internalPath
+            );
+        }, $filteredMounts);
+    }
+
+    /**
+     * Remove all cached mounts for a user
+     *
+     * @param IUser $user
+     */
+    public function removeUserMounts(IUser $user) {
+        $builder = $this->connection->getQueryBuilder();
+
+        $query = $builder->delete('mounts')
+            ->where($builder->expr()->eq('user_id', $builder->createNamedParameter($user->getUID())));
+        $query->execute();
+    }
+
+    public function removeUserStorageMount($storageId, $userId) {
+        $builder = $this->connection->getQueryBuilder();
+
+        $query = $builder->delete('mounts')
+            ->where($builder->expr()->eq('user_id', $builder->createNamedParameter($userId)))
+            ->andWhere($builder->expr()->eq('storage_id', $builder->createNamedParameter($storageId, IQueryBuilder::PARAM_INT)));
+        $query->execute();
+    }
+
+    public function remoteStorageMounts($storageId) {
+        $builder = $this->connection->getQueryBuilder();
+
+        $query = $builder->delete('mounts')
+            ->where($builder->expr()->eq('storage_id', $builder->createNamedParameter($storageId, IQueryBuilder::PARAM_INT)));
+        $query->execute();
+    }
+
+    /**
+     * @param array $users
+     * @return array
+     */
+    public function getUsedSpaceForUsers(array $users) {
+        $builder = $this->connection->getQueryBuilder();
+
+        $slash = $builder->createNamedParameter('/');
+
+        $mountPoint = $builder->func()->concat(
+            $builder->func()->concat($slash, 'user_id'),
+            $slash
+        );
+
+        $userIds = array_map(function (IUser $user) {
+            return $user->getUID();
+        }, $users);
+
+        $query = $builder->select('m.user_id', 'f.size')
+            ->from('mounts', 'm')
+            ->innerJoin('m', 'filecache', 'f',
+                $builder->expr()->andX(
+                    $builder->expr()->eq('m.storage_id', 'f.storage'),
+                    $builder->expr()->eq('f.path_hash', $builder->createNamedParameter(md5('files')))
+                ))
+            ->where($builder->expr()->eq('m.mount_point', $mountPoint))
+            ->andWhere($builder->expr()->in('m.user_id', $builder->createNamedParameter($userIds, IQueryBuilder::PARAM_STR_ARRAY)));
+
+        $result = $query->execute();
+
+        $results = [];
+        while ($row = $result->fetch()) {
+            $results[$row['user_id']] = $row['size'];
+        }
+        $result->closeCursor();
+        return $results;
+    }
+
+    public function clear(): void {
+        $this->cacheInfoCache = new CappedMemoryCache();
+        $this->mountsForUsers = new CappedMemoryCache();
+    }
+
+    public function getMountForPath(IUser $user, string $path): ICachedMountInfo {
+        $mounts = $this->getMountsForUser($user);
+        $mountPoints = array_map(function (ICachedMountInfo $mount) {
+            return $mount->getMountPoint();
+        }, $mounts);
+        $mounts = array_combine($mountPoints, $mounts);
+
+        $current = $path;
+        // walk up the directory tree until we find a path that has a mountpoint set
+        // the loop will return if a mountpoint is found or break if none are found
+        while (true) {
+            $mountPoint = $current . '/';
+            if (isset($mounts[$mountPoint])) {
+                return $mounts[$mountPoint];
+            } elseif ($current === '') {
+                break;
+            }
+
+            $current = dirname($current);
+            if ($current === '.' || $current === '/') {
+                $current = '';
+            }
+        }
+
+        throw new NotFoundException("No cached mount for path " . $path);
+    }
+
+    public function getMountsInPath(IUser $user, string $path): array {
+        $path = rtrim($path, '/') . '/';
+        $mounts = $this->getMountsForUser($user);
+        return array_filter($mounts, function (ICachedMountInfo $mount) use ($path) {
+            return $mount->getMountPoint() !== $path && strpos($mount->getMountPoint(), $path) === 0;
+        });
+    }
 }

Spacing +28 added lines, -28 removed lines

@@ -79,11 +79,11 @@ 
 	public function registerMounts(IUser $user, array $mounts, array $mountProviderClasses = null) {
 		$this->eventLogger->start('fs:setup:user:register', 'Registering mounts for user');
 		// filter out non-proper storages coming from unit tests
-		$mounts = array_filter($mounts, function (IMountPoint $mount) {
+		$mounts = array_filter($mounts, function(IMountPoint $mount) {
 			return $mount instanceof SharedMount || ($mount->getStorage() && $mount->getStorage()->getCache());
 		});
 		/** @var ICachedMountInfo[] $newMounts */
-		$newMounts = array_map(function (IMountPoint $mount) use ($user) {
+		$newMounts = array_map(function(IMountPoint $mount) use ($user) {
 			// filter out any storages which aren't scanned yet since we aren't interested in files from those storages (yet)
 			if ($mount->getStorageRootId() === -1) {
 				return null;
@@ -92,25 +92,25 @@ 
 			}
 		}, $mounts);
 		$newMounts = array_values(array_filter($newMounts));
-		$newMountKeys = array_map(function (ICachedMountInfo $mount) {
-			return $mount->getRootId() . '::' . $mount->getMountPoint();
+		$newMountKeys = array_map(function(ICachedMountInfo $mount) {
+			return $mount->getRootId().'::'.$mount->getMountPoint();
 		}, $newMounts);
 		$newMounts = array_combine($newMountKeys, $newMounts);
 
 		$cachedMounts = $this->getMountsForUser($user);
 		if (is_array($mountProviderClasses)) {
-			$cachedMounts = array_filter($cachedMounts, function (ICachedMountInfo $mountInfo) use ($mountProviderClasses, $newMounts) {
+			$cachedMounts = array_filter($cachedMounts, function(ICachedMountInfo $mountInfo) use ($mountProviderClasses, $newMounts) {
 				// for existing mounts that didn't have a mount provider set
 				// we still want the ones that map to new mounts
-				$mountKey = $mountInfo->getRootId() . '::' . $mountInfo->getMountPoint();
+				$mountKey = $mountInfo->getRootId().'::'.$mountInfo->getMountPoint();
 				if ($mountInfo->getMountProvider() === '' && isset($newMounts[$mountKey])) {
 					return true;
 				}
 				return in_array($mountInfo->getMountProvider(), $mountProviderClasses);
 			});
 		}
-		$cachedRootKeys = array_map(function (ICachedMountInfo $mount) {
-			return $mount->getRootId() . '::' . $mount->getMountPoint();
+		$cachedRootKeys = array_map(function(ICachedMountInfo $mount) {
+			return $mount->getRootId().'::'.$mount->getMountPoint();
 		}, $cachedMounts);
 		$cachedMounts = array_combine($cachedRootKeys, $cachedMounts);
 
@@ -162,11 +162,11 @@ 
 	private function findChangedMounts(array $newMounts, array $cachedMounts) {
 		$new = [];
 		foreach ($newMounts as $mount) {
-			$new[$mount->getRootId() . '::' . $mount->getMountPoint()] = $mount;
+			$new[$mount->getRootId().'::'.$mount->getMountPoint()] = $mount;
 		}
 		$changed = [];
 		foreach ($cachedMounts as $cachedMount) {
-			$key = $cachedMount->getRootId() . '::' . $cachedMount->getMountPoint();
+			$key = $cachedMount->getRootId().'::'.$cachedMount->getMountPoint();
 			if (isset($new[$key])) {
 				$newMount = $new[$key];
 				if (
@@ -194,7 +194,7 @@ 
 			], ['root_id', 'user_id', 'mount_point']);
 		} else {
 			// in some cases this is legitimate, like orphaned shares
-			$this->logger->debug('Could not get storage info for mount at ' . $mount->getMountPoint());
+			$this->logger->debug('Could not get storage info for mount at '.$mount->getMountPoint());
 		}
 	}
 
@@ -229,12 +229,12 @@ 
 		}
 		$mount_id = $row['mount_id'];
 		if (!is_null($mount_id)) {
-			$mount_id = (int)$mount_id;
+			$mount_id = (int) $mount_id;
 		}
 		return new CachedMountInfo(
 			$user,
-			(int)$row['storage_id'],
-			(int)$row['root_id'],
+			(int) $row['storage_id'],
+			(int) $row['root_id'],
 			$row['mount_point'],
 			$row['mount_provider_class'] ?? '',
 			$mount_id,
@@ -322,12 +322,12 @@ 
 
 			if (is_array($row)) {
 				$this->cacheInfoCache[$fileId] = [
-					(int)$row['storage'],
-					(string)$row['path'],
-					(int)$row['mimetype']
+					(int) $row['storage'],
+					(string) $row['path'],
+					(int) $row['mimetype']
 				];
 			} else {
-				throw new NotFoundException('File with id "' . $fileId . '" not found');
+				throw new NotFoundException('File with id "'.$fileId.'" not found');
 			}
 		}
 		return $this->cacheInfoCache[$fileId];
@@ -359,17 +359,17 @@ 
 		$rows = $result->fetchAll();
 		$result->closeCursor();
 		// filter mounts that are from the same storage but a different directory
-		$filteredMounts = array_filter($rows, function (array $row) use ($internalPath, $fileId) {
-			if ($fileId === (int)$row['root_id']) {
+		$filteredMounts = array_filter($rows, function(array $row) use ($internalPath, $fileId) {
+			if ($fileId === (int) $row['root_id']) {
 				return true;
 			}
 			$internalMountPath = $row['path'] ?? '';
 
-			return $internalMountPath === '' || substr($internalPath, 0, strlen($internalMountPath) + 1) === $internalMountPath . '/';
+			return $internalMountPath === '' || substr($internalPath, 0, strlen($internalMountPath) + 1) === $internalMountPath.'/';
 		});
 
 		$filteredMounts = array_filter(array_map([$this, 'dbRowToMountInfo'], $filteredMounts));
-		return array_map(function (ICachedMountInfo $mount) use ($internalPath) {
+		return array_map(function(ICachedMountInfo $mount) use ($internalPath) {
 			return new CachedMountFileInfo(
 				$mount->getUser(),
 				$mount->getStorageId(),
@@ -427,7 +427,7 @@ 
 			$slash
 		);
 
-		$userIds = array_map(function (IUser $user) {
+		$userIds = array_map(function(IUser $user) {
 			return $user->getUID();
 		}, $users);
 
@@ -458,7 +458,7 @@ 
 
 	public function getMountForPath(IUser $user, string $path): ICachedMountInfo {
 		$mounts = $this->getMountsForUser($user);
-		$mountPoints = array_map(function (ICachedMountInfo $mount) {
+		$mountPoints = array_map(function(ICachedMountInfo $mount) {
 			return $mount->getMountPoint();
 		}, $mounts);
 		$mounts = array_combine($mountPoints, $mounts);
@@ -467,7 +467,7 @@ 
 		// walk up the directory tree until we find a path that has a mountpoint set
 		// the loop will return if a mountpoint is found or break if none are found
 		while (true) {
-			$mountPoint = $current . '/';
+			$mountPoint = $current.'/';
 			if (isset($mounts[$mountPoint])) {
 				return $mounts[$mountPoint];
 			} elseif ($current === '') {
@@ -480,13 +480,13 @@ 
 			}
 		}
 
-		throw new NotFoundException("No cached mount for path " . $path);
+		throw new NotFoundException("No cached mount for path ".$path);
 	}
 
 	public function getMountsInPath(IUser $user, string $path): array {
-		$path = rtrim($path, '/') . '/';
+		$path = rtrim($path, '/').'/';
 		$mounts = $this->getMountsForUser($user);
-		return array_filter($mounts, function (ICachedMountInfo $mount) use ($path) {
+		return array_filter($mounts, function(ICachedMountInfo $mount) use ($path) {
 			return $mount->getMountPoint() !== $path && strpos($mount->getMountPoint(), $path) === 0;
 		});
 	}

core/Command/Db/AddMissingIndices.php

Indentation +426 added lines, -426 removed lines

@@ -53,430 +53,430 @@
  * @package OC\Core\Command\Db
  */
 class AddMissingIndices extends Command {
-	private Connection $connection;
-	private EventDispatcherInterface $dispatcher;
-
-	public function __construct(Connection $connection, EventDispatcherInterface $dispatcher) {
-		parent::__construct();
-
-		$this->connection = $connection;
-		$this->dispatcher = $dispatcher;
-	}
-
-	protected function configure() {
-		$this
-			->setName('db:add-missing-indices')
-			->setDescription('Add missing indices to the database tables')
-			->addOption('dry-run', null, InputOption::VALUE_NONE, "Output the SQL queries instead of running them.");
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$this->addCoreIndexes($output, $input->getOption('dry-run'));
-
-		// Dispatch event so apps can also update indexes if needed
-		$event = new GenericEvent($output);
-		$this->dispatcher->dispatch(IDBConnection::ADD_MISSING_INDEXES_EVENT, $event);
-		return 0;
-	}
-
-	/**
-	 * add missing indices to the share table
-	 *
-	 * @param OutputInterface $output
-	 * @param bool $dryRun If true, will return the sql queries instead of running them.
-	 * @throws \Doctrine\DBAL\Schema\SchemaException
-	 */
-	private function addCoreIndexes(OutputInterface $output, bool $dryRun): void {
-		$output->writeln('<info>Check indices of the share table.</info>');
-
-		$schema = new SchemaWrapper($this->connection);
-		$updated = false;
-
-		if ($schema->hasTable('share')) {
-			$table = $schema->getTable('share');
-			if (!$table->hasIndex('share_with_index')) {
-				$output->writeln('<info>Adding additional share_with index to the share table, this can take some time...</info>');
-				$table->addIndex(['share_with'], 'share_with_index');
-				$sqlQueries = $this->connection->migrateToSchema($schema->getWrappedSchema(), $dryRun);
-				if ($dryRun && $sqlQueries !== null) {
-					$output->writeln($sqlQueries);
-				}
-				$updated = true;
-				$output->writeln('<info>Share table updated successfully.</info>');
-			}
-
-			if (!$table->hasIndex('parent_index')) {
-				$output->writeln('<info>Adding additional parent index to the share table, this can take some time...</info>');
-				$table->addIndex(['parent'], 'parent_index');
-				$sqlQueries = $this->connection->migrateToSchema($schema->getWrappedSchema(), $dryRun);
-				if ($dryRun && $sqlQueries !== null) {
-					$output->writeln($sqlQueries);
-				}
-				$updated = true;
-				$output->writeln('<info>Share table updated successfully.</info>');
-			}
-
-			if (!$table->hasIndex('owner_index')) {
-				$output->writeln('<info>Adding additional owner index to the share table, this can take some time...</info>');
-				$table->addIndex(['uid_owner'], 'owner_index');
-				$sqlQueries = $this->connection->migrateToSchema($schema->getWrappedSchema(), $dryRun);
-				if ($dryRun && $sqlQueries !== null) {
-					$output->writeln($sqlQueries);
-				}
-				$updated = true;
-				$output->writeln('<info>Share table updated successfully.</info>');
-			}
-
-			if (!$table->hasIndex('initiator_index')) {
-				$output->writeln('<info>Adding additional initiator index to the share table, this can take some time...</info>');
-				$table->addIndex(['uid_initiator'], 'initiator_index');
-				$sqlQueries = $this->connection->migrateToSchema($schema->getWrappedSchema(), $dryRun);
-				if ($dryRun && $sqlQueries !== null) {
-					$output->writeln($sqlQueries);
-				}
-				$updated = true;
-				$output->writeln('<info>Share table updated successfully.</info>');
-			}
-		}
-
-		$output->writeln('<info>Check indices of the filecache table.</info>');
-		if ($schema->hasTable('filecache')) {
-			$table = $schema->getTable('filecache');
-			if (!$table->hasIndex('fs_mtime')) {
-				$output->writeln('<info>Adding additional mtime index to the filecache table, this can take some time...</info>');
-				$table->addIndex(['mtime'], 'fs_mtime');
-				$sqlQueries = $this->connection->migrateToSchema($schema->getWrappedSchema(), $dryRun);
-				if ($dryRun && $sqlQueries !== null) {
-					$output->writeln($sqlQueries);
-				}
-				$updated = true;
-				$output->writeln('<info>Filecache table updated successfully.</info>');
-			}
-			if (!$table->hasIndex('fs_size')) {
-				$output->writeln('<info>Adding additional size index to the filecache table, this can take some time...</info>');
-				$table->addIndex(['size'], 'fs_size');
-				$sqlQueries = $this->connection->migrateToSchema($schema->getWrappedSchema(), $dryRun);
-				if ($dryRun && $sqlQueries !== null) {
-					$output->writeln($sqlQueries);
-				}
-				$updated = true;
-				$output->writeln('<info>Filecache table updated successfully.</info>');
-			}
-			if (!$table->hasIndex('fs_id_storage_size')) {
-				$output->writeln('<info>Adding additional size index to the filecache table, this can take some time...</info>');
-				$table->addIndex(['fileid', 'storage', 'size'], 'fs_id_storage_size');
-				$sqlQueries = $this->connection->migrateToSchema($schema->getWrappedSchema(), $dryRun);
-				if ($dryRun && $sqlQueries !== null) {
-					$output->writeln($sqlQueries);
-				}
-				$updated = true;
-				$output->writeln('<info>Filecache table updated successfully.</info>');
-			}
-			if (!$table->hasIndex('fs_storage_path_prefix') && !$schema->getDatabasePlatform() instanceof PostgreSQL94Platform) {
-				$output->writeln('<info>Adding additional path index to the filecache table, this can take some time...</info>');
-				$table->addIndex(['storage', 'path'], 'fs_storage_path_prefix', [], ['lengths' => [null, 64]]);
-				$sqlQueries = $this->connection->migrateToSchema($schema->getWrappedSchema(), $dryRun);
-				if ($dryRun && $sqlQueries !== null) {
-					$output->writeln($sqlQueries);
-				}
-				$updated = true;
-				$output->writeln('<info>Filecache table updated successfully.</info>');
-			}
-			if (!$table->hasIndex('fs_parent')) {
-				$output->writeln('<info>Adding additional parent index to the filecache table, this can take some time...</info>');
-				$table->addIndex(['parent'], 'fs_parent');
-				$sqlQueries = $this->connection->migrateToSchema($schema->getWrappedSchema(), $dryRun);
-				if ($dryRun && $sqlQueries !== null) {
-					$output->writeln($sqlQueries);
-				}
-				$updated = true;
-				$output->writeln('<info>Filecache table updated successfully.</info>');
-			}
-		}
-
-		$output->writeln('<info>Check indices of the twofactor_providers table.</info>');
-		if ($schema->hasTable('twofactor_providers')) {
-			$table = $schema->getTable('twofactor_providers');
-			if (!$table->hasIndex('twofactor_providers_uid')) {
-				$output->writeln('<info>Adding additional twofactor_providers_uid index to the twofactor_providers table, this can take some time...</info>');
-				$table->addIndex(['uid'], 'twofactor_providers_uid');
-				$sqlQueries = $this->connection->migrateToSchema($schema->getWrappedSchema(), $dryRun);
-				if ($dryRun && $sqlQueries !== null) {
-					$output->writeln($sqlQueries);
-				}
-				$updated = true;
-				$output->writeln('<info>Twofactor_providers table updated successfully.</info>');
-			}
-		}
-
-		$output->writeln('<info>Check indices of the login_flow_v2 table.</info>');
-		if ($schema->hasTable('login_flow_v2')) {
-			$table = $schema->getTable('login_flow_v2');
-			if (!$table->hasIndex('poll_token')) {
-				$output->writeln('<info>Adding additional indeces to the login_flow_v2 table, this can take some time...</info>');
-
-				foreach ($table->getIndexes() as $index) {
-					$columns = $index->getColumns();
-					if ($columns === ['poll_token'] ||
-						$columns === ['login_token'] ||
-						$columns === ['timestamp']) {
-						$table->dropIndex($index->getName());
-					}
-				}
-
-				$table->addUniqueIndex(['poll_token'], 'poll_token');
-				$table->addUniqueIndex(['login_token'], 'login_token');
-				$table->addIndex(['timestamp'], 'timestamp');
-				$sqlQueries = $this->connection->migrateToSchema($schema->getWrappedSchema(), $dryRun);
-				if ($dryRun && $sqlQueries !== null) {
-					$output->writeln($sqlQueries);
-				}
-				$updated = true;
-				$output->writeln('<info>login_flow_v2 table updated successfully.</info>');
-			}
-		}
-
-		$output->writeln('<info>Check indices of the whats_new table.</info>');
-		if ($schema->hasTable('whats_new')) {
-			$table = $schema->getTable('whats_new');
-			if (!$table->hasIndex('version')) {
-				$output->writeln('<info>Adding version index to the whats_new table, this can take some time...</info>');
-
-				foreach ($table->getIndexes() as $index) {
-					if ($index->getColumns() === ['version']) {
-						$table->dropIndex($index->getName());
-					}
-				}
-
-				$table->addUniqueIndex(['version'], 'version');
-				$sqlQueries = $this->connection->migrateToSchema($schema->getWrappedSchema(), $dryRun);
-				if ($dryRun && $sqlQueries !== null) {
-					$output->writeln($sqlQueries);
-				}
-				$updated = true;
-				$output->writeln('<info>whats_new table updated successfully.</info>');
-			}
-		}
-
-		$output->writeln('<info>Check indices of the cards table.</info>');
-		$cardsUpdated = false;
-		if ($schema->hasTable('cards')) {
-			$table = $schema->getTable('cards');
-
-			if ($table->hasIndex('addressbookid_uri_index')) {
-				if ($table->hasIndex('cards_abiduri')) {
-					$table->dropIndex('addressbookid_uri_index');
-				} else {
-					$output->writeln('<info>Renaming addressbookid_uri_index index to cards_abiduri in the cards table, this can take some time...</info>');
-
-					foreach ($table->getIndexes() as $index) {
-						if ($index->getColumns() === ['addressbookid', 'uri']) {
-							$table->renameIndex('addressbookid_uri_index', 'cards_abiduri');
-						}
-					}
-				}
-
-				$sqlQueries = $this->connection->migrateToSchema($schema->getWrappedSchema(), $dryRun);
-				if ($dryRun && $sqlQueries !== null) {
-					$output->writeln($sqlQueries);
-				}
-				$cardsUpdated = true;
-			}
-
-			if (!$table->hasIndex('cards_abid')) {
-				$output->writeln('<info>Adding cards_abid index to the cards table, this can take some time...</info>');
-
-				foreach ($table->getIndexes() as $index) {
-					if ($index->getColumns() === ['addressbookid']) {
-						$table->dropIndex($index->getName());
-					}
-				}
-
-				$table->addIndex(['addressbookid'], 'cards_abid');
-				$sqlQueries = $this->connection->migrateToSchema($schema->getWrappedSchema(), $dryRun);
-				if ($dryRun && $sqlQueries !== null) {
-					$output->writeln($sqlQueries);
-				}
-				$cardsUpdated = true;
-			}
-
-			if (!$table->hasIndex('cards_abiduri')) {
-				$output->writeln('<info>Adding cards_abiduri index to the cards table, this can take some time...</info>');
-
-				foreach ($table->getIndexes() as $index) {
-					if ($index->getColumns() === ['addressbookid', 'uri']) {
-						$table->dropIndex($index->getName());
-					}
-				}
-
-				$table->addIndex(['addressbookid', 'uri'], 'cards_abiduri');
-				$sqlQueries = $this->connection->migrateToSchema($schema->getWrappedSchema(), $dryRun);
-				if ($dryRun && $sqlQueries !== null) {
-					$output->writeln($sqlQueries);
-				}
-				$cardsUpdated = true;
-			}
-
-			if ($cardsUpdated) {
-				$updated = true;
-				$output->writeln('<info>cards table updated successfully.</info>');
-			}
-		}
-
-		$output->writeln('<info>Check indices of the cards_properties table.</info>');
-		if ($schema->hasTable('cards_properties')) {
-			$table = $schema->getTable('cards_properties');
-			if (!$table->hasIndex('cards_prop_abid')) {
-				$output->writeln('<info>Adding cards_prop_abid index to the cards_properties table, this can take some time...</info>');
-
-				foreach ($table->getIndexes() as $index) {
-					if ($index->getColumns() === ['addressbookid']) {
-						$table->dropIndex($index->getName());
-					}
-				}
-
-				$table->addIndex(['addressbookid'], 'cards_prop_abid');
-				$sqlQueries = $this->connection->migrateToSchema($schema->getWrappedSchema(), $dryRun);
-				if ($dryRun && $sqlQueries !== null) {
-					$output->writeln($sqlQueries);
-				}
-				$updated = true;
-				$output->writeln('<info>cards_properties table updated successfully.</info>');
-			}
-		}
-
-		$output->writeln('<info>Check indices of the calendarobjects_props table.</info>');
-		if ($schema->hasTable('calendarobjects_props')) {
-			$table = $schema->getTable('calendarobjects_props');
-			if (!$table->hasIndex('calendarobject_calid_index')) {
-				$output->writeln('<info>Adding calendarobject_calid_index index to the calendarobjects_props table, this can take some time...</info>');
-
-				$table->addIndex(['calendarid', 'calendartype'], 'calendarobject_calid_index');
-				$sqlQueries = $this->connection->migrateToSchema($schema->getWrappedSchema(), $dryRun);
-				if ($dryRun && $sqlQueries !== null) {
-					$output->writeln($sqlQueries);
-				}
-				$updated = true;
-				$output->writeln('<info>calendarobjects_props table updated successfully.</info>');
-			}
-		}
-
-		$output->writeln('<info>Check indices of the schedulingobjects table.</info>');
-		if ($schema->hasTable('schedulingobjects')) {
-			$table = $schema->getTable('schedulingobjects');
-			if (!$table->hasIndex('schedulobj_principuri_index')) {
-				$output->writeln('<info>Adding schedulobj_principuri_index index to the schedulingobjects table, this can take some time...</info>');
-
-				$table->addIndex(['principaluri'], 'schedulobj_principuri_index');
-				$sqlQueries = $this->connection->migrateToSchema($schema->getWrappedSchema(), $dryRun);
-				if ($dryRun && $sqlQueries !== null) {
-					$output->writeln($sqlQueries);
-				}
-				$updated = true;
-				$output->writeln('<info>schedulingobjects table updated successfully.</info>');
-			}
-		}
-
-		$output->writeln('<info>Check indices of the oc_properties table.</info>');
-		if ($schema->hasTable('properties')) {
-			$table = $schema->getTable('properties');
-			$propertiesUpdated = false;
-
-			if (!$table->hasIndex('properties_path_index')) {
-				$output->writeln('<info>Adding properties_path_index index to the oc_properties table, this can take some time...</info>');
-
-				$table->addIndex(['userid', 'propertypath'], 'properties_path_index');
-				$sqlQueries = $this->connection->migrateToSchema($schema->getWrappedSchema(), $dryRun);
-				if ($dryRun && $sqlQueries !== null) {
-					$output->writeln($sqlQueries);
-				}
-				$propertiesUpdated = true;
-			}
-			if (!$table->hasIndex('properties_pathonly_index')) {
-				$output->writeln('<info>Adding properties_pathonly_index index to the oc_properties table, this can take some time...</info>');
-
-				$table->addIndex(['propertypath'], 'properties_pathonly_index');
-				$sqlQueries = $this->connection->migrateToSchema($schema->getWrappedSchema(), $dryRun);
-				if ($dryRun && $sqlQueries !== null) {
-					$output->writeln($sqlQueries);
-				}
-				$propertiesUpdated = true;
-			}
-
-			if ($propertiesUpdated) {
-				$updated = true;
-				$output->writeln('<info>oc_properties table updated successfully.</info>');
-			}
-		}
-
-		$output->writeln('<info>Check indices of the oc_jobs table.</info>');
-		if ($schema->hasTable('jobs')) {
-			$table = $schema->getTable('jobs');
-			if (!$table->hasIndex('job_lastcheck_reserved')) {
-				$output->writeln('<info>Adding job_lastcheck_reserved index to the oc_jobs table, this can take some time...</info>');
-
-				$table->addIndex(['last_checked', 'reserved_at'], 'job_lastcheck_reserved');
-				$sqlQueries = $this->connection->migrateToSchema($schema->getWrappedSchema(), $dryRun);
-				if ($dryRun && $sqlQueries !== null) {
-					$output->writeln($sqlQueries);
-				}
-				$updated = true;
-				$output->writeln('<info>oc_properties table updated successfully.</info>');
-			}
-		}
-
-		$output->writeln('<info>Check indices of the oc_direct_edit table.</info>');
-		if ($schema->hasTable('direct_edit')) {
-			$table = $schema->getTable('direct_edit');
-			if (!$table->hasIndex('direct_edit_timestamp')) {
-				$output->writeln('<info>Adding direct_edit_timestamp index to the oc_direct_edit table, this can take some time...</info>');
-
-				$table->addIndex(['timestamp'], 'direct_edit_timestamp');
-				$sqlQueries = $this->connection->migrateToSchema($schema->getWrappedSchema(), $dryRun);
-				if ($dryRun && $sqlQueries !== null) {
-					$output->writeln($sqlQueries);
-				}
-				$updated = true;
-				$output->writeln('<info>oc_direct_edit table updated successfully.</info>');
-			}
-		}
-
-		$output->writeln('<info>Check indices of the oc_preferences table.</info>');
-		if ($schema->hasTable('preferences')) {
-			$table = $schema->getTable('preferences');
-			if (!$table->hasIndex('preferences_app_key')) {
-				$output->writeln('<info>Adding preferences_app_key index to the oc_preferences table, this can take some time...</info>');
-
-				$table->addIndex(['appid', 'configkey'], 'preferences_app_key');
-				$this->connection->migrateToSchema($schema->getWrappedSchema());
-				$updated = true;
-				$output->writeln('<info>oc_properties table updated successfully.</info>');
-			}
-		}
-
-		$output->writeln('<info>Check indices of the oc_mounts table.</info>');
-		if ($schema->hasTable('mounts')) {
-			$table = $schema->getTable('mounts');
-			if (!$table->hasIndex('mounts_class_index')) {
-				$output->writeln('<info>Adding mounts_class_index index to the oc_mounts table, this can take some time...</info>');
-
-				$table->addIndex(['mount_provider_class'], 'mounts_class_index');
-				$this->connection->migrateToSchema($schema->getWrappedSchema());
-				$updated = true;
-				$output->writeln('<info>oc_mounts table updated successfully.</info>');
-			}
-			if (!$table->hasIndex('mounts_user_root_path_index')) {
-				$output->writeln('<info>Adding mounts_user_root_path_index index to the oc_mounts table, this can take some time...</info>');
-
-				$table->addIndex(['user_id', 'root_id', 'mount_point'], 'mounts_user_root_path_index', [], ['lengths' => [null, null, 128]]);
-				$this->connection->migrateToSchema($schema->getWrappedSchema());
-				$updated = true;
-				$output->writeln('<info>oc_mounts table updated successfully.</info>');
-			}
-		}
-
-		if (!$updated) {
-			$output->writeln('<info>Done.</info>');
-		}
-	}
+    private Connection $connection;
+    private EventDispatcherInterface $dispatcher;
+
+    public function __construct(Connection $connection, EventDispatcherInterface $dispatcher) {
+        parent::__construct();
+
+        $this->connection = $connection;
+        $this->dispatcher = $dispatcher;
+    }
+
+    protected function configure() {
+        $this
+            ->setName('db:add-missing-indices')
+            ->setDescription('Add missing indices to the database tables')
+            ->addOption('dry-run', null, InputOption::VALUE_NONE, "Output the SQL queries instead of running them.");
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $this->addCoreIndexes($output, $input->getOption('dry-run'));
+
+        // Dispatch event so apps can also update indexes if needed
+        $event = new GenericEvent($output);
+        $this->dispatcher->dispatch(IDBConnection::ADD_MISSING_INDEXES_EVENT, $event);
+        return 0;
+    }
+
+    /**
+     * add missing indices to the share table
+     *
+     * @param OutputInterface $output
+     * @param bool $dryRun If true, will return the sql queries instead of running them.
+     * @throws \Doctrine\DBAL\Schema\SchemaException
+     */
+    private function addCoreIndexes(OutputInterface $output, bool $dryRun): void {
+        $output->writeln('<info>Check indices of the share table.</info>');
+
+        $schema = new SchemaWrapper($this->connection);
+        $updated = false;
+
+        if ($schema->hasTable('share')) {
+            $table = $schema->getTable('share');
+            if (!$table->hasIndex('share_with_index')) {
+                $output->writeln('<info>Adding additional share_with index to the share table, this can take some time...</info>');
+                $table->addIndex(['share_with'], 'share_with_index');
+                $sqlQueries = $this->connection->migrateToSchema($schema->getWrappedSchema(), $dryRun);
+                if ($dryRun && $sqlQueries !== null) {
+                    $output->writeln($sqlQueries);
+                }
+                $updated = true;
+                $output->writeln('<info>Share table updated successfully.</info>');
+            }
+
+            if (!$table->hasIndex('parent_index')) {
+                $output->writeln('<info>Adding additional parent index to the share table, this can take some time...</info>');
+                $table->addIndex(['parent'], 'parent_index');
+                $sqlQueries = $this->connection->migrateToSchema($schema->getWrappedSchema(), $dryRun);
+                if ($dryRun && $sqlQueries !== null) {
+                    $output->writeln($sqlQueries);
+                }
+                $updated = true;
+                $output->writeln('<info>Share table updated successfully.</info>');
+            }
+
+            if (!$table->hasIndex('owner_index')) {
+                $output->writeln('<info>Adding additional owner index to the share table, this can take some time...</info>');
+                $table->addIndex(['uid_owner'], 'owner_index');
+                $sqlQueries = $this->connection->migrateToSchema($schema->getWrappedSchema(), $dryRun);
+                if ($dryRun && $sqlQueries !== null) {
+                    $output->writeln($sqlQueries);
+                }
+                $updated = true;
+                $output->writeln('<info>Share table updated successfully.</info>');
+            }
+
+            if (!$table->hasIndex('initiator_index')) {
+                $output->writeln('<info>Adding additional initiator index to the share table, this can take some time...</info>');
+                $table->addIndex(['uid_initiator'], 'initiator_index');
+                $sqlQueries = $this->connection->migrateToSchema($schema->getWrappedSchema(), $dryRun);
+                if ($dryRun && $sqlQueries !== null) {
+                    $output->writeln($sqlQueries);
+                }
+                $updated = true;
+                $output->writeln('<info>Share table updated successfully.</info>');
+            }
+        }
+
+        $output->writeln('<info>Check indices of the filecache table.</info>');
+        if ($schema->hasTable('filecache')) {
+            $table = $schema->getTable('filecache');
+            if (!$table->hasIndex('fs_mtime')) {
+                $output->writeln('<info>Adding additional mtime index to the filecache table, this can take some time...</info>');
+                $table->addIndex(['mtime'], 'fs_mtime');
+                $sqlQueries = $this->connection->migrateToSchema($schema->getWrappedSchema(), $dryRun);
+                if ($dryRun && $sqlQueries !== null) {
+                    $output->writeln($sqlQueries);
+                }
+                $updated = true;
+                $output->writeln('<info>Filecache table updated successfully.</info>');
+            }
+            if (!$table->hasIndex('fs_size')) {
+                $output->writeln('<info>Adding additional size index to the filecache table, this can take some time...</info>');
+                $table->addIndex(['size'], 'fs_size');
+                $sqlQueries = $this->connection->migrateToSchema($schema->getWrappedSchema(), $dryRun);
+                if ($dryRun && $sqlQueries !== null) {
+                    $output->writeln($sqlQueries);
+                }
+                $updated = true;
+                $output->writeln('<info>Filecache table updated successfully.</info>');
+            }
+            if (!$table->hasIndex('fs_id_storage_size')) {
+                $output->writeln('<info>Adding additional size index to the filecache table, this can take some time...</info>');
+                $table->addIndex(['fileid', 'storage', 'size'], 'fs_id_storage_size');
+                $sqlQueries = $this->connection->migrateToSchema($schema->getWrappedSchema(), $dryRun);
+                if ($dryRun && $sqlQueries !== null) {
+                    $output->writeln($sqlQueries);
+                }
+                $updated = true;
+                $output->writeln('<info>Filecache table updated successfully.</info>');
+            }
+            if (!$table->hasIndex('fs_storage_path_prefix') && !$schema->getDatabasePlatform() instanceof PostgreSQL94Platform) {
+                $output->writeln('<info>Adding additional path index to the filecache table, this can take some time...</info>');
+                $table->addIndex(['storage', 'path'], 'fs_storage_path_prefix', [], ['lengths' => [null, 64]]);
+                $sqlQueries = $this->connection->migrateToSchema($schema->getWrappedSchema(), $dryRun);
+                if ($dryRun && $sqlQueries !== null) {
+                    $output->writeln($sqlQueries);
+                }
+                $updated = true;
+                $output->writeln('<info>Filecache table updated successfully.</info>');
+            }
+            if (!$table->hasIndex('fs_parent')) {
+                $output->writeln('<info>Adding additional parent index to the filecache table, this can take some time...</info>');
+                $table->addIndex(['parent'], 'fs_parent');
+                $sqlQueries = $this->connection->migrateToSchema($schema->getWrappedSchema(), $dryRun);
+                if ($dryRun && $sqlQueries !== null) {
+                    $output->writeln($sqlQueries);
+                }
+                $updated = true;
+                $output->writeln('<info>Filecache table updated successfully.</info>');
+            }
+        }
+
+        $output->writeln('<info>Check indices of the twofactor_providers table.</info>');
+        if ($schema->hasTable('twofactor_providers')) {
+            $table = $schema->getTable('twofactor_providers');
+            if (!$table->hasIndex('twofactor_providers_uid')) {
+                $output->writeln('<info>Adding additional twofactor_providers_uid index to the twofactor_providers table, this can take some time...</info>');
+                $table->addIndex(['uid'], 'twofactor_providers_uid');
+                $sqlQueries = $this->connection->migrateToSchema($schema->getWrappedSchema(), $dryRun);
+                if ($dryRun && $sqlQueries !== null) {
+                    $output->writeln($sqlQueries);
+                }
+                $updated = true;
+                $output->writeln('<info>Twofactor_providers table updated successfully.</info>');
+            }
+        }
+
+        $output->writeln('<info>Check indices of the login_flow_v2 table.</info>');
+        if ($schema->hasTable('login_flow_v2')) {
+            $table = $schema->getTable('login_flow_v2');
+            if (!$table->hasIndex('poll_token')) {
+                $output->writeln('<info>Adding additional indeces to the login_flow_v2 table, this can take some time...</info>');
+
+                foreach ($table->getIndexes() as $index) {
+                    $columns = $index->getColumns();
+                    if ($columns === ['poll_token'] ||
+                        $columns === ['login_token'] ||
+                        $columns === ['timestamp']) {
+                        $table->dropIndex($index->getName());
+                    }
+                }
+
+                $table->addUniqueIndex(['poll_token'], 'poll_token');
+                $table->addUniqueIndex(['login_token'], 'login_token');
+                $table->addIndex(['timestamp'], 'timestamp');
+                $sqlQueries = $this->connection->migrateToSchema($schema->getWrappedSchema(), $dryRun);
+                if ($dryRun && $sqlQueries !== null) {
+                    $output->writeln($sqlQueries);
+                }
+                $updated = true;
+                $output->writeln('<info>login_flow_v2 table updated successfully.</info>');
+            }
+        }
+
+        $output->writeln('<info>Check indices of the whats_new table.</info>');
+        if ($schema->hasTable('whats_new')) {
+            $table = $schema->getTable('whats_new');
+            if (!$table->hasIndex('version')) {
+                $output->writeln('<info>Adding version index to the whats_new table, this can take some time...</info>');
+
+                foreach ($table->getIndexes() as $index) {
+                    if ($index->getColumns() === ['version']) {
+                        $table->dropIndex($index->getName());
+                    }
+                }
+
+                $table->addUniqueIndex(['version'], 'version');
+                $sqlQueries = $this->connection->migrateToSchema($schema->getWrappedSchema(), $dryRun);
+                if ($dryRun && $sqlQueries !== null) {
+                    $output->writeln($sqlQueries);
+                }
+                $updated = true;
+                $output->writeln('<info>whats_new table updated successfully.</info>');
+            }
+        }
+
+        $output->writeln('<info>Check indices of the cards table.</info>');
+        $cardsUpdated = false;
+        if ($schema->hasTable('cards')) {
+            $table = $schema->getTable('cards');
+
+            if ($table->hasIndex('addressbookid_uri_index')) {
+                if ($table->hasIndex('cards_abiduri')) {
+                    $table->dropIndex('addressbookid_uri_index');
+                } else {
+                    $output->writeln('<info>Renaming addressbookid_uri_index index to cards_abiduri in the cards table, this can take some time...</info>');
+
+                    foreach ($table->getIndexes() as $index) {
+                        if ($index->getColumns() === ['addressbookid', 'uri']) {
+                            $table->renameIndex('addressbookid_uri_index', 'cards_abiduri');
+                        }
+                    }
+                }
+
+                $sqlQueries = $this->connection->migrateToSchema($schema->getWrappedSchema(), $dryRun);
+                if ($dryRun && $sqlQueries !== null) {
+                    $output->writeln($sqlQueries);
+                }
+                $cardsUpdated = true;
+            }
+
+            if (!$table->hasIndex('cards_abid')) {
+                $output->writeln('<info>Adding cards_abid index to the cards table, this can take some time...</info>');
+
+                foreach ($table->getIndexes() as $index) {
+                    if ($index->getColumns() === ['addressbookid']) {
+                        $table->dropIndex($index->getName());
+                    }
+                }
+
+                $table->addIndex(['addressbookid'], 'cards_abid');
+                $sqlQueries = $this->connection->migrateToSchema($schema->getWrappedSchema(), $dryRun);
+                if ($dryRun && $sqlQueries !== null) {
+                    $output->writeln($sqlQueries);
+                }
+                $cardsUpdated = true;
+            }
+
+            if (!$table->hasIndex('cards_abiduri')) {
+                $output->writeln('<info>Adding cards_abiduri index to the cards table, this can take some time...</info>');
+
+                foreach ($table->getIndexes() as $index) {
+                    if ($index->getColumns() === ['addressbookid', 'uri']) {
+                        $table->dropIndex($index->getName());
+                    }
+                }
+
+                $table->addIndex(['addressbookid', 'uri'], 'cards_abiduri');
+                $sqlQueries = $this->connection->migrateToSchema($schema->getWrappedSchema(), $dryRun);
+                if ($dryRun && $sqlQueries !== null) {
+                    $output->writeln($sqlQueries);
+                }
+                $cardsUpdated = true;
+            }
+
+            if ($cardsUpdated) {
+                $updated = true;
+                $output->writeln('<info>cards table updated successfully.</info>');
+            }
+        }
+
+        $output->writeln('<info>Check indices of the cards_properties table.</info>');
+        if ($schema->hasTable('cards_properties')) {
+            $table = $schema->getTable('cards_properties');
+            if (!$table->hasIndex('cards_prop_abid')) {
+                $output->writeln('<info>Adding cards_prop_abid index to the cards_properties table, this can take some time...</info>');
+
+                foreach ($table->getIndexes() as $index) {
+                    if ($index->getColumns() === ['addressbookid']) {
+                        $table->dropIndex($index->getName());
+                    }
+                }
+
+                $table->addIndex(['addressbookid'], 'cards_prop_abid');
+                $sqlQueries = $this->connection->migrateToSchema($schema->getWrappedSchema(), $dryRun);
+                if ($dryRun && $sqlQueries !== null) {
+                    $output->writeln($sqlQueries);
+                }
+                $updated = true;
+                $output->writeln('<info>cards_properties table updated successfully.</info>');
+            }
+        }
+
+        $output->writeln('<info>Check indices of the calendarobjects_props table.</info>');
+        if ($schema->hasTable('calendarobjects_props')) {
+            $table = $schema->getTable('calendarobjects_props');
+            if (!$table->hasIndex('calendarobject_calid_index')) {
+                $output->writeln('<info>Adding calendarobject_calid_index index to the calendarobjects_props table, this can take some time...</info>');
+
+                $table->addIndex(['calendarid', 'calendartype'], 'calendarobject_calid_index');
+                $sqlQueries = $this->connection->migrateToSchema($schema->getWrappedSchema(), $dryRun);
+                if ($dryRun && $sqlQueries !== null) {
+                    $output->writeln($sqlQueries);
+                }
+                $updated = true;
+                $output->writeln('<info>calendarobjects_props table updated successfully.</info>');
+            }
+        }
+
+        $output->writeln('<info>Check indices of the schedulingobjects table.</info>');
+        if ($schema->hasTable('schedulingobjects')) {
+            $table = $schema->getTable('schedulingobjects');
+            if (!$table->hasIndex('schedulobj_principuri_index')) {
+                $output->writeln('<info>Adding schedulobj_principuri_index index to the schedulingobjects table, this can take some time...</info>');
+
+                $table->addIndex(['principaluri'], 'schedulobj_principuri_index');
+                $sqlQueries = $this->connection->migrateToSchema($schema->getWrappedSchema(), $dryRun);
+                if ($dryRun && $sqlQueries !== null) {
+                    $output->writeln($sqlQueries);
+                }
+                $updated = true;
+                $output->writeln('<info>schedulingobjects table updated successfully.</info>');
+            }
+        }
+
+        $output->writeln('<info>Check indices of the oc_properties table.</info>');
+        if ($schema->hasTable('properties')) {
+            $table = $schema->getTable('properties');
+            $propertiesUpdated = false;
+
+            if (!$table->hasIndex('properties_path_index')) {
+                $output->writeln('<info>Adding properties_path_index index to the oc_properties table, this can take some time...</info>');
+
+                $table->addIndex(['userid', 'propertypath'], 'properties_path_index');
+                $sqlQueries = $this->connection->migrateToSchema($schema->getWrappedSchema(), $dryRun);
+                if ($dryRun && $sqlQueries !== null) {
+                    $output->writeln($sqlQueries);
+                }
+                $propertiesUpdated = true;
+            }
+            if (!$table->hasIndex('properties_pathonly_index')) {
+                $output->writeln('<info>Adding properties_pathonly_index index to the oc_properties table, this can take some time...</info>');
+
+                $table->addIndex(['propertypath'], 'properties_pathonly_index');
+                $sqlQueries = $this->connection->migrateToSchema($schema->getWrappedSchema(), $dryRun);
+                if ($dryRun && $sqlQueries !== null) {
+                    $output->writeln($sqlQueries);
+                }
+                $propertiesUpdated = true;
+            }
+
+            if ($propertiesUpdated) {
+                $updated = true;
+                $output->writeln('<info>oc_properties table updated successfully.</info>');
+            }
+        }
+
+        $output->writeln('<info>Check indices of the oc_jobs table.</info>');
+        if ($schema->hasTable('jobs')) {
+            $table = $schema->getTable('jobs');
+            if (!$table->hasIndex('job_lastcheck_reserved')) {
+                $output->writeln('<info>Adding job_lastcheck_reserved index to the oc_jobs table, this can take some time...</info>');
+
+                $table->addIndex(['last_checked', 'reserved_at'], 'job_lastcheck_reserved');
+                $sqlQueries = $this->connection->migrateToSchema($schema->getWrappedSchema(), $dryRun);
+                if ($dryRun && $sqlQueries !== null) {
+                    $output->writeln($sqlQueries);
+                }
+                $updated = true;
+                $output->writeln('<info>oc_properties table updated successfully.</info>');
+            }
+        }
+
+        $output->writeln('<info>Check indices of the oc_direct_edit table.</info>');
+        if ($schema->hasTable('direct_edit')) {
+            $table = $schema->getTable('direct_edit');
+            if (!$table->hasIndex('direct_edit_timestamp')) {
+                $output->writeln('<info>Adding direct_edit_timestamp index to the oc_direct_edit table, this can take some time...</info>');
+
+                $table->addIndex(['timestamp'], 'direct_edit_timestamp');
+                $sqlQueries = $this->connection->migrateToSchema($schema->getWrappedSchema(), $dryRun);
+                if ($dryRun && $sqlQueries !== null) {
+                    $output->writeln($sqlQueries);
+                }
+                $updated = true;
+                $output->writeln('<info>oc_direct_edit table updated successfully.</info>');
+            }
+        }
+
+        $output->writeln('<info>Check indices of the oc_preferences table.</info>');
+        if ($schema->hasTable('preferences')) {
+            $table = $schema->getTable('preferences');
+            if (!$table->hasIndex('preferences_app_key')) {
+                $output->writeln('<info>Adding preferences_app_key index to the oc_preferences table, this can take some time...</info>');
+
+                $table->addIndex(['appid', 'configkey'], 'preferences_app_key');
+                $this->connection->migrateToSchema($schema->getWrappedSchema());
+                $updated = true;
+                $output->writeln('<info>oc_properties table updated successfully.</info>');
+            }
+        }
+
+        $output->writeln('<info>Check indices of the oc_mounts table.</info>');
+        if ($schema->hasTable('mounts')) {
+            $table = $schema->getTable('mounts');
+            if (!$table->hasIndex('mounts_class_index')) {
+                $output->writeln('<info>Adding mounts_class_index index to the oc_mounts table, this can take some time...</info>');
+
+                $table->addIndex(['mount_provider_class'], 'mounts_class_index');
+                $this->connection->migrateToSchema($schema->getWrappedSchema());
+                $updated = true;
+                $output->writeln('<info>oc_mounts table updated successfully.</info>');
+            }
+            if (!$table->hasIndex('mounts_user_root_path_index')) {
+                $output->writeln('<info>Adding mounts_user_root_path_index index to the oc_mounts table, this can take some time...</info>');
+
+                $table->addIndex(['user_id', 'root_id', 'mount_point'], 'mounts_user_root_path_index', [], ['lengths' => [null, null, 128]]);
+                $this->connection->migrateToSchema($schema->getWrappedSchema());
+                $updated = true;
+                $output->writeln('<info>oc_mounts table updated successfully.</info>');
+            }
+        }
+
+        if (!$updated) {
+            $output->writeln('<info>Done.</info>');
+        }
+    }
 }

core/Migrations/Version13000Date20170718121200.php

Indentation +950 added lines, -950 removed lines

@@ -39,858 +39,858 @@ 
 use OCP\Migration\SimpleMigrationStep;
 
 class Version13000Date20170718121200 extends SimpleMigrationStep {
-	/** @var IDBConnection */
-	private $connection;
+    /** @var IDBConnection */
+    private $connection;
 
-	public function __construct(IDBConnection $connection) {
-		$this->connection = $connection;
-	}
+    public function __construct(IDBConnection $connection) {
+        $this->connection = $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->execute();
-		}
-	}
+        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->execute();
+        }
+    }
 
 
-	/**
-	 * @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');
-			$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');
+            $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(['mtime'], 'fs_mtime');
-			$table->addIndex(['size'], 'fs_size');
-			if (!$schema->getDatabasePlatform() instanceof PostgreSQL94Platform) {
-				$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(['mtime'], 'fs_mtime');
+            $table->addIndex(['size'], 'fs_size');
+            if (!$schema->getDatabasePlatform() instanceof PostgreSQL94Platform) {
+                $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']);
-			$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']);
+            $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');
-		}
+        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');
+        }
 
-		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');
+        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');
-		}
+        }
 
-		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');
+        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');
@@ -909,139 +909,139 @@ 
 //			$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');
+    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');
 
-		$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'));
 
-		$result = $query->execute();
-		while ($row = $result->fetch()) {
-			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->execute();
-		}
-	}
+        $result = $query->execute();
+        while ($row = $result->fetch()) {
+            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->execute();
+        }
+    }
 }

core/Migrations/Version27000Date20220613163520.php

Indentation +16 added lines, -16 removed lines

@@ -32,20 +32,20 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version27000Date20220613163520 extends SimpleMigrationStep {
-	public function name(): string {
-		return "Add mountpoint path to mounts table unique index";
-	}
-
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
-
-		$table = $schema->getTable('mounts');
-		if ($table->hasIndex('mounts_user_root_index')) {
-			$table->dropIndex('mounts_user_root_index');
-			// new index gets added with "add missing indexes"
-		}
-
-		return $schema;
-	}
+    public function name(): string {
+        return "Add mountpoint path to mounts table unique index";
+    }
+
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
+
+        $table = $schema->getTable('mounts');
+        if ($table->hasIndex('mounts_user_root_index')) {
+            $table->dropIndex('mounts_user_root_index');
+            // new index gets added with "add missing indexes"
+        }
+
+        return $schema;
+    }
 }

core/Application.php

Indentation +277 added lines, -277 removed lines

@@ -71,281 +71,281 @@
  * @package OC\Core
  */
 class Application extends App {
-	public function __construct() {
-		parent::__construct('core');
-
-		$container = $this->getContainer();
-
-		$container->registerService('defaultMailAddress', function () {
-			return Util::getDefaultEmailAddress('lostpassword-noreply');
-		});
-
-		$server = $container->getServer();
-		/** @var IEventDispatcher $eventDispatcher */
-		$eventDispatcher = $server->get(IEventDispatcher::class);
-
-		$notificationManager = $server->getNotificationManager();
-		$notificationManager->registerNotifierService(CoreNotifier::class);
-		$notificationManager->registerNotifierService(AuthenticationNotifier::class);
-
-		$oldEventDispatcher = $server->getEventDispatcher();
-
-		$oldEventDispatcher->addListener(IDBConnection::CHECK_MISSING_INDEXES_EVENT,
-			function (GenericEvent $event) use ($container) {
-				/** @var MissingIndexInformation $subject */
-				$subject = $event->getSubject();
-
-				$schema = new SchemaWrapper($container->query(Connection::class));
-
-				if ($schema->hasTable('share')) {
-					$table = $schema->getTable('share');
-
-					if (!$table->hasIndex('share_with_index')) {
-						$subject->addHintForMissingSubject($table->getName(), 'share_with_index');
-					}
-					if (!$table->hasIndex('parent_index')) {
-						$subject->addHintForMissingSubject($table->getName(), 'parent_index');
-					}
-					if (!$table->hasIndex('owner_index')) {
-						$subject->addHintForMissingSubject($table->getName(), 'owner_index');
-					}
-					if (!$table->hasIndex('initiator_index')) {
-						$subject->addHintForMissingSubject($table->getName(), 'initiator_index');
-					}
-				}
-
-				if ($schema->hasTable('filecache')) {
-					$table = $schema->getTable('filecache');
-
-					if (!$table->hasIndex('fs_mtime')) {
-						$subject->addHintForMissingSubject($table->getName(), 'fs_mtime');
-					}
-
-					if (!$table->hasIndex('fs_size')) {
-						$subject->addHintForMissingSubject($table->getName(), 'fs_size');
-					}
-
-					if (!$table->hasIndex('fs_id_storage_size')) {
-						$subject->addHintForMissingSubject($table->getName(), 'fs_id_storage_size');
-					}
-
-					if (!$table->hasIndex('fs_storage_path_prefix') && !$schema->getDatabasePlatform() instanceof PostgreSQL94Platform) {
-						$subject->addHintForMissingSubject($table->getName(), 'fs_storage_path_prefix');
-					}
-
-					if (!$table->hasIndex('fs_parent')) {
-						$subject->addHintForMissingSubject($table->getName(), 'fs_parent');
-					}
-				}
-
-				if ($schema->hasTable('twofactor_providers')) {
-					$table = $schema->getTable('twofactor_providers');
-
-					if (!$table->hasIndex('twofactor_providers_uid')) {
-						$subject->addHintForMissingSubject($table->getName(), 'twofactor_providers_uid');
-					}
-				}
-
-				if ($schema->hasTable('login_flow_v2')) {
-					$table = $schema->getTable('login_flow_v2');
-
-					if (!$table->hasIndex('poll_token')) {
-						$subject->addHintForMissingSubject($table->getName(), 'poll_token');
-					}
-					if (!$table->hasIndex('login_token')) {
-						$subject->addHintForMissingSubject($table->getName(), 'login_token');
-					}
-					if (!$table->hasIndex('timestamp')) {
-						$subject->addHintForMissingSubject($table->getName(), 'timestamp');
-					}
-				}
-
-				if ($schema->hasTable('whats_new')) {
-					$table = $schema->getTable('whats_new');
-
-					if (!$table->hasIndex('version')) {
-						$subject->addHintForMissingSubject($table->getName(), 'version');
-					}
-				}
-
-				if ($schema->hasTable('cards')) {
-					$table = $schema->getTable('cards');
-
-					if (!$table->hasIndex('cards_abid')) {
-						$subject->addHintForMissingSubject($table->getName(), 'cards_abid');
-					}
-
-					if (!$table->hasIndex('cards_abiduri')) {
-						$subject->addHintForMissingSubject($table->getName(), 'cards_abiduri');
-					}
-				}
-
-				if ($schema->hasTable('cards_properties')) {
-					$table = $schema->getTable('cards_properties');
-
-					if (!$table->hasIndex('cards_prop_abid')) {
-						$subject->addHintForMissingSubject($table->getName(), 'cards_prop_abid');
-					}
-				}
-
-				if ($schema->hasTable('calendarobjects_props')) {
-					$table = $schema->getTable('calendarobjects_props');
-
-					if (!$table->hasIndex('calendarobject_calid_index')) {
-						$subject->addHintForMissingSubject($table->getName(), 'calendarobject_calid_index');
-					}
-				}
-
-				if ($schema->hasTable('schedulingobjects')) {
-					$table = $schema->getTable('schedulingobjects');
-					if (!$table->hasIndex('schedulobj_principuri_index')) {
-						$subject->addHintForMissingSubject($table->getName(), 'schedulobj_principuri_index');
-					}
-				}
-
-				if ($schema->hasTable('properties')) {
-					$table = $schema->getTable('properties');
-					if (!$table->hasIndex('properties_path_index')) {
-						$subject->addHintForMissingSubject($table->getName(), 'properties_path_index');
-					}
-					if (!$table->hasIndex('properties_pathonly_index')) {
-						$subject->addHintForMissingSubject($table->getName(), 'properties_pathonly_index');
-					}
-				}
-
-				if ($schema->hasTable('jobs')) {
-					$table = $schema->getTable('jobs');
-					if (!$table->hasIndex('job_lastcheck_reserved')) {
-						$subject->addHintForMissingSubject($table->getName(), 'job_lastcheck_reserved');
-					}
-				}
-
-				if ($schema->hasTable('direct_edit')) {
-					$table = $schema->getTable('direct_edit');
-					if (!$table->hasIndex('direct_edit_timestamp')) {
-						$subject->addHintForMissingSubject($table->getName(), 'direct_edit_timestamp');
-					}
-				}
-
-				if ($schema->hasTable('preferences')) {
-					$table = $schema->getTable('preferences');
-					if (!$table->hasIndex('preferences_app_key')) {
-						$subject->addHintForMissingSubject($table->getName(), 'preferences_app_key');
-					}
-				}
-
-				if ($schema->hasTable('mounts')) {
-					$table = $schema->getTable('mounts');
-					if (!$table->hasIndex('mounts_class_index')) {
-						$subject->addHintForMissingSubject($table->getName(), 'mounts_class_index');
-					}
-					if (!$table->hasIndex('mounts_user_root_path_index')) {
-						$subject->addHintForMissingSubject($table->getName(), 'mounts_user_root_path_index');
-					}
-				}
-			}
-		);
-
-		$oldEventDispatcher->addListener(IDBConnection::CHECK_MISSING_PRIMARY_KEYS_EVENT,
-			function (GenericEvent $event) use ($container) {
-				/** @var MissingPrimaryKeyInformation $subject */
-				$subject = $event->getSubject();
-
-				$schema = new SchemaWrapper($container->query(Connection::class));
-
-				if ($schema->hasTable('federated_reshares')) {
-					$table = $schema->getTable('federated_reshares');
-
-					if (!$table->hasPrimaryKey()) {
-						$subject->addHintForMissingSubject($table->getName());
-					}
-				}
-
-				if ($schema->hasTable('systemtag_object_mapping')) {
-					$table = $schema->getTable('systemtag_object_mapping');
-
-					if (!$table->hasPrimaryKey()) {
-						$subject->addHintForMissingSubject($table->getName());
-					}
-				}
-
-				if ($schema->hasTable('comments_read_markers')) {
-					$table = $schema->getTable('comments_read_markers');
-
-					if (!$table->hasPrimaryKey()) {
-						$subject->addHintForMissingSubject($table->getName());
-					}
-				}
-
-				if ($schema->hasTable('collres_resources')) {
-					$table = $schema->getTable('collres_resources');
-
-					if (!$table->hasPrimaryKey()) {
-						$subject->addHintForMissingSubject($table->getName());
-					}
-				}
-
-				if ($schema->hasTable('collres_accesscache')) {
-					$table = $schema->getTable('collres_accesscache');
-
-					if (!$table->hasPrimaryKey()) {
-						$subject->addHintForMissingSubject($table->getName());
-					}
-				}
-
-				if ($schema->hasTable('filecache_extended')) {
-					$table = $schema->getTable('filecache_extended');
-
-					if (!$table->hasPrimaryKey()) {
-						$subject->addHintForMissingSubject($table->getName());
-					}
-				}
-			}
-		);
-
-		$oldEventDispatcher->addListener(IDBConnection::CHECK_MISSING_COLUMNS_EVENT,
-			function (GenericEvent $event) use ($container) {
-				/** @var MissingColumnInformation $subject */
-				$subject = $event->getSubject();
-
-				$schema = new SchemaWrapper($container->query(Connection::class));
-
-				if ($schema->hasTable('comments')) {
-					$table = $schema->getTable('comments');
-
-					if (!$table->hasColumn('reference_id')) {
-						$subject->addHintForMissingColumn($table->getName(), 'reference_id');
-					}
-				}
-			}
-		);
-
-		$eventDispatcher->addServiceListener(BeforeTemplateRenderedEvent::class, BeforeTemplateRenderedListener::class);
-		$eventDispatcher->addServiceListener(RemoteWipeStarted::class, RemoteWipeActivityListener::class);
-		$eventDispatcher->addServiceListener(RemoteWipeStarted::class, RemoteWipeNotificationsListener::class);
-		$eventDispatcher->addServiceListener(RemoteWipeStarted::class, RemoteWipeEmailListener::class);
-		$eventDispatcher->addServiceListener(RemoteWipeFinished::class, RemoteWipeActivityListener::class);
-		$eventDispatcher->addServiceListener(RemoteWipeFinished::class, RemoteWipeNotificationsListener::class);
-		$eventDispatcher->addServiceListener(RemoteWipeFinished::class, RemoteWipeEmailListener::class);
-		$eventDispatcher->addServiceListener(UserDeletedEvent::class, UserDeletedStoreCleanupListener::class);
-		$eventDispatcher->addServiceListener(UserDeletedEvent::class, UserDeletedTokenCleanupListener::class);
-		$eventDispatcher->addServiceListener(BeforeUserDeletedEvent::class, UserDeletedFilesCleanupListener::class);
-		$eventDispatcher->addServiceListener(UserDeletedEvent::class, UserDeletedFilesCleanupListener::class);
-		$eventDispatcher->addServiceListener(UserDeletedEvent::class, UserDeletedWebAuthnCleanupListener::class);
-
-		// Metadata
-		/** @var IConfig $config */
-		$config = $container->get(IConfig::class);
-		if ($config->getSystemValueBool('enable_file_metadata', true)) {
-			/** @psalm-suppress InvalidArgument */
-			$eventDispatcher->addServiceListener(NodeDeletedEvent::class, FileEventListener::class);
-			/** @psalm-suppress InvalidArgument */
-			$eventDispatcher->addServiceListener(NodeRemovedFromCache::class, FileEventListener::class);
-			/** @psalm-suppress InvalidArgument */
-			$eventDispatcher->addServiceListener(NodeWrittenEvent::class, FileEventListener::class);
-		}
-
-		// Tags
-		$eventDispatcher->addServiceListener(UserDeletedEvent::class, TagManager::class);
-	}
+    public function __construct() {
+        parent::__construct('core');
+
+        $container = $this->getContainer();
+
+        $container->registerService('defaultMailAddress', function () {
+            return Util::getDefaultEmailAddress('lostpassword-noreply');
+        });
+
+        $server = $container->getServer();
+        /** @var IEventDispatcher $eventDispatcher */
+        $eventDispatcher = $server->get(IEventDispatcher::class);
+
+        $notificationManager = $server->getNotificationManager();
+        $notificationManager->registerNotifierService(CoreNotifier::class);
+        $notificationManager->registerNotifierService(AuthenticationNotifier::class);
+
+        $oldEventDispatcher = $server->getEventDispatcher();
+
+        $oldEventDispatcher->addListener(IDBConnection::CHECK_MISSING_INDEXES_EVENT,
+            function (GenericEvent $event) use ($container) {
+                /** @var MissingIndexInformation $subject */
+                $subject = $event->getSubject();
+
+                $schema = new SchemaWrapper($container->query(Connection::class));
+
+                if ($schema->hasTable('share')) {
+                    $table = $schema->getTable('share');
+
+                    if (!$table->hasIndex('share_with_index')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'share_with_index');
+                    }
+                    if (!$table->hasIndex('parent_index')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'parent_index');
+                    }
+                    if (!$table->hasIndex('owner_index')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'owner_index');
+                    }
+                    if (!$table->hasIndex('initiator_index')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'initiator_index');
+                    }
+                }
+
+                if ($schema->hasTable('filecache')) {
+                    $table = $schema->getTable('filecache');
+
+                    if (!$table->hasIndex('fs_mtime')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'fs_mtime');
+                    }
+
+                    if (!$table->hasIndex('fs_size')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'fs_size');
+                    }
+
+                    if (!$table->hasIndex('fs_id_storage_size')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'fs_id_storage_size');
+                    }
+
+                    if (!$table->hasIndex('fs_storage_path_prefix') && !$schema->getDatabasePlatform() instanceof PostgreSQL94Platform) {
+                        $subject->addHintForMissingSubject($table->getName(), 'fs_storage_path_prefix');
+                    }
+
+                    if (!$table->hasIndex('fs_parent')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'fs_parent');
+                    }
+                }
+
+                if ($schema->hasTable('twofactor_providers')) {
+                    $table = $schema->getTable('twofactor_providers');
+
+                    if (!$table->hasIndex('twofactor_providers_uid')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'twofactor_providers_uid');
+                    }
+                }
+
+                if ($schema->hasTable('login_flow_v2')) {
+                    $table = $schema->getTable('login_flow_v2');
+
+                    if (!$table->hasIndex('poll_token')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'poll_token');
+                    }
+                    if (!$table->hasIndex('login_token')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'login_token');
+                    }
+                    if (!$table->hasIndex('timestamp')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'timestamp');
+                    }
+                }
+
+                if ($schema->hasTable('whats_new')) {
+                    $table = $schema->getTable('whats_new');
+
+                    if (!$table->hasIndex('version')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'version');
+                    }
+                }
+
+                if ($schema->hasTable('cards')) {
+                    $table = $schema->getTable('cards');
+
+                    if (!$table->hasIndex('cards_abid')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'cards_abid');
+                    }
+
+                    if (!$table->hasIndex('cards_abiduri')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'cards_abiduri');
+                    }
+                }
+
+                if ($schema->hasTable('cards_properties')) {
+                    $table = $schema->getTable('cards_properties');
+
+                    if (!$table->hasIndex('cards_prop_abid')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'cards_prop_abid');
+                    }
+                }
+
+                if ($schema->hasTable('calendarobjects_props')) {
+                    $table = $schema->getTable('calendarobjects_props');
+
+                    if (!$table->hasIndex('calendarobject_calid_index')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'calendarobject_calid_index');
+                    }
+                }
+
+                if ($schema->hasTable('schedulingobjects')) {
+                    $table = $schema->getTable('schedulingobjects');
+                    if (!$table->hasIndex('schedulobj_principuri_index')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'schedulobj_principuri_index');
+                    }
+                }
+
+                if ($schema->hasTable('properties')) {
+                    $table = $schema->getTable('properties');
+                    if (!$table->hasIndex('properties_path_index')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'properties_path_index');
+                    }
+                    if (!$table->hasIndex('properties_pathonly_index')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'properties_pathonly_index');
+                    }
+                }
+
+                if ($schema->hasTable('jobs')) {
+                    $table = $schema->getTable('jobs');
+                    if (!$table->hasIndex('job_lastcheck_reserved')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'job_lastcheck_reserved');
+                    }
+                }
+
+                if ($schema->hasTable('direct_edit')) {
+                    $table = $schema->getTable('direct_edit');
+                    if (!$table->hasIndex('direct_edit_timestamp')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'direct_edit_timestamp');
+                    }
+                }
+
+                if ($schema->hasTable('preferences')) {
+                    $table = $schema->getTable('preferences');
+                    if (!$table->hasIndex('preferences_app_key')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'preferences_app_key');
+                    }
+                }
+
+                if ($schema->hasTable('mounts')) {
+                    $table = $schema->getTable('mounts');
+                    if (!$table->hasIndex('mounts_class_index')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'mounts_class_index');
+                    }
+                    if (!$table->hasIndex('mounts_user_root_path_index')) {
+                        $subject->addHintForMissingSubject($table->getName(), 'mounts_user_root_path_index');
+                    }
+                }
+            }
+        );
+
+        $oldEventDispatcher->addListener(IDBConnection::CHECK_MISSING_PRIMARY_KEYS_EVENT,
+            function (GenericEvent $event) use ($container) {
+                /** @var MissingPrimaryKeyInformation $subject */
+                $subject = $event->getSubject();
+
+                $schema = new SchemaWrapper($container->query(Connection::class));
+
+                if ($schema->hasTable('federated_reshares')) {
+                    $table = $schema->getTable('federated_reshares');
+
+                    if (!$table->hasPrimaryKey()) {
+                        $subject->addHintForMissingSubject($table->getName());
+                    }
+                }
+
+                if ($schema->hasTable('systemtag_object_mapping')) {
+                    $table = $schema->getTable('systemtag_object_mapping');
+
+                    if (!$table->hasPrimaryKey()) {
+                        $subject->addHintForMissingSubject($table->getName());
+                    }
+                }
+
+                if ($schema->hasTable('comments_read_markers')) {
+                    $table = $schema->getTable('comments_read_markers');
+
+                    if (!$table->hasPrimaryKey()) {
+                        $subject->addHintForMissingSubject($table->getName());
+                    }
+                }
+
+                if ($schema->hasTable('collres_resources')) {
+                    $table = $schema->getTable('collres_resources');
+
+                    if (!$table->hasPrimaryKey()) {
+                        $subject->addHintForMissingSubject($table->getName());
+                    }
+                }
+
+                if ($schema->hasTable('collres_accesscache')) {
+                    $table = $schema->getTable('collres_accesscache');
+
+                    if (!$table->hasPrimaryKey()) {
+                        $subject->addHintForMissingSubject($table->getName());
+                    }
+                }
+
+                if ($schema->hasTable('filecache_extended')) {
+                    $table = $schema->getTable('filecache_extended');
+
+                    if (!$table->hasPrimaryKey()) {
+                        $subject->addHintForMissingSubject($table->getName());
+                    }
+                }
+            }
+        );
+
+        $oldEventDispatcher->addListener(IDBConnection::CHECK_MISSING_COLUMNS_EVENT,
+            function (GenericEvent $event) use ($container) {
+                /** @var MissingColumnInformation $subject */
+                $subject = $event->getSubject();
+
+                $schema = new SchemaWrapper($container->query(Connection::class));
+
+                if ($schema->hasTable('comments')) {
+                    $table = $schema->getTable('comments');
+
+                    if (!$table->hasColumn('reference_id')) {
+                        $subject->addHintForMissingColumn($table->getName(), 'reference_id');
+                    }
+                }
+            }
+        );
+
+        $eventDispatcher->addServiceListener(BeforeTemplateRenderedEvent::class, BeforeTemplateRenderedListener::class);
+        $eventDispatcher->addServiceListener(RemoteWipeStarted::class, RemoteWipeActivityListener::class);
+        $eventDispatcher->addServiceListener(RemoteWipeStarted::class, RemoteWipeNotificationsListener::class);
+        $eventDispatcher->addServiceListener(RemoteWipeStarted::class, RemoteWipeEmailListener::class);
+        $eventDispatcher->addServiceListener(RemoteWipeFinished::class, RemoteWipeActivityListener::class);
+        $eventDispatcher->addServiceListener(RemoteWipeFinished::class, RemoteWipeNotificationsListener::class);
+        $eventDispatcher->addServiceListener(RemoteWipeFinished::class, RemoteWipeEmailListener::class);
+        $eventDispatcher->addServiceListener(UserDeletedEvent::class, UserDeletedStoreCleanupListener::class);
+        $eventDispatcher->addServiceListener(UserDeletedEvent::class, UserDeletedTokenCleanupListener::class);
+        $eventDispatcher->addServiceListener(BeforeUserDeletedEvent::class, UserDeletedFilesCleanupListener::class);
+        $eventDispatcher->addServiceListener(UserDeletedEvent::class, UserDeletedFilesCleanupListener::class);
+        $eventDispatcher->addServiceListener(UserDeletedEvent::class, UserDeletedWebAuthnCleanupListener::class);
+
+        // Metadata
+        /** @var IConfig $config */
+        $config = $container->get(IConfig::class);
+        if ($config->getSystemValueBool('enable_file_metadata', true)) {
+            /** @psalm-suppress InvalidArgument */
+            $eventDispatcher->addServiceListener(NodeDeletedEvent::class, FileEventListener::class);
+            /** @psalm-suppress InvalidArgument */
+            $eventDispatcher->addServiceListener(NodeRemovedFromCache::class, FileEventListener::class);
+            /** @psalm-suppress InvalidArgument */
+            $eventDispatcher->addServiceListener(NodeWrittenEvent::class, FileEventListener::class);
+        }
+
+        // Tags
+        $eventDispatcher->addServiceListener(UserDeletedEvent::class, TagManager::class);
+    }
 }