RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-30 12:01:44 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #858 from schmittjoh/rsmBuilder

Browse Source 
lifts an unnecessary restriction on ResultSetMappingBuilder
This commit is contained in:
Benjamin Eberlei 2014-02-08 16:23:18 +01:00
commit 8e3f4561c0
2 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/Doctrine/ORM/Query/ResultSetMappingBuilder.php
View File

@ -142,8 +142,8 @@ class ResultSetMappingBuilder extends ResultSetMapping
$classMetadata = $this->em->getClassMetadata($class); $classMetadata = $this->em->getClassMetadata($class);
$platform = $this->em->getConnection()->getDatabasePlatform(); $platform = $this->em->getConnection()->getDatabasePlatform();
if ($classMetadata->isInheritanceTypeSingleTable() || $classMetadata->isInheritanceTypeJoined()) { if ( ! $this->isInheritanceSupported($classMetadata)) {
throw new \InvalidArgumentException('ResultSetMapping builder does not currently support inheritance.'); throw new \InvalidArgumentException('ResultSetMapping builder does not currently support your inheritance scheme.');
} }
@ -179,6 +179,16 @@ class ResultSetMappingBuilder extends ResultSetMapping
} }
} }
private function isInheritanceSupported(ClassMetadataInfo $classMetadata)
{
if ($classMetadata->isInheritanceTypeSingleTable()
&& in_array($classMetadata->name, $classMetadata->discriminatorMap, true)) {
return true;
}
return ! ($classMetadata->isInheritanceTypeSingleTable() || $classMetadata->isInheritanceTypeJoined());
}
/** /**
* Gets column alias for a given column. * Gets column alias for a given column.
* *

19
tests/Doctrine/Tests/ORM/Functional/NativeQueryTest.php
View File

@ -313,6 +313,25 @@ class NativeQueryTest extends \Doctrine\Tests\OrmFunctionalTestCase
$this->assertEquals($user->name, $address->getUser()->getName()); $this->assertEquals($user->name, $address->getUser()->getName());
} }
/**
* @group rsm-sti
*/
public function testConcreteClassInSingleTableInheritanceSchemaWithRSMBuilderIsFine()
{
$rsm = new ResultSetMappingBuilder($this->_em);
$rsm->addRootEntityFromClassMetadata('Doctrine\Tests\Models\Company\CompanyFixContract', 'c');
}
/**
* @group rsm-sti
*/
public function testAbstractClassInSingleTableInheritanceSchemaWithRSMBuilderThrowsException()
{
$this->setExpectedException('\InvalidArgumentException', 'ResultSetMapping builder does not currently support your inheritance scheme.');
$rsm = new ResultSetMappingBuilder($this->_em);
$rsm->addRootEntityFromClassMetadata('Doctrine\Tests\Models\Company\CompanyContract', 'c');
}
/** /**
* @expectedException \InvalidArgumentException * @expectedException \InvalidArgumentException
*/ */