From: Louis Chemineau <louis@chmn.me>
Date: Mon, 18 Dec 2023 12:09:20 +0000 (+0100)
Subject: Don't query oc_properties for metadata props
X-Git-Tag: v29.0.0beta1~625^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6aa2d2daee3e9649305a9b636495bb76473aa6b0;p=nextcloud-server.git

Don't query oc_properties for metadata props

Signed-off-by: Louis Chemineau <louis@chmn.me>
---

diff --git a/apps/dav/lib/DAV/CustomPropertiesBackend.php b/apps/dav/lib/DAV/CustomPropertiesBackend.php
index 989d049fbd1..311fe0ea561 100644
--- a/apps/dav/lib/DAV/CustomPropertiesBackend.php
+++ b/apps/dav/lib/DAV/CustomPropertiesBackend.php
@@ -27,6 +27,7 @@ namespace OCA\DAV\DAV;
 
 use Exception;
 use OCA\DAV\Connector\Sabre\Directory;
+use OCA\DAV\Connector\Sabre\FilesPlugin;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
 use OCP\IUser;
@@ -136,7 +137,7 @@ class CustomPropertiesBackend implements BackendInterface {
 	public function __construct(
 		Tree $tree,
 		IDBConnection $connection,
-		IUser $user
+		IUser $user,
 	) {
 		$this->tree = $tree;
 		$this->connection = $connection;
@@ -156,7 +157,11 @@ class CustomPropertiesBackend implements BackendInterface {
 		// these might appear
 		$requestedProps = array_diff(
 			$requestedProps,
-			self::IGNORED_PROPERTIES
+			self::IGNORED_PROPERTIES,
+		);
+		$requestedProps = array_filter(
+			$requestedProps,
+			fn ($prop) => !str_starts_with($prop, FilesPlugin::FILE_METADATA_PREFIX),
 		);
 
 		// substr of calendars/ => path is inside the CalDAV component