RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-02 21:41:45 +03:00
Code Issues Projects Releases Wiki Activity

lifts an unnecessary restriction on ResultSetMappingBuilder

Browse Source
This commit is contained in:
Johannes M. Schmitt 2013-11-23 19:44:33 +01:00
parent 75d7ac2783
commit 8ae48ad9db
1 changed files with 12 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.
* *