fix backport

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
nextcloud · Nov 28, 2024 · 04d4079 · 04d4079
1 parent 3a6a46e
commit 04d4079
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/lib/Db/MountRequest.php b/lib/Db/MountRequest.php
@@ -55,8 +55,8 @@ public function save(Mount $mount): void {
 		   ->setValue('single_id', $qb->createNamedParameter($mount->getOwner()->getSingleId()))
 		   ->setValue('token', $qb->createNamedParameter($mount->getToken()))
 		   ->setValue('parent', $qb->createNamedParameter($mount->getParent()))
-		   ->setValue('mountpoint', $qb->createNamedParameter($mount->getMountPoint()))
-		   ->setValue('mountpoint_hash', $qb->createNamedParameter(md5($mount->getMountPoint())));
+		   ->setValue('mountpoint', $qb->createNamedParameter($mount->getOriginalMountPoint()))
+		   ->setValue('mountpoint_hash', $qb->createNamedParameter(md5($mount->getOriginalMountPoint())));
 
 		$qb->execute();
 	}

diff --git a/lib/Migration/Version0031Date20241105133904.php b/lib/Migration/Version0031Date20241105133904.php
@@ -14,6 +14,8 @@
 use Closure;
 use Doctrine\DBAL\Schema\SchemaException;
 use OCP\DB\ISchemaWrapper;
+use OCP\Migration\Attributes\AddIndex;
+use OCP\Migration\Attributes\IndexType;
 use OCP\Migration\IOutput;
 use OCP\Migration\SimpleMigrationStep;
 use Psr\Log\LoggerInterface;
@@ -30,7 +32,7 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 
 		try {
 			$table = $schema->getTable('circles_mountpoint');
-			if (!$table->hasIndex('dname')) {
+			if (!$table->hasIndex('mp_sid_hash')) {
 				$table->addUniqueIndex(['single_id', 'mountpoint_hash'], 'mp_sid_hash');
 			}
 		} catch (SchemaException $e) {

diff --git a/lib/MountManager/CircleMountProvider.php b/lib/MountManager/CircleMountProvider.php
@@ -72,7 +72,8 @@ public function __construct(
 		private MountRequest $mountRequest,
 		private MountPointRequest $mountPointRequest,
 		private FederatedUserService $federatedUserService,
-		private ConfigService $configService
+		private ConfigService $configService,
+		private LoggerInterface $logger,
 	) {
 	}