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

DDC-1302 - Fix bug in XmlDriver not handling orphan removal

Browse Source
This commit is contained in:
Benjamin Eberlei 2011-07-31 11:32:57 +02:00
parent c34612b8e9
commit 816039f23f
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php
View File

@ -285,8 +285,8 @@ class XmlDriver extends AbstractFileDriver
$mapping['cascade'] = $this->_getCascadeMappings($oneToOneElement->cascade); $mapping['cascade'] = $this->_getCascadeMappings($oneToOneElement->cascade);
} }
if (isset($oneToOneElement->{'orphan-removal'})) { if (isset($oneToOneElement['orphan-removal'])) {
$mapping['orphanRemoval'] = (bool)$oneToOneElement->{'orphan-removal'}; $mapping['orphanRemoval'] = (bool)$oneToOneElement['orphan-removal'];
} }
$metadata->mapOneToOne($mapping); $metadata->mapOneToOne($mapping);
@ -310,8 +310,8 @@ class XmlDriver extends AbstractFileDriver
$mapping['cascade'] = $this->_getCascadeMappings($oneToManyElement->cascade); $mapping['cascade'] = $this->_getCascadeMappings($oneToManyElement->cascade);
} }
if (isset($oneToManyElement->{'orphan-removal'})) { if (isset($oneToManyElement['orphan-removal'])) {
$mapping['orphanRemoval'] = (bool)$oneToManyElement->{'orphan-removal'}; $mapping['orphanRemoval'] = (bool)$oneToManyElement['orphan-removal'];
} }
if (isset($oneToManyElement->{'order-by'})) { if (isset($oneToManyElement->{'order-by'})) {

5
tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php
View File

@ -186,6 +186,7 @@ abstract class AbstractMappingDriverTest extends \Doctrine\Tests\OrmTestCase
$this->assertFalse($class->associationMappings['phonenumbers']['isCascadeRefresh']); $this->assertFalse($class->associationMappings['phonenumbers']['isCascadeRefresh']);
$this->assertFalse($class->associationMappings['phonenumbers']['isCascadeDetach']); $this->assertFalse($class->associationMappings['phonenumbers']['isCascadeDetach']);
$this->assertFalse($class->associationMappings['phonenumbers']['isCascadeMerge']); $this->assertFalse($class->associationMappings['phonenumbers']['isCascadeMerge']);
$this->assertTrue($class->associationMappings['phonenumbers']['orphanRemoval']);
// Test Order By // Test Order By
$this->assertEquals(array('number' => 'ASC'), $class->associationMappings['phonenumbers']['orderBy']); $this->assertEquals(array('number' => 'ASC'), $class->associationMappings['phonenumbers']['orderBy']);
@ -328,7 +329,7 @@ class User
public $address; public $address;
/** /**
* @OneToMany(targetEntity="Phonenumber", mappedBy="user", cascade={"persist"}) * @OneToMany(targetEntity="Phonenumber", mappedBy="user", cascade={"persist"}, orphanRemoval=true)
* @OrderBy({"number"="ASC"}) * @OrderBy({"number"="ASC"})
*/ */
public $phonenumbers; public $phonenumbers;
@ -423,7 +424,7 @@ class User
1 => 'persist', 1 => 'persist',
), ),
'mappedBy' => 'user', 'mappedBy' => 'user',
'orphanRemoval' => false, 'orphanRemoval' => true,
'orderBy' => 'orderBy' =>
array( array(
'number' => 'ASC', 'number' => 'ASC',

2
tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.User.php
View File

@ -63,7 +63,7 @@ $metadata->mapOneToMany(array(
1 => 'persist', 1 => 'persist',
), ),
'mappedBy' => 'user', 'mappedBy' => 'user',
'orphanRemoval' => false, 'orphanRemoval' => true,
'orderBy' => 'orderBy' =>
array( array(
'number' => 'ASC', 'number' => 'ASC',

2
tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.ORM.Mapping.User.dcm.xml
View File

@ -39,7 +39,7 @@
<join-column name="address_id" referenced-column-name="id" on-delete="CASCADE" on-update="CASCADE"/> <join-column name="address_id" referenced-column-name="id" on-delete="CASCADE" on-update="CASCADE"/>
</one-to-one> </one-to-one>
<one-to-many field="phonenumbers" target-entity="Phonenumber" mapped-by="user"> <one-to-many field="phonenumbers" target-entity="Phonenumber" mapped-by="user" orphan-removal="true">
<cascade> <cascade>
<cascade-persist/> <cascade-persist/>
</cascade> </cascade>

1
tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.ORM.Mapping.User.dcm.yml
View File

@ -34,6 +34,7 @@ Doctrine\Tests\ORM\Mapping\User:
oneToMany: oneToMany:
phonenumbers: phonenumbers:
targetEntity: Phonenumber targetEntity: Phonenumber
orphanRemoval: true
mappedBy: user mappedBy: user
orderBy: orderBy:
number: ASC number: ASC