Skip to content

Add nested spatial query tests #727

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

Merged
abnegate merged 3 commits into from
Oct 6, 2025
Merged

Add nested spatial query tests #727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dea2db0
Add nested spatial query tests
abnegate Oct 5, 2025
81537d4
Fix test
abnegate Oct 6, 2025
584761d
Format
abnegate Oct 6, 2025
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
30 changes: 15 additions & 15 deletions src/Database/Database.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3859,7 +3859,7 @@ private function populateOneToManyRelationshipsBatch(
return [];
}

// For batch relationship population, we need to fetch documents with all fields
// For batch relationship population, we need to fetch documents with all attributes
// to enable proper grouping by back-reference, then apply selects afterward
$selectQueries = [];
$otherQueries = [];
Expand Down Expand Up @@ -4131,30 +4131,30 @@ private function applySelectFiltersToDocuments(array $documents, array $selectQu
return;
}

// Collect all fields to keep from select queries
$fieldsToKeep = [];
// Collect all attributes to keep from select queries
$attributesToKeep = [];
foreach ($selectQueries as $selectQuery) {
foreach ($selectQuery->getValues() as $value) {
$fieldsToKeep[$value] = true;
$attributesToKeep[$value] = true;
}
}

// Early return if wildcard selector present
if (isset($fieldsToKeep['*'])) {
if (isset($attributesToKeep['*'])) {
return;
}

// Always preserve internal attributes (use hashmap for O(1) lookup)
$internalKeys = \array_map(fn ($attr) => $attr['$id'], $this->getInternalAttributes());
foreach ($internalKeys as $key) {
$fieldsToKeep[$key] = true;
$attributesToKeep[$key] = true;
}

foreach ($documents as $doc) {
$allKeys = \array_keys($doc->getArrayCopy());
foreach ($allKeys as $attrKey) {
// Keep if: explicitly selected OR is internal attribute ($ prefix)
if (!isset($fieldsToKeep[$attrKey]) && !\str_starts_with($attrKey, '$')) {
if (!isset($attributesToKeep[$attrKey]) && !\str_starts_with($attrKey, '$')) {
$doc->removeAttribute($attrKey);
}
}
Expand Down Expand Up @@ -7640,7 +7640,7 @@ private function processRelationshipQueries(

$nestingPath = \implode('.', $nesting);

// If nestingPath is empty, it means we want all fields (*) for this relationship
// If nestingPath is empty, it means we want all attributes (*) for this relationship
if (empty($nestingPath)) {
$nestedSelections[$selectedKey][] = Query::select(['*']);
} else {
Expand Down Expand Up @@ -7716,7 +7716,7 @@ private function processNestedRelationshipPath(string $startCollection, array $q
}
$pathGroups[$pathKey][] = [
'method' => $query->getMethod(),
'field' => \end($parts), // The actual field to query
'attribute' => \end($parts), // The actual attribute to query
'values' => $query->getValues(),
];
}
Expand Down Expand Up @@ -7762,7 +7762,7 @@ private function processNestedRelationshipPath(string $startCollection, array $q
// Now walk backwards from the deepest collection to the starting collection
$leafQueries = [];
foreach ($queryGroup as $q) {
$leafQueries[] = new Query($q['method'], $q['field'], $q['values']);
$leafQueries[] = new Query($q['method'], $q['attribute'], $q['values']);
}

// Query the deepest collection
Expand Down Expand Up @@ -7864,7 +7864,7 @@ private function processNestedRelationshipPath(string $startCollection, array $q
* The method works by:
* 1. Parsing dot-path queries (e.g., "project.employee.company.name")
* 2. Extracting the first relationship (e.g., "project")
* 3. If the nested field still contains dots, using iterative processing
* 3. If the nested attribute still contains dots, using iterative processing
* 4. Finding matching documents in the related collection
* 5. Converting to filters on the parent collection
*
Expand Down Expand Up @@ -7914,7 +7914,7 @@ private function convertRelationshipFiltersToSubqueries(
// Parse the relationship path
$parts = \explode('.', $attribute);
$relationshipKey = \array_shift($parts);
$nestedField = \implode('.', $parts);
$nestedAttribute = \implode('.', $parts);
$relationship = $relationshipsByKey[$relationshipKey] ?? null;

if (!$relationship) {
Expand All @@ -7932,7 +7932,7 @@ private function convertRelationshipFiltersToSubqueries(

$groupedQueries[$relationshipKey]['queries'][] = [
'method' => $method,
'field' => $nestedField,
'attribute' => $nestedAttribute,
'values' => $query->getValues()
];

Expand All @@ -7951,7 +7951,7 @@ private function convertRelationshipFiltersToSubqueries(
foreach ($group['queries'] as $queryData) {
$relatedQueries[] = new Query(
$queryData['method'],
$queryData['field'],
$queryData['attribute'],
$queryData['values']
);
}
Expand Down Expand Up @@ -8055,7 +8055,7 @@ private function convertRelationshipFiltersToSubqueries(
return null;
}
} else {
// For other types, filter by the relationship field
// For other types, filter by the relationship attribute
if (!empty($matchingIds)) {
$additionalQueries[] = Query::equal($relationshipKey, $matchingIds);
} else {
Expand Down
Loading