Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions src/Query.php
Original file line number Diff line number Diff line change
Expand Up @@ -657,6 +657,10 @@ public function createSubQuery(Model $target, string $targetPath, ?Model $from =
foreach ($this->getResolver()->resolveRelations($targetPath, $from) as $relationPath => $relation) {
$predecessor = array_slice(explode('.', $relationPath), -2, 1)[0];
foreach ($relation->reverse($subQueryResolver) as $oppositeRelation) {
// Always override the join type, as a sub-query that is unable
// to establish a link to the outer query is useless anyway.
$oppositeRelation->setJoinType('INNER');

if (
$relation->getReverseName() === null
&& $predecessor !== $oppositeRelation->getName()
Expand Down
3 changes: 2 additions & 1 deletion tests/Lib/Model/Chair.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ public function getColumns()

public function createRelations(Relations $relations)
{
$relations->belongsTo('employee', Employee::class);
$relations->belongsTo('employee', Employee::class)
->setJoinType('LEFT');
}
}
25 changes: 25 additions & 0 deletions tests/QueryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,11 @@
use ipl\Orm\Exception\InvalidRelationException;
use ipl\Orm\Query;
use ipl\Orm\ResolvedExpression;
use ipl\Sql\Connection;
use ipl\Sql\Expression;
use ipl\Sql\Test\TestCase;
use ipl\Stdlib\Filter;
use ipl\Tests\Orm\Lib\Model\Employee;

class QueryTest extends TestCase
{
Expand Down Expand Up @@ -607,4 +610,26 @@ public function testWithoutColumnsDoesNotWorkWithExpressions()
$query->assembleSelect()
);
}

public function testSubQueriesOverrideTheJoinType(): void
{
$query = (new Query())
->setDb($this->createStub(Connection::class))
->setModel(new Employee())
->columns('name')
->filter(Filter::equal('chair.vendor', 'Icinga'));

$this->assertSql(
<<<'SQL'
SELECT employee.name FROM employee
WHERE (employee.deleted = ?) AND (employee.id IN ((SELECT sub_chair_employee.id AS sub_chair_employee_id
FROM chair sub_chair
INNER JOIN employee sub_chair_employee
ON (sub_chair_employee.id = sub_chair.employee_id) AND (sub_chair_employee.deleted = ?)
WHERE sub_chair.vendor = ?)))
SQL,
$query->assembleSelect(),
['n', 'n', 'Icinga']
);
}
}
Loading