RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-19 06:51:40 +03:00
Code Issues Projects Releases Wiki Activity

Fix regression in DDC-2430.

Browse Source
This commit is contained in:
Benjamin Eberlei 2013-05-10 23:31:14 +02:00
parent bf9673203c
commit eb1a162cbc
2 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Doctrine/ORM/Persisters/SqlExpressionVisitor.php
View File

@ -65,7 +65,10 @@ class SqlExpressionVisitor extends ExpressionVisitor
$field = $comparison->getField(); $field = $comparison->getField();
$value = $comparison->getValue()->getValue(); // shortcut for walkValue() $value = $comparison->getValue()->getValue(); // shortcut for walkValue()
if (isset($this->classMetadata->associationMappings[$field]) && ! is_object($value)) { if (isset($this->classMetadata->associationMappings[$field]) &&
! is_object($value) &&
! in_array($comparison->getOperator(), array(Comparison::IN, Comparison::NIN))) {
throw PersisterException::matchingAssocationFieldRequiresObject($this->classMetadata->name, $field); throw PersisterException::matchingAssocationFieldRequiresObject($this->classMetadata->name, $field);
} }

25
tests/Doctrine/Tests/ORM/Functional/EntityRepositoryTest.php
View File

@ -790,7 +790,30 @@ class EntityRepositoryTest extends \Doctrine\Tests\OrmFunctionalTestCase
$user = $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $userId); $user = $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $userId);
$criteria = new Criteria( $criteria = new Criteria(
Criteria::expr()->gte('user', $user) Criteria::expr()->eq('user', $user)
);
$repository = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsAddress');
$addresses = $repository->matching($criteria);
$this->assertEquals(1, count($addresses));
$addresses = new ArrayCollection($repository->findAll());
$this->assertEquals(1, count($addresses->matching($criteria)));
}
/**
* @group DDC-2430
*/
public function testMatchingCriteriaAssocationInWithArray()
{
list($userId, $addressId) = $this->loadAssociatedFixture();
$user = $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $userId);
$criteria = new Criteria(
Criteria::expr()->in('user', array($user))
); );
$repository = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsAddress'); $repository = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsAddress');