diff --git a/tests/Doctrine/Tests/ORM/Functional/MergeCompositeToOneKeyTest.php b/tests/Doctrine/Tests/ORM/Functional/MergeCompositeToOneKeyTest.php index 007d55fe6..99c2f349d 100644 --- a/tests/Doctrine/Tests/ORM/Functional/MergeCompositeToOneKeyTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/MergeCompositeToOneKeyTest.php @@ -23,7 +23,6 @@ class MergeCompositeToOneKeyTest extends \Doctrine\Tests\OrmFunctionalTestCase $state->state = 'CA'; $state->country = $country; - $this->_em->merge($country); $this->_em->merge($state); } } @@ -55,7 +54,7 @@ class MergeCompositeToOneKeyState /** * @Id - * @ManyToOne(targetEntity="MergeCompositeToOneKeyCountry") + * @ManyToOne(targetEntity="MergeCompositeToOneKeyCountry", cascade={"MERGE"}) * @JoinColumn(name="country", referencedColumnName="country") */ public $country;