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

[DDC-3027] Avoid duplicated mapping using Embedded in MappedSuperclass

Browse Source
This commit is contained in:
Eduardo García Sanz 2014-04-30 11:46:54 +02:00
parent 7a305475e3
commit 8a3def097f
2 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -141,13 +141,17 @@ class ClassMetadataFactory extends AbstractClassMetadataFactory
$this->completeIdGeneratorMapping($class);
}
foreach ($class->embeddedClasses as $property => $embeddableClass) {
if (isset($embeddableClass['inherited'])) {
continue;
}
if (!$class->isMappedSuperclass) {
$embeddableMetadata = $this->getMetadataFor($embeddableClass['class']);
$class->inlineEmbeddable($property, $embeddableMetadata);
foreach ($class->embeddedClasses as $property => $embeddableClass) {
if (isset($embeddableClass['inherited'])) {
continue;
}
$embeddableMetadata = $this->getMetadataFor($embeddableClass['class']);
$class->inlineEmbeddable($property, $embeddableMetadata);
}
}
if ($parent && $parent->isInheritanceTypeSingleTable()) {

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

@ -17,6 +17,8 @@ class ValueObjectsTest extends \Doctrine\Tests\OrmFunctionalTestCase
$this->_em->getClassMetadata(__NAMESPACE__ . '\DDC93Address'),
$this->_em->getClassMetadata(__NAMESPACE__ . '\DDC93Vehicle'),
$this->_em->getClassMetadata(__NAMESPACE__ . '\DDC93Car'),
$this->_em->getClassMetadata(__NAMESPACE__ . '\DDC3027Animal'),
$this->_em->getClassMetadata(__NAMESPACE__ . '\DDC3027Dog'),
));
} catch(\Exception $e) {
}
@ -212,6 +214,15 @@ class ValueObjectsTest extends \Doctrine\Tests\OrmFunctionalTestCase
$this->assertEquals($expectedColumnName, $actualColumnName);
}
public function testInlineEmbeddableInMappedSuperClass()
{
$isFieldMapped = $this->_em
->getClassMetadata(__NAMESPACE__ . '\DDC3027Dog')
->hasField('address.street');
$this->assertTrue($isFieldMapped);
}
}
@ -396,3 +407,22 @@ class DDC3028Id
$this->id = $id;
}
}
/**
* @MappedSuperclass
*/
abstract class DDC3027Animal
{
/** @Id @GeneratedValue(strategy = "AUTO") @Column(type = "integer") */
public $id;
/** @Embedded(class = "DDC93Address") */
public $address;
}
/**
* @Entity
*/
class DDC3027Dog extends DDC3027Animal
{
}