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

Merge branch 'master' of https://github.com/espocrm/espocrm

Browse Source
This commit is contained in:
Taras Machyshyn
2021-01-21 16:17:22 +02:00
parent 1ae125ceb1 2635ed69ac
commit f2831f84df
10 changed files with 25 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/Espo/Core/Binding/DefaultBinding.php
-5
View File
@@ -48,11 +48,6 @@ class DefaultBinding
'entityManager'
);
$binder->bindService(
'Espo\\ORM\\Metadata',
'ormMetadata'
);
$binder->bindService(
'Espo\\Core\\ORM\\EntityManager',
'entityManager'
application/Espo/ORM/Mapper/BaseMapper.php
+3 -3
View File
@@ -193,7 +193,7 @@ class BaseMapper implements Mapper
throw new RuntimeException();
}
$params = $select->getRawParams();
$params = $select->getRaw();
$params['aggregation'] = $aggregation;
$params['aggregationBy'] = $aggregationBy;
@@ -227,7 +227,7 @@ class BaseMapper implements Mapper
$params = [];
if ($select) {
$params = $select->getRawParams();
$params = $select->getRaw();
}
$entityType = $entity->getEntityType();
@@ -600,7 +600,7 @@ class BaseMapper implements Mapper
*/
public function massRelate(Entity $entity, string $relationName, Select $select)
{
$params = $select->getRawParams();
$params = $select->getRaw();
$id = $entity->id;
application/Espo/ORM/QueryComposer/BaseQueryComposer.php
+6 -6
View File
@@ -245,35 +245,35 @@ abstract class BaseQueryComposer implements QueryComposer
public function composeSelect(SelectQuery $queryParams) : string
{
$params = $queryParams->getRawParams();
$params = $queryParams->getRaw();
return $this->createSelectQueryInternal($params);
}
public function composeUpdate(UpdateQuery $queryParams) : string
{
$params = $queryParams->getRawParams();
$params = $queryParams->getRaw();
return $this->createUpdateQuery($params);
}
public function composeDelete(DeleteQuery $queryParams) : string
{
$params = $queryParams->getRawParams();
$params = $queryParams->getRaw();
return $this->createDeleteQuery($params);
}
public function composeInsert(InsertQuery $queryParams) : string
{
$params = $queryParams->getRawParams();
$params = $queryParams->getRaw();
return $this->createInsertQuery($params);
}
public function composeUnion(UnionQuery $queryParams) : string
{
$params = $queryParams->getRawParams();
$params = $queryParams->getRaw();
return $this->createUnionQuery($params);
}
@@ -413,7 +413,7 @@ abstract class BaseQueryComposer implements QueryComposer
$subSqlList = [];
foreach ($selectQueryList as $select) {
$rawSelectParams = $select->getRawParams();
$rawSelectParams = $select->getRaw();
$rawSelectParams['strictSelect'] = true;
$select = SelectQuery::fromRaw($rawSelectParams);
application/Espo/ORM/QueryComposer/MysqlQueryComposer.php
+1 -1
View File
@@ -37,7 +37,7 @@ class MysqlQueryComposer extends BaseQueryComposer
{
public function composeLockTable(LockTableQuery $queryParams) : string
{
$params = $queryParams->getRawParams();
$params = $queryParams->getRaw();
$table = $this->toDb($this->sanitize($params['table']));
application/Espo/ORM/QueryParams/BaseBuilderTrait.php
+1 -1
View File
@@ -50,6 +50,6 @@ trait BaseBuilderTrait
throw new RuntimeException("Clone can be called only on a new empty builder instance.");
}
$this->params = $query->getRawParams();
$this->params = $query->getRaw();
}
}
application/Espo/ORM/QueryParams/BaseTrait.php
+1 -1
View File
@@ -36,7 +36,7 @@ trait BaseTrait
/**
* Get parameters in RAW format.
*/
public function getRawParams() : array
public function getRaw() : array
{
return $this->params;
}
application/Espo/ORM/QueryParams/Query.php
+1 -1
View File
@@ -37,5 +37,5 @@ interface Query
/**
* Get parameters in RAW format.
*/
public function getRawParams() : array;
public function getRaw() : array;
}
application/Espo/ORM/Repository/RDBSelectBuilder.php
+1 -1
View File
@@ -322,7 +322,7 @@ class RDBSelectBuilder
$params = $params ?? [];
$builtParams = $this->builder->build()->getRawParams();
$builtParams = $this->builder->build()->getRaw();
$whereClause = $builtParams['whereClause'] ?? [];
$havingClause = $builtParams['havingClause'] ?? [];
application/Espo/Services/Stream.php
+1 -1
View File
@@ -1838,7 +1838,7 @@ class Stream
$userList = $this->entityManager->getRepository('User')
->where([
'isActive' => true,
'id=s' => $subQuery->getRawParams(),
'id=s' => $subQuery->getRaw(),
])
->select(['id', 'type'])
->find();
tests/unit/Espo/ORM/QueryParams/SelectBuilderTest.php
+10 -10
View File
@@ -47,7 +47,7 @@ class SelectBuilderTest extends \PHPUnit\Framework\TestCase
$params = $this->builder
->from('Test')
->build()
->getRawParams();
->getRaw();
$this->assertEquals('Test', $params['from']);
}
@@ -108,7 +108,7 @@ class SelectBuilderTest extends \PHPUnit\Framework\TestCase
->where(['test' => null])
->build();
$raw = $select->getRawParams();
$raw = $select->getRaw();
$this->assertEquals(['test' => null], $raw['whereClause']);
}
@@ -120,7 +120,7 @@ class SelectBuilderTest extends \PHPUnit\Framework\TestCase
->where('test', null)
->build();
$raw = $select->getRawParams();
$raw = $select->getRaw();
$this->assertEquals(['test' => null], $raw['whereClause']);
}
@@ -133,7 +133,7 @@ class SelectBuilderTest extends \PHPUnit\Framework\TestCase
->groupBy(['test'])
->build();
$raw = $select->getRawParams();
$raw = $select->getRaw();
$this->assertEquals(['test' => null], $raw['havingClause']);
@@ -157,8 +157,8 @@ class SelectBuilderTest extends \PHPUnit\Framework\TestCase
->where('test2', '2')
->build();
$params = $select->getRawParams();
$paramsCloned = $selectCloned->getRawParams();
$params = $select->getRaw();
$paramsCloned = $selectCloned->getRaw();
$this->assertTrue($paramsCloned['distinct']);
$this->assertFalse($params['distinct'] ?? false);
@@ -195,7 +195,7 @@ class SelectBuilderTest extends \PHPUnit\Framework\TestCase
->where(['test' => '2'])
->build();
$raw = $select->getRawParams();
$raw = $select->getRaw();
$expected = [
'test' => '1',
@@ -223,7 +223,7 @@ class SelectBuilderTest extends \PHPUnit\Framework\TestCase
])
->build();
$raw = $select->getRawParams();
$raw = $select->getRaw();
$expected = [
'OR' => [
@@ -247,7 +247,7 @@ class SelectBuilderTest extends \PHPUnit\Framework\TestCase
->leftJoin('link1')
->leftJoin('link2')
->build()
->getRawParams();
->getRaw();
$this->assertEquals(['link1', 'link2'], $params['leftJoins']);
}
@@ -260,7 +260,7 @@ class SelectBuilderTest extends \PHPUnit\Framework\TestCase
->join('link1')
->join('link2')
->build()
->getRawParams();
->getRaw();
$this->assertEquals(['link1', 'link2'], $params['joins']);
}