Skip to content
This repository was archived by the owner on Jun 25, 2025. It is now read-only.

Commit 545110b

Browse files
committed
Fixed subqueries
1 parent d861f57 commit 545110b

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

Query/Query.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1469,11 +1469,9 @@ public function toArray(): array
14691469
? $this->user->toArray()
14701470
: null,
14711471
'metadata' => $this->metadata,
1472-
'subqueries' => array_filter(
1473-
array_map(function (Query $query) {
1474-
return $query->toArray();
1475-
}, $this->subqueries)
1476-
),
1472+
'subqueries' => array_map(function (Query $query) {
1473+
return $query->toArray();
1474+
}, $this->subqueries),
14771475
'items_promoted' => array_filter(
14781476
array_map(function (ItemUUID $itemUUID) {
14791477
return $itemUUID->toArray();

Tests/Query/QueryTest.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,18 +175,21 @@ public function testSubqueries()
175175
$query->addSubQuery('sub1', Query::create('sub1'));
176176
$query->addSubQuery('sub2', Query::create('sub2'));
177177
$query->addSubQuery('sub3', Query::create('sub3'));
178-
$this->assertCount(3, $query->getSubqueries());
178+
$query->addSubQuery('sub4', Query::createMatchAll());
179+
$this->assertCount(4, $query->getSubqueries());
179180
$subqueries = HttpHelper::emulateHttpTransport($query)->getSubqueries();
180181
$this->assertEquals('sub1', $subqueries['sub1']->getQueryText());
181182
$this->assertEquals('sub2', $subqueries['sub2']->getQueryText());
182183
$this->assertEquals('sub3', $subqueries['sub3']->getQueryText());
184+
$this->assertEquals('', $subqueries['sub4']->getQueryText());
183185

184186
$query = Query::createMultiquery([
185187
'sub1' => Query::create('sub1'),
186188
'sub2' => Query::create('sub2'),
187189
'sub3' => Query::create('sub3'),
190+
'sub4' => Query::createMatchAll(),
188191
]);
189-
$this->assertCount(3, $query->getSubqueries());
192+
$this->assertCount(4, $query->getSubqueries());
190193
}
191194

192195
/**

0 commit comments

Comments
 (0)