Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DQL Query: process ArrayCollection values to ease development #590

Merged
merged 1 commit into from
Dec 17, 2013
Merged

DQL Query: process ArrayCollection values to ease development #590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 6 additions & 1 deletion lib/Doctrine/ORM/AbstractQuery.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
namespace Doctrine\ORM;

use Doctrine\Common\Util\ClassUtils;
use Doctrine\Common\Collections\Collection;
use Doctrine\Common\Collections\ArrayCollection;

use Doctrine\ORM\Query\Parameter;
Expand Down Expand Up @@ -405,6 +406,10 @@ public function processParameterValue($value)
return $value;
}

if ($value instanceof Collection) {
$value = $value->toArray();
}

if (is_array($value)) {
foreach ($value as $key => $paramValue) {
$paramValue = $this->processParameterValue($paramValue);
Expand Down Expand Up @@ -1089,7 +1094,7 @@ public function __clone()

/**
* Generates a string of currently query to use for the cache second level cache.
*
*
* @return string
*/
protected function getHash()
Expand Down
49 changes: 49 additions & 0 deletions tests/Doctrine/Tests/ORM/Functional/QueryTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -676,6 +676,55 @@ public function testSetParameterBindingSingleIdentifierObject()
$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
Expand Down