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

fix query

Browse Source
This commit is contained in:
yuri
2017-03-10 14:22:36 +02:00
parent ea8d930e56
commit 47b6093752
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/Espo/ORM/DB/Query/Base.php
+5 -3
View File
@@ -346,7 +346,7 @@ abstract class Base
return $select;
}
protected function getBelongsToJoin(IEntity $entity, $relationName, $r = null)
protected function getBelongsToJoin(IEntity $entity, $relationName, $r = null, $alias = null)
{
if (empty($r)) {
$r = $entity->relations[$relationName];
@@ -356,7 +356,9 @@ abstract class Base
$key = $keySet['key'];
$foreignKey = $keySet['foreignKey'];
$alias = $this->getAlias($entity, $relationName);
if (!$alias) {
$alias = $this->getAlias($entity, $relationName);
}
if ($alias) {
return "JOIN `" . $this->toDb($r['entity']) . "` AS `" . $alias . "` ON ".
@@ -922,7 +924,7 @@ abstract class Base
return $join;
case IEntity::BELONGS_TO:
return $pre . $this->getBelongsToJoin($entity, $relationName);
return $pre . $this->getBelongsToJoin($entity, $relationName, null, $joinAlias);
}
return false;