Capture resolved attribute

Author: abnegate

src/Database/Database.php

@@ -9110,6 +9110,7 @@ private function convertRelationshipQueries(
 
             // Resolve each value independently, then intersect parent IDs
             $parentIdSets = [];
+            $resolvedAttribute = '$id';
             foreach ($query->getValues() as $value) {
                 $relatedQuery = Query::equal($nestedAttribute, [$value]);
                 $result = $this->resolveRelationshipGroupToIds($relationship, [$relatedQuery]);
@@ -9118,6 +9119,7 @@ private function convertRelationshipQueries(
                     return null;
                 }
 
+                $resolvedAttribute = $result['attribute'];
                 $parentIdSets[] = $result['ids'];
             }
 
@@ -9129,7 +9131,7 @@ private function convertRelationshipQueries(
                 return null;
             }
 
-            $additionalQueries[] = Query::equal('$id', $ids);
+            $additionalQueries[] = Query::equal($resolvedAttribute, $ids);
             $indicesToRemove[] = $index;
         }