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

Simpler way to handle Collection parameters in DQL queries (refs #DDC-2319)

Browse Source
This commit is contained in:
Michaël Perrin 2013-02-25 16:47:49 +01:00 committed by Michaël Perrin
parent ad9366a1fc
commit 1032a16db2
2 changed files with 55 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Doctrine/ORM/AbstractQuery.php
View File

@ -20,6 +20,7 @@
namespace Doctrine\ORM; namespace Doctrine\ORM;
use Doctrine\Common\Util\ClassUtils; use Doctrine\Common\Util\ClassUtils;
use Doctrine\Common\Collections\Collection;
use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\ORM\Query\Parameter; use Doctrine\ORM\Query\Parameter;
@ -405,6 +406,10 @@ abstract class AbstractQuery
return $value; return $value;
} }
if ($value instanceof Collection) {
$value = $value->toArray();
}
if (is_array($value)) { if (is_array($value)) {
foreach ($value as $key => $paramValue) { foreach ($value as $key => $paramValue) {
$paramValue = $this->processParameterValue($paramValue); $paramValue = $this->processParameterValue($paramValue);

49
tests/Doctrine/Tests/ORM/Functional/QueryTest.php
View File

@ -676,6 +676,55 @@ class QueryTest extends \Doctrine\Tests\OrmFunctionalTestCase
$q->getResult(); $q->getResult();
} }
/**
* @group DDC-2319
*/
public function testSetCollectionParameterBindingSingleIdentifierObject()
{
$u1 = new CmsUser;
$u1->name = 'Name1';
$u1->username = 'username1';
$u1->status = 'developer';
$this->_em->persist($u1);
$u2 = new CmsUser;
$u2->name = 'Name2';
$u2->username = 'username2';
$u2->status = 'tester';
$this->_em->persist($u2);
$u3 = new CmsUser;
$u3->name = 'Name3';
$u3->username = 'username3';
$u3->status = 'tester';
$this->_em->persist($u3);
$this->_em->flush();
$this->_em->clear();
$userCollection = new ArrayCollection();
$userCollection->add($u1);
$userCollection->add($u2);
$userCollection->add($u3->getId());
$q = $this->_em->createQuery("SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u IN (:users) ORDER BY u.id");
$q->setParameter('users', $userCollection);
$users = $q->execute();
$this->assertEquals(3, count($users));
$this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $users[0]);
$this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $users[1]);
$this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $users[2]);
$resultUser1 = $users[0];
$resultUser2 = $users[1];
$resultUser3 = $users[2];
$this->assertEquals($u1->username, $resultUser1->username);
$this->assertEquals($u2->username, $resultUser2->username);
$this->assertEquals($u3->username, $resultUser3->username);
}
/** /**
* @group DDC-1822 * @group DDC-1822