espocrm-extensions/espocrm-base
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix linked where filters

Browse Source
This commit is contained in:
Yuri Kuznetsov
2025-12-18 23:28:27 +02:00
parent 03ac0a57c8
commit 74db03090b
2 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/Espo/Core/Select/Where/ItemGeneralConverter.php
+20 -15
View File
@@ -1358,16 +1358,22 @@ class ItemGeneralConverter implements ItemConverter
$nearKey = $defs->getMidKey(); $nearKey = $defs->getMidKey();
$middleEntityType = ucfirst($defs->getRelationshipName()); $middleEntityType = ucfirst($defs->getRelationshipName());
$conditions = [
"$alias.$nearKey:" => Attribute::ID,
"$alias.deleted" => false,
];
foreach ($defs->getConditions() as $k => $v) {
$conditions["$alias.$k"] = $v;
}
// The foreign table is not joined as it would perform much slower. // The foreign table is not joined as it would perform much slower.
// Trade off is that if a foreign record is deleted but the middle table // Trade off is that if a foreign record is deleted but the middle table
// is not yet deleted, it will give a non-actual result. // is not yet deleted, it will give a non-actual result.
$subQuery = QueryBuilder::create() $subQuery = QueryBuilder::create()
->select(Attribute::ID) ->select(Attribute::ID)
->from($this->entityType) ->from($this->entityType)
->leftJoin($middleEntityType, $alias, [ ->leftJoin($middleEntityType, $alias, $conditions)
"$alias.$nearKey:" => Attribute::ID,
"$alias.deleted" => false,
])
->where(["$alias.$key" => null]) ->where(["$alias.$key" => null])
->build(); ->build();
@@ -1410,16 +1416,22 @@ class ItemGeneralConverter implements ItemConverter
$nearKey = $defs->getMidKey(); $nearKey = $defs->getMidKey();
$middleEntityType = ucfirst($defs->getRelationshipName()); $middleEntityType = ucfirst($defs->getRelationshipName());
$conditions = [
"$alias.$nearKey:" => Attribute::ID,
"$alias.deleted" => false,
];
foreach ($defs->getConditions() as $k => $v) {
$conditions["$alias.$k"] = $v;
}
// The foreign table is not joined as it would perform much slower. // The foreign table is not joined as it would perform much slower.
// Trade off is that if a foreign record is deleted but the middle table // Trade off is that if a foreign record is deleted but the middle table
// is not yet deleted, it will give a non-actual result. // is not yet deleted, it will give a non-actual result.
$subQuery = QueryBuilder::create() $subQuery = QueryBuilder::create()
->select(Attribute::ID) ->select(Attribute::ID)
->from($this->entityType) ->from($this->entityType)
->leftJoin($middleEntityType, $alias, [ ->leftJoin($middleEntityType, $alias, $conditions)
"$alias.$nearKey:" => Attribute::ID,
"$alias.deleted" => false,
])
->where(["$alias.$key!=" => null]) ->where(["$alias.$key!=" => null])
->build(); ->build();
@@ -1476,7 +1488,6 @@ class ItemGeneralConverter implements ItemConverter
if ($relationType == Entity::MANY_MANY) { if ($relationType == Entity::MANY_MANY) {
$key = $defs->getForeignMidKey(); $key = $defs->getForeignMidKey();
$nearKey = $defs->getMidKey();
// IN-sub-query performs faster than EXISTS on MariaDB when multiple IDs. // IN-sub-query performs faster than EXISTS on MariaDB when multiple IDs.
// Left-join performs faster than inner-join. // Left-join performs faster than inner-join.
@@ -1489,12 +1500,6 @@ class ItemGeneralConverter implements ItemConverter
->from($this->entityType) ->from($this->entityType)
->leftJoin( ->leftJoin(
Join::create($link, $alias) Join::create($link, $alias)
->withConditions(
Cond::equal(
Cond::column("$alias.$nearKey"),
Cond::column(Attribute::ID)
)
)
->withOnlyMiddle() ->withOnlyMiddle()
) )
->where(["$alias.$key" => $value]) ->where(["$alias.$key" => $value])
tests/unit/Espo/Core/Select/Where/ConverterTest.php
+1 -2
View File
@@ -372,9 +372,8 @@ class ConverterTest extends TestCase
[ [
'test', 'test',
$alias, $alias,
[$alias . '.localId=:' => 'id'], null,
[ [
'noLeftAlias' => true,
'onlyMiddle' => true, 'onlyMiddle' => true,
'type' => JoinType::left, 'type' => JoinType::left,
], ],