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

fixes

Browse Source
This commit is contained in:
Yuri Kuznetsov
2020-08-17 13:49:20 +03:00
parent 2f0e0d2a3b
commit db03f4f408
3 changed files with 22 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/Espo/ORM/QueryComposer/BaseQueryComposer.php
+2
View File
@@ -1895,6 +1895,8 @@ abstract class BaseQueryComposer implements QueryComposer
return $this->convertMatchExpression($entity, $value);
}
$noCustomWhere = $noCustomWhere ?? $params['noCustomWhere'] ?? false;
if (is_int($field)) {
$field = 'AND';
}
application/Espo/ORM/Repository/RDBRepository.php
+5 -6
View File
@@ -460,12 +460,12 @@ class RDBRepository extends Repository
}
if ($foreign instanceof Entity) {
$id = $foreign->id;
$result = $this->getMapper()->relate($entity, $relationName, $foreign, $data);
} else {
$id = $foreign;
}
$result = $this->getMapper()->relateById($entity, $relationName, $id, $data);
$result = $this->getMapper()->relateById($entity, $relationName, $id, $data);
}
}
if ($result) {
@@ -511,12 +511,11 @@ class RDBRepository extends Repository
$result = $this->$methodName($entity, $foreign);
} else {
if ($foreign instanceof Entity) {
$id = $foreign->id;
$result = $this->getMapper()->unrelate($entity, $relationName, $foreign);
} else {
$id = $foreign;
$result = $this->getMapper()->unrelateById($entity, $relationName, $id);
}
$result = $this->getMapper()->unrelateById($entity, $relationName, $id);
}
if ($result) {
tests/integration/Espo/ORM/MapperTest.php
+15 -48
View File
@@ -129,19 +129,19 @@ class MapperTest extends \tests\integration\Core\BaseTestCase
$isRelated = $em->getRepository('Lead')->isRelated($l1, 'createdAccount', $a1);
$this->assertTrue($isRelated);
$isRelated = $em->getRepository('Lead')->isRelated($a1, 'originalLead', $l1);
$isRelated = $em->getRepository('Account')->isRelated($a1, 'originalLead', $l1);
$this->assertTrue($isRelated);
$isRelated = $em->getRepository('Lead')->isRelated($l1, 'createdAccount', $a2);
$this->assertFalse($isRelated);
$isRelated = $em->getRepository('Lead')->isRelated($a2, 'originalLead', $l1);
$isRelated = $em->getRepository('Account')->isRelated($a2, 'originalLead', $l1);
$this->assertFalse($isRelated);
$em->getRepository('Lead')->relate($l1, 'createdAccount', $a2);
$isRelated = $em->getRepository('Lead')->isRelated($a2, 'originalLead', $l1);
$isRelated = $em->getRepository('Account')->isRelated($a2, 'originalLead', $l1);
$this->assertTrue($isRelated);
$isRelated = $em->getRepository('Lead')->isRelated($l1, 'createdAccount', $a2);
@@ -150,7 +150,7 @@ class MapperTest extends \tests\integration\Core\BaseTestCase
$isRelated = $em->getRepository('Lead')->isRelated($l1, 'createdAccount', $a1);
$this->assertFalse($isRelated);
$isRelated = $em->getRepository('Lead')->isRelated($a1, 'originalLead', $l1);
$isRelated = $em->getRepository('Account')->isRelated($a1, 'originalLead', $l1);
$this->assertFalse($isRelated);
$c = $em->getRepository('Lead')->where(['createdAccountId' => $a1->id])->count();
@@ -179,24 +179,24 @@ class MapperTest extends \tests\integration\Core\BaseTestCase
'lastName' => '2',
]);
$em->getRepository('Lead')->relate($a1, 'originalLead', $l1);
$em->getRepository('Account')->relate($a1, 'originalLead', $l1);
$isRelated = $em->getRepository('Lead')->isRelated($l1, 'createdAccount', $a1);
$this->assertTrue($isRelated);
$isRelated = $em->getRepository('Lead')->isRelated($a1, 'originalLead', $l1);
$isRelated = $em->getRepository('Account')->isRelated($a1, 'originalLead', $l1);
$this->assertTrue($isRelated);
$isRelated = $em->getRepository('Lead')->isRelated($l1, 'createdAccount', $a2);
$this->assertFalse($isRelated);
$isRelated = $em->getRepository('Lead')->isRelated($a2, 'originalLead', $l1);
$isRelated = $em->getRepository('Account')->isRelated($a2, 'originalLead', $l1);
$this->assertFalse($isRelated);
$em->getRepository('Lead')->relate($a2, 'originalLead', $l1);
$em->getRepository('Account')->relate($a2, 'originalLead', $l1);
$isRelated = $em->getRepository('Lead')->isRelated($a2, 'originalLead', $l1);
$isRelated = $em->getRepository('Account')->isRelated($a2, 'originalLead', $l1);
$this->assertTrue($isRelated);
$isRelated = $em->getRepository('Lead')->isRelated($l1, 'createdAccount', $a2);
@@ -205,7 +205,7 @@ class MapperTest extends \tests\integration\Core\BaseTestCase
$isRelated = $em->getRepository('Lead')->isRelated($l1, 'createdAccount', $a1);
$this->assertFalse($isRelated);
$isRelated = $em->getRepository('Lead')->isRelated($a1, 'originalLead', $l1);
$isRelated = $em->getRepository('Account')->isRelated($a1, 'originalLead', $l1);
$this->assertFalse($isRelated);
$c = $em->getRepository('Lead')->where(['createdAccountId' => $a1->id])->count();
@@ -239,19 +239,19 @@ class MapperTest extends \tests\integration\Core\BaseTestCase
$isRelated = $em->getRepository('Lead')->isRelated($l1, 'createdAccount', $a1);
$this->assertTrue($isRelated);
$isRelated = $em->getRepository('Lead')->isRelated($a1, 'originalLead', $l1);
$isRelated = $em->getRepository('Account')->isRelated($a1, 'originalLead', $l1);
$this->assertTrue($isRelated);
$isRelated = $em->getRepository('Lead')->isRelated($l2, 'createdAccount', $a1);
$this->assertFalse($isRelated);
$isRelated = $em->getRepository('Lead')->isRelated($a1, 'originalLead', $l2);
$isRelated = $em->getRepository('Account')->isRelated($a1, 'originalLead', $l2);
$this->assertFalse($isRelated);
$em->getRepository('Lead')->relate($l2, 'createdAccount', $a1);
$isRelated = $em->getRepository('Lead')->isRelated($a1, 'originalLead', $l2);
$isRelated = $em->getRepository('Account')->isRelated($a1, 'originalLead', $l2);
$this->assertTrue($isRelated);
$isRelated = $em->getRepository('Lead')->isRelated($l2, 'createdAccount', $a1);
@@ -262,7 +262,7 @@ class MapperTest extends \tests\integration\Core\BaseTestCase
$isRelated = $em->getRepository('Lead')->isRelated($l1, 'createdAccount', $a1);
$this->assertFalse($isRelated);
$isRelated = $em->getRepository('Lead')->isRelated($a1, 'originalLead', $l1);
$isRelated = $em->getRepository('Account')->isRelated($a1, 'originalLead', $l1);
$this->assertFalse($isRelated);
$c = $em->getRepository('Lead')->where(['createdAccountId' => $a1->id])->count();
@@ -295,44 +295,11 @@ class MapperTest extends \tests\integration\Core\BaseTestCase
$this->assertFalse($isRelated);
$em->getRepository('Lead')->relate($l1, 'createdAccount', $a1);
$em->getRepository('Lead')->unrelate($a1, 'originalLead', $l1);
$em->getRepository('Account')->unrelate($a1, 'originalLead', $l1);
$l1 = $em->getEntity('Lead', $l1->id);
$isRelated = $em->getRepository('Lead')->isRelated($l1, 'createdAccount', $a1);
$this->assertFalse($isRelated);
}
public function testMassDeleteFromDb1()
{
$app = $this->createApplication();
$em = $app->getContainer()->get('entityManager');
$mapper = $em->getMapper('RDB');
$a1 = $em->createEntity('Account', [
'name' => '1',
]);
$a2 = $em->createEntity('Account', [
'name' => '2',
]);
$count = $mapper->massDeleteFromDb('Account', [
'name' => '1',
]);
$this->assertEquals(1, $count);
$a1 = $em->getEntity('Account', $a1->id);
$this->assertNull($a1);
$a2 = $em->getEntity('Account', $a2->id);
$this->assertNotNull($a2);
$count = $mapper->massDeleteFromDb('Account', [
'name' => '3',
]);
$this->assertEquals(0, $count);
}
}