RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-03-21 23:43:53 +03:00
Code Issues Projects Releases Wiki Activity

Update test to valid use case

Browse Source
This commit is contained in:
Adrien Brault 2014-11-07 15:19:37 +01:00 committed by Marco Pivetta
parent fc8191f557
commit f189c1aaf0
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/Doctrine/Tests/ORM/Functional/MergeCompositeToOneKeyTest.php
View File

@ -23,7 +23,6 @@ class MergeCompositeToOneKeyTest extends \Doctrine\Tests\OrmFunctionalTestCase
$state->state = 'CA'; $state->state = 'CA';
$state->country = $country; $state->country = $country;
$this->_em->merge($country);
$this->_em->merge($state); $this->_em->merge($state);
} }
} }
@ -55,7 +54,7 @@ class MergeCompositeToOneKeyState
/** /**
* @Id * @Id
* @ManyToOne(targetEntity="MergeCompositeToOneKeyCountry") * @ManyToOne(targetEntity="MergeCompositeToOneKeyCountry", cascade={"MERGE"})
* @JoinColumn(name="country", referencedColumnName="country") * @JoinColumn(name="country", referencedColumnName="country")
*/ */
public $country; public $country;