viscous/espocrm
1
0
Fork 0
mirror of https://github.com/espocrm/espocrm.git synced 2026-06-28 06:56:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

ref

Browse Source
This commit is contained in:
Yuri Kuznetsov
2023-03-10 14:32:40 +02:00
parent 3fd06a89f1
commit 5e13e6cf99
7 changed files with 62 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/Espo/Core/Formula/Functions/EntityGroup/SumRelatedType.php
View File

@@ -137,7 +137,7 @@ class SumRelatedType extends \Espo\Core\Formula\Functions\Base implements
->select(['id']);
$queryBuilder->where([
'id=s' => $sqQueryBuilder->build()->getRaw(),
'id=s' => $sqQueryBuilder->build(),
]);
}

2
application/Espo/Core/Select/AccessControl/Filters/OnlyOwn.php
View File

@@ -65,7 +65,7 @@ class OnlyOwn implements Filter
->where(["assignedUsersMiddle.{$key2}" => $this->user->getId()])
->build();
$queryBuilder->where(['id=s' => $subQuery->getRaw()]);
$queryBuilder->where(['id=s' => $subQuery]);
return;
}

2
application/Espo/Core/Select/AccessControl/Filters/OnlyTeam.php
View File

@@ -92,6 +92,6 @@ class OnlyTeam implements Filter
->where(['OR' => $orGroup])
->build();
$queryBuilder->where(['id=s' => $subQuery->getRaw()]);
$queryBuilder->where(['id=s' => $subQuery]);
}
}

6
application/Espo/Core/Select/Where/ItemGeneralConverter.php
View File

@@ -1359,7 +1359,7 @@ class ItemGeneralConverter implements ItemConverter
->where([$alias . '.id' => $value])
->build();
return ['id=s' => $subQuery->getRaw()];
return ['id=s' => $subQuery];
}
if ($relationType == Entity::BELONGS_TO) {
@@ -1485,7 +1485,7 @@ class ItemGeneralConverter implements ItemConverter
])
->build();
$whereList[] = ['id=s' => $sq->getRaw()];
$whereList[] = ['id=s' => $sq];
}
return $whereList;
@@ -1502,7 +1502,7 @@ class ItemGeneralConverter implements ItemConverter
->where([$link . '.id' => $targetId])
->build();
$whereList[] = ['id=s' => $sq->getRaw()];
$whereList[] = ['id=s' => $sq];
}
return $whereList;

2
application/Espo/Modules/Crm/Tools/Opportunity/Report/Util.php
View File

@@ -67,7 +67,7 @@ class Util
->build();
$queryBuilder->where([
'id=s' => $subQuery->getRaw(),
'id=s' => $subQuery,
]);
}

2
application/Espo/Tools/Stream/Service.php
View File

@@ -1236,7 +1236,7 @@ class Service
->getRDBRepository(User::ENTITY_TYPE)
->where([
'isActive' => true,
'id=s' => $subQuery->getRaw(),
'id=s' => $subQuery,
])
->select(['id', 'type'])
->find();

108
tests/integration/Espo/Core/Select/SelectBuilderTest.php
View File

@@ -37,6 +37,7 @@ use Espo\Core\{
};
use Espo\Classes\Select\Email\AdditionalAppliers\Main as EmailAdditionalApplier;
use Espo\ORM\Query\Select;
class SelectBuilderTest extends \tests\integration\Core\BaseTestCase
{
@@ -174,7 +175,7 @@ class SelectBuilderTest extends \tests\integration\Core\BaseTestCase
],
],
'whereClause' => [
'id=s' => [
'id=s' => Select::fromRaw([
'select' => [
'id',
],
@@ -197,7 +198,7 @@ class SelectBuilderTest extends \tests\integration\Core\BaseTestCase
'assignedUserId' => $userId,
],
],
],
]),
'OR' => [
[
'assignedUserId' => $userId,
@@ -243,56 +244,55 @@ class SelectBuilderTest extends \tests\integration\Core\BaseTestCase
'from' => 'Meeting',
'whereClause' =>
[
'id=s' =>
[
'select' =>
[
0 => 'id',
],
'from' => 'Meeting',
'leftJoins' =>
[
0 =>
[
0 => 'EntityTeam',
1 => 'entityTeam',
2 =>
[
'entityTeam.entityId:' => 'id',
'entityTeam.entityType' => 'Meeting',
'entityTeam.deleted' => false,
],
],
1 =>
[
0 => 'MeetingUser',
1 => 'usersMiddle',
2 =>
[
'usersMiddle.meetingId:' => 'id',
'usersMiddle.deleted' => false,
],
],
],
'whereClause' =>
[
'OR' =>
[
0 =>
[
'entityTeam.teamId=' => [],
],
1 =>
[
'usersMiddle.userId=' => $userId,
],
2 =>
[
'assignedUserId=' => $userId,
],
],
],
],
'id=s' => Select::fromRaw([
'select' =>
[
0 => 'id',
],
'from' => 'Meeting',
'leftJoins' =>
[
0 =>
[
0 => 'EntityTeam',
1 => 'entityTeam',
2 =>
[
'entityTeam.entityId:' => 'id',
'entityTeam.entityType' => 'Meeting',
'entityTeam.deleted' => false,
],
],
1 =>
[
0 => 'MeetingUser',
1 => 'usersMiddle',
2 =>
[
'usersMiddle.meetingId:' => 'id',
'usersMiddle.deleted' => false,
],
],
],
'whereClause' =>
[
'OR' =>
[
0 =>
[
'entityTeam.teamId=' => [],
],
1 =>
[
'usersMiddle.userId=' => $userId,
],
2 =>
[
'assignedUserId=' => $userId,
],
],
],
]),
],
];
@@ -375,7 +375,7 @@ class SelectBuilderTest extends \tests\integration\Core\BaseTestCase
'whereClause' =>
[
'id=s' =>
[
Select::fromRaw([
'select' =>
[
0 => 'id',
@@ -414,7 +414,7 @@ class SelectBuilderTest extends \tests\integration\Core\BaseTestCase
'emailUser.userId' => $userId,
],
],
],
]),
],
];