DDC-886 - Bugfix for composite identifier flag not being mapped to child classes in inheritence/mapped superclass scenarios.
This commit is contained in:
parent
6cd0fefef2
commit
e4f74d8290
2 changed files with 14 additions and 0 deletions
|
@ -940,6 +940,7 @@ class ClassMetadataInfo
|
|||
public function setIdentifier(array $identifier)
|
||||
{
|
||||
$this->identifier = $identifier;
|
||||
$this->isIdentifierComposite = (count($this->identifier) > 1);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -276,4 +276,17 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
|
|||
$this->assertEquals('cmsaddress_id', $cm->associationMappings['user']['joinTable']['joinColumns'][0]['name']);
|
||||
$this->assertEquals('cmsuser_id', $cm->associationMappings['user']['joinTable']['inverseJoinColumns'][0]['name']);
|
||||
}
|
||||
|
||||
/**
|
||||
* @group DDC-886
|
||||
*/
|
||||
public function testSetMultipleIdentifierSetsComposite()
|
||||
{
|
||||
$cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
|
||||
$cm->mapField(array('fieldName' => 'name'));
|
||||
$cm->mapField(array('fieldName' => 'username'));
|
||||
|
||||
$cm->setIdentifier(array('name', 'username'));
|
||||
$this->assertTrue($cm->isIdentifierComposite);
|
||||
}
|
||||
}
|
Loading…
Add table
Reference in a new issue