Permalink
Browse files

[DDC-1666] Fix bug where orphan removal on one-to-one associations le…

…ad to unique constraint errors when replacing an entity with a new one.
  • Loading branch information...
beberlei committed Mar 14, 2013
1 parent d041978 commit 559303430ac922fab4b80064c3ac0b3e1a4160f4
@@ -1487,6 +1487,10 @@ protected function _validateAndCompleteOneToOneMapping(array $mapping)
$mapping['orphanRemoval'] = isset($mapping['orphanRemoval']) ? (bool) $mapping['orphanRemoval'] : false;
$mapping['isCascadeRemove'] = $mapping['orphanRemoval'] ? true : $mapping['isCascadeRemove'];
+ if ($mapping['orphanRemoval']) {
+ unset($mapping['unique']);
+ }
+
if (isset($mapping['id']) && $mapping['id'] === true && !$mapping['isOwningSide']) {
throw MappingException::illegalInverseIdentifierAssociation($this->name, $mapping['fieldName']);
}
@@ -0,0 +1,40 @@
+<?php
+
+namespace Doctrine\Tests\ORM\Functional\Ticket;
+
+use Doctrine\Tests\Models\CMS\CmsUser;
+use Doctrine\Tests\Models\CMS\CmsEmail;
+
+/**
+ * @group DDC-1666
+ */
+class DDC1666Test extends \Doctrine\Tests\OrmFunctionalTestCase
+{
+ public function setUp()
+ {
+ $this->useModelSet('cms');
+ parent::setUp();
+ }
+
+ public function testGivenOrphanRemovalOneToOne_WhenReplacing_ThenNoUniqueConstraintError()
+ {
+ $user = new CmsUser();
+ $user->name = "Benjamin";
+ $user->username = "beberlei";
+ $user->status = "something";
+ $user->setEmail($email = new CmsEmail());
+ $email->setEmail("kontakt@beberlei.de");
+
+ $this->_em->persist($user);
+ $this->_em->flush();
+
+ $this->assertTrue($this->_em->contains($email));
+
+ $user->setEmail($newEmail = new CmsEmail());
+ $newEmail->setEmail("benjamin.eberlei@googlemail.com");
+
+ $this->_em->flush();
+
+ $this->assertFalse($this->_em->contains($email));
+ }
+}

0 comments on commit 5593034

Please sign in to comment.