RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2024-12-13 14:56:01 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #639 from goetas/indexby-metadata

Browse Source 
Added abillity to use metacolumn as indexBy
This commit is contained in:
Benjamin Eberlei 2013-05-09 23:53:26 -07:00
commit bf9673203c
4 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -211,7 +211,7 @@ class ResultSetMapping
{
$found = false;
foreach ($this->fieldMappings as $columnName => $columnFieldName) {
foreach (array_merge($this->metaMappings, $this->fieldMappings) as $columnName => $columnFieldName) {
if ( ! ($columnFieldName === $fieldName && $this->columnOwnerMap[$columnName] === $alias)) continue;
$this->addIndexByColumn($alias, $columnName);

8
tests/Doctrine/Tests/Models/DDC117/DDC117Article.php
View File

@ -29,7 +29,7 @@ class DDC117Article
private $translations;
/**
* @OneToMany(targetEntity="DDC117Link", mappedBy="source")
* @OneToMany(targetEntity="DDC117Link", mappedBy="source", indexBy="target_id", cascade={"persist", "remove"})
*/
private $links;
@ -75,6 +75,10 @@ class DDC117Article
return $this->details;
}
public function getLinks()
{
return $this->links;
}
public function resetText()
{
$this->details = null;
@ -84,4 +88,4 @@ class DDC117Article
{
return $this->translations;
}
}
}

15
tests/Doctrine/Tests/ORM/Functional/Ticket/DDC117Test.php
View File

@ -8,6 +8,7 @@ use Doctrine\Tests\Models\DDC117\DDC117Reference;
use Doctrine\Tests\Models\DDC117\DDC117Translation;
use Doctrine\Tests\Models\DDC117\DDC117ApproveChanges;
use Doctrine\Tests\Models\DDC117\DDC117Editor;
use Doctrine\Tests\Models\DDC117\DDC117Link;
require_once __DIR__ . '/../../../TestInit.php';
@ -30,6 +31,9 @@ class DDC117Test extends \Doctrine\Tests\OrmFunctionalTestCase
$this->_em->persist($this->article2);
$this->_em->flush();
$link = new DDC117Link($this->article1, $this->article2, "Link-Description");
$this->_em->persist($link);
$this->reference = new DDC117Reference($this->article1, $this->article2, "Test-Description");
$this->_em->persist($this->reference);
@ -479,4 +483,15 @@ class DDC117Test extends \Doctrine\Tests\OrmFunctionalTestCase
$this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_MANAGED, $this->_em->getUnitOfWork()->getEntityState($reference));
}
/**
* @group DDC-117
*/
public function testIndexByOnCompositeKeyField()
{
$article = $this->_em->find("Doctrine\Tests\Models\DDC117\DDC117Article", $this->article1->id());
$this->assertInstanceOf('Doctrine\Tests\Models\DDC117\DDC117Article', $article);
$this->assertEquals(1, count($article->getLinks()));
$this->assertTrue($article->getLinks()->offsetExists($this->article2->id()));
}
}

13
tests/Doctrine/Tests/ORM/Hydration/ResultSetMappingTest.php
View File

@ -255,5 +255,18 @@ class ResultSetMappingTest extends \Doctrine\Tests\OrmTestCase
$this->assertEquals('Doctrine\Tests\Models\CMS\CmsUser', $rsm->getDeclaringClass('status'));
$this->assertEquals('Doctrine\Tests\Models\CMS\CmsUser', $rsm->getDeclaringClass('username'));
}
/**
* @group DDC-117
*/
public function testIndexByMetadataColumn()
{
$this->_rsm->addEntityResult('Doctrine\Tests\Models\Legacy\LegacyUser', 'u');
$this->_rsm->addJoinedEntityResult('Doctrine\Tests\Models\Legacy', 'lu', 'u', '_references');
$this->_rsm->addMetaResult('lu', '_source', '_source', true);
$this->_rsm->addMetaResult('lu', '_target', '_target', true);
$this->_rsm->addIndexBy('lu', '_source');
$this->assertTrue($this->_rsm->hasIndexBy('lu'));
}
}