RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-20 14:13:15 +03:00
Code Issues Projects Releases Wiki Activity

[DDC-604] Fixed.

Browse Source
This commit is contained in:
Roman S. Borschel 2010-06-07 13:57:43 +02:00
parent 5d00fb764b
commit d6cb87a0ac
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Doctrine/ORM/Query.php
View File

@ -244,7 +244,7 @@ final class Query extends AbstractQuery
if (is_object($value) && $this->_em->getMetadataFactory()->hasMetadataFor(get_class($value))) {
$values = $this->_em->getUnitOfWork()->getEntityIdentifier($value);
$sqlPositions = $paramMappings[$key];
$sqlParams = array_merge($sqlParams, array_combine((array)$sqlPositions, $values));
$sqlParams += array_combine((array)$sqlPositions, $values);
} else {
foreach ($paramMappings[$key] as $position) {
$sqlParams[$position] = $value;

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

@ -281,4 +281,34 @@ class QueryTest extends \Doctrine\Tests\OrmFunctionalTestCase
$this->_em->getConfiguration()->setEntityNamespaces(array());
}
/**
* @group DDC-604
*/
public function testEntityParameters()
{
$article = new CmsArticle;
$article->topic = "dr. dolittle";
$article->text = "Once upon a time ...";
$author = new CmsUser;
$author->name = "anonymous";
$author->username = "anon";
$author->status = "here";
$article->user = $author;
$this->_em->persist($author);
$this->_em->persist($article);
$this->_em->flush();
$this->_em->clear();
//$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger);
$q = $this->_em->createQuery("select a from Doctrine\Tests\Models\CMS\CmsArticle a where a.topic = :topic and a.user = :user")
->setParameter("user", $this->_em->getReference('Doctrine\Tests\Models\CMS\CmsUser', $author->id))
->setParameter("topic", "dr. dolittle");
$result = $q->getResult();
$this->assertEquals(1, count($result));
$this->assertTrue($result[0] instanceof CmsArticle);
$this->assertEquals("dr. dolittle", $result[0]->topic);
$this->assertTrue($result[0]->user instanceof \Doctrine\ORM\Proxy\Proxy);
$this->assertFalse($result[0]->user->__isInitialized__);
}
}