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

fix orm sub query entity type

Browse Source
This commit is contained in:
Yuri Kuznetsov
2021-04-06 12:07:02 +03:00
parent d0c61ea5fa
commit 62d2157fd8
2 changed files with 42 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/Espo/ORM/QueryComposer/BaseQueryComposer.php
+7 -9
View File
@@ -2476,27 +2476,25 @@ abstract class BaseQueryComposer implements QueryComposer
return '0';
}
if (!empty($value['entityType'])) {
$subQueryEntityType = $value['entityType'];
} else {
$subQueryEntityType = $entity->getEntityType();
}
$subQuerySelectParams = [];
if (!empty($value['selectParams'])) {
$subQuerySelectParams = $value['selectParams'];
} else {
}
else {
$subQuerySelectParams = $value;
}
$subQueryEntityType = $subQuerySelectParams['from'] ?? $subQueryEntityType;
if (!isset($subQuerySelectParams['from']) && !isset($subQuerySelectParams['fromQuery'])) {
// 'entityType' is for backward compatibility.
$subQuerySelectParams['from'] = $value['entityType'] ?? $entity->getEntityType();
}
if (!empty($value['withDeleted'])) {
$subQuerySelectParams['withDeleted'] = true;
}
$subSql = $this->createSelectQuery($subQueryEntityType, $subQuerySelectParams);
$subSql = $this->createSelectQueryInternal($subQuerySelectParams);
return $leftPart . " {$operator} ({$subSql})";
}