Keep direct filters

abnegate · abnegate · commit 49f8d4000d06 · 2026-02-17T23:37:39.000+13:00
diff --git a/src/Database/Database.php b/src/Database/Database.php
@@ -9261,7 +9261,10 @@ private function resolveRelationshipGroupToIds(
                 return null;
             }
 
-            $relatedQueries = [Query::equal('$id', $matchingIds)];
+            $relatedQueries = \array_values(\array_merge(
+                \array_filter($relatedQueries, fn (Query $q) => !\str_contains($q->getAttribute(), '.')),
+                [Query::equal('$id', $matchingIds)]
+            ));
         }
 
         $needsParentResolution = (

Original file line number	Diff line number	Diff line change
`@@ -9261,7 +9261,10 @@ private function resolveRelationshipGroupToIds(`
`9261`	`9261`	`return null;`
`9262`	`9262`	`}`
`9263`	`9263`
`9264`		`- $relatedQueries = [Query::equal('$id', $matchingIds)];`
	`9264`	`+ $relatedQueries = \array_values(\array_merge(`
	`9265`	`+ \array_filter($relatedQueries, fn (Query $q) => !\str_contains($q->getAttribute(), '.')),`
	`9266`	`+ [Query::equal('$id', $matchingIds)]`
	`9267`	`+ ));`
`9265`	`9268`	`}`
`9266`	`9269`
`9267`	`9270`	`$needsParentResolution = (`