RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-18 06:21:40 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:doctrine/doctrine2

Browse Source
This commit is contained in:
Benjamin Eberlei 2011-07-31 11:41:30 +02:00
commit e12a5fb328
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/Doctrine/Tests/Models/Legacy/LegacyUser.php
View File

@ -34,7 +34,7 @@ class LegacyUser
public $_references; public $_references;
/** /**
* @ManyToMany(targetEntity="LegacyCar", inversedBy="_users", cascade={"persist", "merge"}) * @ManyToMany(targetEntity="LegacyCar", inversedBy="_users", cascade={"persist", "merge"})
* @JoinTable(name="legace_users_cars", * @JoinTable(name="legacy_users_cars",
* joinColumns={@JoinColumn(name="iUserId", referencedColumnName="iUserId")}, * joinColumns={@JoinColumn(name="iUserId", referencedColumnName="iUserId")},
* inverseJoinColumns={@JoinColumn(name="iCarId", referencedColumnName="iCarId")} * inverseJoinColumns={@JoinColumn(name="iCarId", referencedColumnName="iCarId")}
* ) * )

3
tests/Doctrine/Tests/OrmFunctionalTestCase.php
View File

@ -211,10 +211,11 @@ abstract class OrmFunctionalTestCase extends OrmTestCase
$conn->executeUpdate('DELETE FROM exchange_markets'); $conn->executeUpdate('DELETE FROM exchange_markets');
} }
if (isset($this->_usedModelSets['legacy'])) { if (isset($this->_usedModelSets['legacy'])) {
$conn->executeUpdate('DELETE FROM legacy_users_cars');
$conn->executeUpdate('DELETE FROM legacy_users_reference');
$conn->executeUpdate('DELETE FROM legacy_articles'); $conn->executeUpdate('DELETE FROM legacy_articles');
$conn->executeUpdate('DELETE FROM legacy_cars'); $conn->executeUpdate('DELETE FROM legacy_cars');
$conn->executeUpdate('DELETE FROM legacy_users'); $conn->executeUpdate('DELETE FROM legacy_users');
$conn->executeUpdate('DELETE FROM legacy_users_reference');
} }
$this->_em->clear(); $this->_em->clear();