Skip to content

feat: nested relationship queries #968

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
abnegate wants to merge 12 commits into
base: main
Choose a base branch
from
Open

feat: nested relationship queries #968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
4fbe00f
feat(query): add nested relationship query skeleton
abnegate Sep 10, 2026
3a1d6f0
feat(relationships): constrain populated children with dotted filters
abnegate Sep 10, 2026
bf479ee
feat(relationships): honour a nested order in many-to-many population
abnegate Sep 10, 2026
4178761
feat(relationships): apply nested pagination per parent
abnegate Sep 10, 2026
da14adb
(refactor): tidy the merged relationship query router
abnegate Sep 10, 2026
9126f0e
fix(relationships): honour inner nested selects at the next populatio…
abnegate Sep 11, 2026
3b05b8e
fix(relationships): apply nested offset after cursor and keep contain…
abnegate Sep 11, 2026
8e5eceb
fix(relationships): skip nested queries in Redis and match cursor-bef…
abnegate Sep 11, 2026
4d2e99f
fix(mirror): restore source validation after skipValidation
abnegate Sep 11, 2026
c71c5b6
fix(mirror): restore each database's validation flag independently
abnegate Sep 11, 2026
7d62c36
refactor(query): rename Query::nested to Query::relationship
abnegate Sep 12, 2026
b55de41
fix(relationships): validate inner select against the related collection
abnegate Sep 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions src/Database/Adapter/Memory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2561,7 +2561,7 @@ protected function fusedFilter(string $key, string $collectionId, array $queries
$effectiveQueries = [];
foreach ($queries as $query) {
$method = $query->getMethod();
if (\in_array($method, [Query::TYPE_SELECT, Query::TYPE_ORDER_ASC, Query::TYPE_ORDER_DESC, Query::TYPE_ORDER_RANDOM, Query::TYPE_LIMIT, Query::TYPE_OFFSET, Query::TYPE_CURSOR_AFTER, Query::TYPE_CURSOR_BEFORE], true)) {
if (\in_array($method, [Query::TYPE_SELECT, Query::TYPE_ORDER_ASC, Query::TYPE_ORDER_DESC, Query::TYPE_ORDER_RANDOM, Query::TYPE_LIMIT, Query::TYPE_OFFSET, Query::TYPE_CURSOR_AFTER, Query::TYPE_CURSOR_BEFORE, Query::TYPE_RELATIONSHIP], true)) {
continue;
}
$effectiveQueries[] = $query;
Expand Down Expand Up @@ -2614,7 +2614,13 @@ protected function matches(array $row, Query $query): bool

if ($method === Query::TYPE_AND) {
foreach ($query->getValues() as $sub) {
if (! ($sub instanceof Query) || ! $this->matches($row, $sub)) {
if (! ($sub instanceof Query)) {
return false;
}
if ($sub->getMethod() === Query::TYPE_RELATIONSHIP) {
continue;
}
if (! $this->matches($row, $sub)) {
return false;
}
}
Expand All @@ -2624,7 +2630,7 @@ protected function matches(array $row, Query $query): bool

if ($method === Query::TYPE_OR) {
foreach ($query->getValues() as $sub) {
if ($sub instanceof Query && $this->matches($row, $sub)) {
if ($sub instanceof Query && $sub->getMethod() !== Query::TYPE_RELATIONSHIP && $this->matches($row, $sub)) {
return true;
}
}
Expand Down
4 changes: 4 additions & 0 deletions src/Database/Adapter/Mongo.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3091,6 +3091,10 @@ protected function buildFilters(array $queries, string $separator = '$and'): arr

foreach ($queries as $query) {
/* @var $query Query */
if ($query->getMethod() === Query::TYPE_RELATIONSHIP) {
continue;
}

if ($query->isNested()) {
if ($query->getMethod() === Query::TYPE_ELEM_MATCH) {
$filters[$separator][] = [
Expand Down
11 changes: 9 additions & 2 deletions src/Database/Adapter/Redis.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3069,6 +3069,7 @@ private function filterDocumentsByQueries(string $collection, array $documents,
Query::TYPE_OFFSET,
Query::TYPE_CURSOR_AFTER,
Query::TYPE_CURSOR_BEFORE,
Query::TYPE_RELATIONSHIP,
], true)) {
continue;
}
Expand Down Expand Up @@ -3106,7 +3107,13 @@ private function matchesDocument(Document $document, Query $query): bool

if ($method === Query::TYPE_AND) {
foreach ($query->getValues() as $sub) {
if (! ($sub instanceof Query) || ! $this->matchesDocument($document, $sub)) {
if (! ($sub instanceof Query)) {
return false;
}
if ($sub->getMethod() === Query::TYPE_RELATIONSHIP) {
continue;
}
if (! $this->matchesDocument($document, $sub)) {
return false;
}
}
Expand All @@ -3116,7 +3123,7 @@ private function matchesDocument(Document $document, Query $query): bool

if ($method === Query::TYPE_OR) {
foreach ($query->getValues() as $sub) {
if ($sub instanceof Query && $this->matchesDocument($document, $sub)) {
if ($sub instanceof Query && $sub->getMethod() !== Query::TYPE_RELATIONSHIP && $this->matchesDocument($document, $sub)) {
return true;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/Database/Adapter/SQL.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2244,7 +2244,7 @@ public function getSQLConditions(array $queries, array &$binds, string $separato
{
$conditions = [];
foreach ($queries as $query) {
if ($query->getMethod() === Query::TYPE_SELECT) {
if ($query->getMethod() === Query::TYPE_SELECT || $query->getMethod() === Query::TYPE_RELATIONSHIP) {
continue;
}

Expand Down
Loading
Loading