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

Fix regression introduced with DDC-1203,DDC-1204 patch

Browse Source
This commit is contained in:
Benjamin Eberlei 2011-06-16 23:00:59 +02:00
parent 713f4654fd
commit 0cd0ae49a1
2 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
View File

@ -281,7 +281,7 @@ class ClassMetadataFactory implements ClassMetadataFactoryInterface
throw MappingException::reflectionFailure($className, $e); throw MappingException::reflectionFailure($className, $e);
} }
if ($parent) { if ($parent && ! $parent->isMappedSuperclass) {
if ($parent->isIdGeneratorSequence()) { if ($parent->isIdGeneratorSequence()) {
$class->setSequenceGeneratorDefinition($parent->sequenceGeneratorDefinition); $class->setSequenceGeneratorDefinition($parent->sequenceGeneratorDefinition);
} else if ($parent->isIdGeneratorTable()) { } else if ($parent->isIdGeneratorTable()) {

31
tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php
View File

@ -89,6 +89,17 @@ class BasicInheritanceMappingTest extends \Doctrine\Tests\OrmTestCase
$class = $this->_factory->getMetadataFor(__NAMESPACE__ . '\\HierachyE'); $class = $this->_factory->getMetadataFor(__NAMESPACE__ . '\\HierachyE');
} }
/**
* @group DDC-1204
* @group DDC-1203
*/
public function testMappedSuperclassWithId()
{
$class = $this->_factory->getMetadataFor(__NAMESPACE__ . '\\SuperclassEntity');
$this->assertTrue(isset($class->fieldMappings['id']));
}
} }
class TransientBaseClass { class TransientBaseClass {
@ -189,4 +200,24 @@ class HierachyE extends HierachyBEntity
{ {
/** @Column(type="string") */ /** @Column(type="string") */
public $e; public $e;
}
/**
* @Entity
*/
class SuperclassEntity extends SuperclassBase
{
}
/**
* @MappedSuperclass
*/
abstract class SuperclassBase
{
/**
* @Column(type="integer") @Id @GeneratedValue
* @var int
*/
public $id;
} }