From 45ce82c5c6faaa6690b2f0f4f4826b45a69971de Mon Sep 17 00:00:00 2001 From: fogelito Date: Tue, 10 Feb 2026 16:56:38 +0200 Subject: [PATCH] addJoinCollectionId --- composer.lock | 53 +++++++++---------- .../Databases/Collections/Documents/XList.php | 8 +-- 2 files changed, 30 insertions(+), 31 deletions(-) diff --git a/composer.lock b/composer.lock index 615a9296cd..bd229b626e 100644 --- a/composer.lock +++ b/composer.lock @@ -216,16 +216,16 @@ }, { "name": "brick/math", - "version": "0.14.7", + "version": "0.14.8", "source": { "type": "git", "url": "https://github.com/brick/math.git", - "reference": "07ff363b16ef8aca9692bba3be9e73fe63f34e50" + "reference": "63422359a44b7f06cae63c3b429b59e8efcc0629" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/brick/math/zipball/07ff363b16ef8aca9692bba3be9e73fe63f34e50", - "reference": "07ff363b16ef8aca9692bba3be9e73fe63f34e50", + "url": "https://api.github.com/repos/brick/math/zipball/63422359a44b7f06cae63c3b429b59e8efcc0629", + "reference": "63422359a44b7f06cae63c3b429b59e8efcc0629", "shasum": "" }, "require": { @@ -264,7 +264,7 @@ ], "support": { "issues": "https://github.com/brick/math/issues", - "source": "https://github.com/brick/math/tree/0.14.7" + "source": "https://github.com/brick/math/tree/0.14.8" }, "funding": [ { @@ -272,7 +272,7 @@ "type": "github" } ], - "time": "2026-02-07T10:57:35+00:00" + "time": "2026-02-10T14:33:43+00:00" }, { "name": "chillerlan/php-qrcode", @@ -1355,16 +1355,16 @@ }, { "name": "open-telemetry/exporter-otlp", - "version": "1.3.4", + "version": "1.4.0", "source": { "type": "git", "url": "https://github.com/opentelemetry-php/exporter-otlp.git", - "reference": "62e680d587beb42e5247aa6ecd89ad1ca406e8ca" + "reference": "283a0d66522f2adc6d8d7debfd7686be91c282be" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/opentelemetry-php/exporter-otlp/zipball/62e680d587beb42e5247aa6ecd89ad1ca406e8ca", - "reference": "62e680d587beb42e5247aa6ecd89ad1ca406e8ca", + "url": "https://api.github.com/repos/opentelemetry-php/exporter-otlp/zipball/283a0d66522f2adc6d8d7debfd7686be91c282be", + "reference": "283a0d66522f2adc6d8d7debfd7686be91c282be", "shasum": "" }, "require": { @@ -1415,7 +1415,7 @@ "issues": "https://github.com/open-telemetry/opentelemetry-php/issues", "source": "https://github.com/open-telemetry/opentelemetry-php" }, - "time": "2026-01-15T09:31:34+00:00" + "time": "2026-02-05T09:44:52+00:00" }, { "name": "open-telemetry/gen-otlp-protobuf", @@ -1482,16 +1482,16 @@ }, { "name": "open-telemetry/sdk", - "version": "1.12.0", + "version": "1.13.0", "source": { "type": "git", "url": "https://github.com/opentelemetry-php/sdk.git", - "reference": "7f1bd524465c1ca42755a9ef1143ba09913f5be0" + "reference": "c76f91203bf7ef98ab3f4e0a82ca21699af185e1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/opentelemetry-php/sdk/zipball/7f1bd524465c1ca42755a9ef1143ba09913f5be0", - "reference": "7f1bd524465c1ca42755a9ef1143ba09913f5be0", + "url": "https://api.github.com/repos/opentelemetry-php/sdk/zipball/c76f91203bf7ef98ab3f4e0a82ca21699af185e1", + "reference": "c76f91203bf7ef98ab3f4e0a82ca21699af185e1", "shasum": "" }, "require": { @@ -1575,7 +1575,7 @@ "issues": "https://github.com/open-telemetry/opentelemetry-php/issues", "source": "https://github.com/open-telemetry/opentelemetry-php" }, - "time": "2026-01-21T04:14:03+00:00" + "time": "2026-01-28T11:38:11+00:00" }, { "name": "open-telemetry/sem-conv", @@ -3799,12 +3799,12 @@ "source": { "type": "git", "url": "https://github.com/utopia-php/database.git", - "reference": "5564abe0598cc1c388eee615a2af41bd95c4c90a" + "reference": "a118f464c942afdd4cf7f63928ff2f774139b758" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/utopia-php/database/zipball/5564abe0598cc1c388eee615a2af41bd95c4c90a", - "reference": "5564abe0598cc1c388eee615a2af41bd95c4c90a", + "url": "https://api.github.com/repos/utopia-php/database/zipball/a118f464c942afdd4cf7f63928ff2f774139b758", + "reference": "a118f464c942afdd4cf7f63928ff2f774139b758", "shasum": "" }, "require": { @@ -3849,7 +3849,7 @@ "issues": "https://github.com/utopia-php/database/issues", "source": "https://github.com/utopia-php/database/tree/joins8" }, - "time": "2026-02-10T10:01:39+00:00" + "time": "2026-02-10T14:54:39+00:00" }, { "name": "utopia-php/detector", @@ -4785,22 +4785,21 @@ }, { "name": "utopia-php/queue", - "version": "0.15.4", + "version": "0.15.5", "source": { "type": "git", "url": "https://github.com/utopia-php/queue.git", - "reference": "2d693ec59119f853602f4be271602fddefbab507" + "reference": "aa80ffe6350efd3394615c3763dba138223a225a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/utopia-php/queue/zipball/2d693ec59119f853602f4be271602fddefbab507", - "reference": "2d693ec59119f853602f4be271602fddefbab507", + "url": "https://api.github.com/repos/utopia-php/queue/zipball/aa80ffe6350efd3394615c3763dba138223a225a", + "reference": "aa80ffe6350efd3394615c3763dba138223a225a", "shasum": "" }, "require": { "php": ">=8.3", "php-amqplib/php-amqplib": "^3.7", - "utopia-php/console": "0.0.*", "utopia-php/fetch": "0.5.*", "utopia-php/pools": "1.*", "utopia-php/servers": "0.2.*", @@ -4846,9 +4845,9 @@ ], "support": { "issues": "https://github.com/utopia-php/queue/issues", - "source": "https://github.com/utopia-php/queue/tree/0.15.4" + "source": "https://github.com/utopia-php/queue/tree/0.15.5" }, - "time": "2026-02-04T08:50:35+00:00" + "time": "2026-02-10T12:30:46+00:00" }, { "name": "utopia-php/registry", diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/XList.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/XList.php index b233fdd8bc..5ff3619c2f 100644 --- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/XList.php +++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/XList.php @@ -101,16 +101,16 @@ class XList extends Action $joins = Query::getJoinQueries($queries, false); foreach ($joins as $join) { - $col = $authorization->skip(fn () => $dbForProject->getDocument('database_' . $database->getSequence(), $join->getCollection())); + $col = $authorization->skip(fn () => $dbForProject->getDocument('database_' . $database->getSequence(), $join->getCollectionId())); if ($col->isEmpty() || (!$col->getAttribute('enabled', false) && !$isAPIKey && !$isPrivilegedUser)) { - throw new Exception($this->getParentNotFoundException(), params: [$join->getCollection()]); + throw new Exception($this->getParentNotFoundException(), params: [$join->getCollectionId()]); } $collectionTableId = 'database_' . $database->getSequence() . '_collection_' . $col->getSequence(); - $join->setCollection($collectionTableId); - $dbForProject->addJoinCollection($collectionTableId); + $join->setCollectionId($collectionTableId); + $dbForProject->addJoinCollectionId($collectionTableId); } $cursor = Query::getCursorQueries($queries, false);