chore: drop \OCP\DB (#41458)

Author: DeepDiver1975

apps/files_sharing/lib/Helper.php

@@ -163,93 +163,6 @@ public static function authenticate($linkItem, $password = null) {
 		return true;
 	}
 
-	public static function getSharesFromItem($target) {
-		$result = [];
-		$owner = Filesystem::getOwner($target);
-		Filesystem::initMountPoints($owner);
-		$info = Filesystem::getFileInfo($target);
-		$ownerView = new View('/'.$owner.'/files');
-		if ($owner != User::getUser()) {
-			$path = $ownerView->getPath($info['fileid']);
-		} else {
-			$path = $target;
-		}
-
-		$ids = [];
-		while ($path !== \dirname($path)) {
-			$info = $ownerView->getFileInfo($path);
-			if ($info instanceof \OC\Files\FileInfo) {
-				$ids[] = $info['fileid'];
-			} else {
-				\OCP\Util::writeLog('files_sharing', 'No fileinfo available for: ' . $path, \OCP\Util::WARN);
-			}
-			$path = \dirname($path);
-		}
-
-		if (!empty($ids)) {
-			$idList = \array_chunk($ids, 99, true);
-
-			foreach ($idList as $subList) {
-				$statement = "SELECT `share_with`, `share_type`, `file_target` FROM `*PREFIX*share` WHERE `file_source` IN (" . \implode(',', $subList) . ") AND `share_type` IN (0, 1, 2)";
-				$query = \OCP\DB::prepare($statement);
-				$r = $query->execute();
-				$result = \array_merge($result, $r->fetchAll());
-			}
-		}
-
-		return $result;
-	}
-
-	/**
-	 * get the UID of the owner of the file and the path to the file relative to
-	 * owners files folder
-	 *
-	 * @param $filename
-	 * @return array
-	 * @throws \OC\User\NoUserException
-	 */
-	public static function getUidAndFilename($filename) {
-		$uid = Filesystem::getOwner($filename);
-		$userManager = \OC::$server->getUserManager();
-		// if the user with the UID doesn't exists, e.g. because the UID points
-		// to a remote user with a federated cloud ID we use the current logged-in
-		// user. We need a valid local user to create the share
-		if (!$userManager->userExists($uid)) {
-			$uid = User::getUser();
-		}
-		Filesystem::initMountPoints($uid);
-		if ($uid != User::getUser()) {
-			$info = Filesystem::getFileInfo($filename);
-			$ownerView = new View('/'.$uid.'/files');
-			try {
-				$filename = $ownerView->getPath($info['fileid']);
-			} catch (NotFoundException $e) {
-				$filename = null;
-			}
-		}
-		return [$uid, $filename];
-	}
-
-	/**
-	 * Format a path to be relative to the /user/files/ directory
-	 * @param string $path the absolute path
-	 * @return string e.g. turns '/admin/files/test.txt' into 'test.txt'
-	 */
-	public static function stripUserFilesPath($path) {
-		$trimmed = \ltrim($path, '/');
-		$split = \explode('/', $trimmed);
-
-		// it is not a file relative to data/user/files
-		if (\count($split) < 3 || $split[1] !== 'files') {
-			return false;
-		}
-
-		$sliced = \array_slice($split, 2);
-		$relPath = \implode('/', $sliced);
-
-		return $relPath;
-	}
-
 	/**
 	 * check if file name already exists and generate unique target
 	 *

apps/files_sharing/lib/ShareBackend/File.php

@@ -194,48 +194,4 @@ public function isShareTypeAllowed($shareType) {
 
 		return true;
 	}
-
-	/**
-	 * resolve reshares to return the correct source item
-	 * @param array $source
-	 * @return array source item
-	 */
-	protected static function resolveReshares($source) {
-		if (isset($source['parent'])) {
-			$parent = $source['parent'];
-			while (isset($parent)) {
-				$query = \OCP\DB::prepare('SELECT `parent`, `uid_owner` FROM `*PREFIX*share` WHERE `id` = ?', 1);
-				$item = $query->execute([$parent])->fetchRow();
-				if (isset($item['parent'])) {
-					$parent = $item['parent'];
-				} else {
-					$fileOwner = $item['uid_owner'];
-					break;
-				}
-			}
-		} else {
-			$fileOwner = $source['uid_owner'];
-		}
-		if (isset($fileOwner)) {
-			$source['fileOwner'] = $fileOwner;
-		} else {
-			\OCP\Util::writeLog('files_sharing', "No owner found for reshare", \OCP\Util::ERROR);
-		}
-
-		return $source;
-	}
-
-	/**
-	 * @param string $target
-	 * @param array $share
-	 * @return array|false source item
-	 */
-	public static function getSource($target, $share) {
-		if ($share['item_type'] === 'folder' && $target !== '') {
-			// note: in case of ext storage mount points the path might be empty
-			// which would cause a leading slash to appear
-			$share['path'] = \ltrim($share['path'] . '/' . $target, '/');
-		}
-		return self::resolveReshares($share);
-	}
 }

apps/files_sharing/lib/ShareBackend/Folder.php

@@ -69,37 +69,41 @@ public function getParents($itemSource, $shareWith = null, $owner = null) {
 	 * @return mixed parent ID or null
 	 */
 	private function getParentId($child) {
-		$query = \OCP\DB::prepare('SELECT `parent` FROM `*PREFIX*filecache` WHERE `fileid` = ?');
-		$result = $query->execute([$child]);
-		$row = $result->fetchRow();
+		$query = \OC::$server->getDatabaseConnection()->prepare('SELECT `parent` FROM `*PREFIX*filecache` WHERE `fileid` = ?');
+		$result = $query->executeQuery([$child]);
+		$row = $result->fetchAssociative();
 		$parent = ($row) ? $row['parent'] : null;
+		$result->free();
 
 		return $parent;
 	}
 
 	public function getChildren($itemSource) {
 		$children = [];
 		$parents = [$itemSource];
-		$query = \OCP\DB::prepare('SELECT `id` FROM `*PREFIX*mimetypes` WHERE `mimetype` = ?');
-		$result = $query->execute(['httpd/unix-directory']);
-		if ($row = $result->fetchRow()) {
+		$query = \OC::$server->getDatabaseConnection()->prepare('SELECT `id` FROM `*PREFIX*mimetypes` WHERE `mimetype` = ?');
+		$result = $query->executeQuery(['httpd/unix-directory']);
+		if ($row = $result->fetchAssociative()) {
 			$mimetype = $row['id'];
 		} else {
 			$mimetype = -1;
 		}
+		$result->free();
+
 		while (!empty($parents)) {
 			$parents = "'".\implode("','", $parents)."'";
-			$query = \OCP\DB::prepare('SELECT `fileid`, `name`, `mimetype` FROM `*PREFIX*filecache`'
+			$query = \OC::$server->getDatabaseConnection()->prepare('SELECT `fileid`, `name`, `mimetype` FROM `*PREFIX*filecache`'
 				.' WHERE `parent` IN ('.$parents.')');
-			$result = $query->execute();
+			$result = $query->executeQuery();
 			$parents = [];
-			while ($file = $result->fetchRow()) {
+			while ($file = $result->fetchAssociative()) {
 				$children[] = ['source' => $file['fileid'], 'file_path' => $file['name']];
 				// If a child folder is found look inside it
 				if ($file['mimetype'] == $mimetype) {
 					$parents[] = $file['fileid'];
 				}
 			}
+			$result->free();
 		}
 		return $children;
 	}

apps/files_sharing/tests/ApiTest.php

@@ -1443,11 +1443,11 @@ public function testDefaultExpireDate() {
 
 		//manipulate stime so that both shares are older then the default expire date
 		$statement = "UPDATE `*PREFIX*share` SET `stime` = ? WHERE `share_type` = ?";
-		$query = \OCP\DB::prepare($statement);
-		$result = $query->execute([$shareCreated, Share::SHARE_TYPE_LINK]);
+		$query = \OC::$server->getDatabaseConnection()->prepare($statement);
+		$result = $query->executeStatement([$shareCreated, Share::SHARE_TYPE_LINK]);
 		$this->assertSame(1, $result);
-		$query = \OCP\DB::prepare($statement);
-		$result = $query->execute([$shareCreated, Share::SHARE_TYPE_USER]);
+		$query = \OC::$server->getDatabaseConnection()->prepare($statement);
+		$result = $query->executeStatement([$shareCreated, Share::SHARE_TYPE_USER]);
 		$this->assertSame(1, $result);
 
 		// now the link share should expire because of enforced default expire date

apps/files_sharing/tests/ShareTest.php

@@ -59,8 +59,7 @@ protected function tearDown(): void {
 		$this->view->deleteAll($this->folder);
 
 		// clear database table
-		$query = \OCP\DB::prepare('DELETE FROM `*PREFIX*share`');
-		$query->execute();
+		\OC::$server->getDatabaseConnection()->executeStatement('DELETE FROM `*PREFIX*share`');
 
 		parent::tearDown();
 	}

apps/files_sharing/tests/TestCase.php

@@ -125,8 +125,7 @@ protected function setUp(): void {
 	}
 
 	protected function tearDown(): void {
-		$query = \OCP\DB::prepare('DELETE FROM `*PREFIX*share`');
-		$query->execute();
+		\OC::$server->getDatabaseConnection()->executeStatement('DELETE FROM `*PREFIX*share`');
 
 		parent::tearDown();
 	}