From 953a0f657220f5256f9d59f388485521f6335bd5 Mon Sep 17 00:00:00 2001 From: Alexander Date: Fri, 29 Jul 2011 09:35:59 +0200 Subject: [PATCH] [DDC-1301] Fixed tests teardown for mysql suite --- tests/Doctrine/Tests/Models/Legacy/LegacyUser.php | 2 +- tests/Doctrine/Tests/OrmFunctionalTestCase.php | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/Doctrine/Tests/Models/Legacy/LegacyUser.php b/tests/Doctrine/Tests/Models/Legacy/LegacyUser.php index d7c9a5c37..f4f5e1fcb 100644 --- a/tests/Doctrine/Tests/Models/Legacy/LegacyUser.php +++ b/tests/Doctrine/Tests/Models/Legacy/LegacyUser.php @@ -34,7 +34,7 @@ class LegacyUser public $_references; /** * @ManyToMany(targetEntity="LegacyCar", inversedBy="_users", cascade={"persist", "merge"}) - * @JoinTable(name="legace_users_cars", + * @JoinTable(name="legacy_users_cars", * joinColumns={@JoinColumn(name="iUserId", referencedColumnName="iUserId")}, * inverseJoinColumns={@JoinColumn(name="iCarId", referencedColumnName="iCarId")} * ) diff --git a/tests/Doctrine/Tests/OrmFunctionalTestCase.php b/tests/Doctrine/Tests/OrmFunctionalTestCase.php index 50edbfd75..56345bc6f 100644 --- a/tests/Doctrine/Tests/OrmFunctionalTestCase.php +++ b/tests/Doctrine/Tests/OrmFunctionalTestCase.php @@ -211,10 +211,11 @@ abstract class OrmFunctionalTestCase extends OrmTestCase $conn->executeUpdate('DELETE FROM exchange_markets'); } 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_cars'); $conn->executeUpdate('DELETE FROM legacy_users'); - $conn->executeUpdate('DELETE FROM legacy_users_reference'); } $this->_em->clear();