EspoCRM – Open Source CRM Application
PHP calendarcontactscrmcrm-platformcrm-systemcustomer-portalcustomer-supportcustomizabledocumentsemail-marketingkanbanleadsopen-sourcephpplatformsales-automationsingle-page-applicationsupport
Merge phone/email order fix
Yurii627f73763680
diff --git a/application/Espo/Core/Action/Actions/Merge/Merger.php b/application/Espo/Core/Action/Actions/Merge/Merger.phpindex 36208fe128..9b898ab9ef 100644--- a/application/Espo/Core/Action/Actions/Merge/Merger.php+++ b/application/Espo/Core/Action/Actions/Merge/Merger.php@@ -50,6 +50,7 @@ use Espo\Entities\Note;use Espo\ORM\Entity;use Espo\Entities\EmailAddress;use Espo\Entities\PhoneNumber;+use Espo\ORM\Query\Part\Order;use Espo\ORM\Type\RelationType;use stdClass;@@ -208,7 +209,8 @@ class Merger/** @var iterable<PhoneNumber> $collection */$collection = $this->entityManager- ->getRelation($entity, 'phoneNumbers')+ ->getRelation($entity, Link::PHONE_NUMBERS)+ ->order('@relation.primary', Order::DESC)->find();foreach ($collection as $entity) {@@ -228,6 +230,7 @@ class Merger/** @var iterable<EmailAddress> $collection */$collection = $this->entityManager->getRelation($entity, Link::EMAIL_ADDRESSES)+ ->order('@relation.primary', Order::DESC)->find();foreach ($collection as $entity) {diff --git a/application/Espo/ORM/Repository/RDBRelationSelectBuilder.php b/application/Espo/ORM/Repository/RDBRelationSelectBuilder.phpindex ea8b03faf9..37f4cd1ae9 100644--- a/application/Espo/ORM/Repository/RDBRelationSelectBuilder.php+++ b/application/Espo/ORM/Repository/RDBRelationSelectBuilder.php@@ -376,6 +376,8 @@ class RDBRelationSelectBuilder*/public function order($orderBy = Attribute::ID, $direction = null): self{+ $orderBy = $this->applyRelationToOrderBy($orderBy);+$this->builder->order($orderBy, $direction);return $this;@@ -551,4 +553,23 @@ class RDBRelationSelectBuilderreturn $entityDefs->getRelation($this->relationName)->getParam($param);}++ /**+ * @param Order|Order[]|Expression|string|array<int, string[]>|string[] $orderBy+ * @return Order|Order[]|Expression|string|array<int, string[]>|string[]+ */+ private function applyRelationToOrderBy(mixed $orderBy): mixed+ {+ if (!$this->isManyMany()) {+ return $orderBy;+ }++ if (is_string($orderBy) && str_contains($orderBy, '@relation.')) {+ $alias = $this->getMiddleTableAlias();++ return str_replace('@relation.', $alias . '.', $orderBy);+ }++ return $orderBy;+ }}diff --git a/tests/unit/Espo/ORM/Repository/RDBRepositoryTest.php b/tests/unit/Espo/ORM/Repository/RDBRepositoryTest.phpindex 91ff680bfb..0b342a9e9f 100644--- a/tests/unit/Espo/ORM/Repository/RDBRepositoryTest.php+++ b/tests/unit/Espo/ORM/Repository/RDBRepositoryTest.php@@ -1497,6 +1497,7 @@ class RDBRepositoryTest extends TestCase],'deleted' => false,])+ ->order('entityTeam.deleted', OrderExpr::DESC)->build();$this->mapper@@ -1514,6 +1515,7 @@ class RDBRepositoryTest extends TestCase],'deleted' => false,])+ ->order('@relation.deleted', OrderExpr::DESC)->find();}