diff --git a/tests/Doctrine/Tests/Models/ValueConversionType/InversedOneToOneCompositeIdEntity.php b/tests/Doctrine/Tests/Models/ValueConversionType/InversedOneToOneCompositeIdEntity.php index 631b22b8b..4a2a89a0f 100644 --- a/tests/Doctrine/Tests/Models/ValueConversionType/InversedOneToOneCompositeIdEntity.php +++ b/tests/Doctrine/Tests/Models/ValueConversionType/InversedOneToOneCompositeIdEntity.php @@ -26,7 +26,7 @@ class InversedOneToOneCompositeIdEntity public $someProperty; /** - * @OneToOne(targetEntity="OwningOneToOneCompositeIdEntity", mappedBy="associatedEntity") + * @OneToOne(targetEntity="OwningOneToOneCompositeIdEntity", mappedBy="associatedComposite") */ public $associatedEntity; } diff --git a/tests/Doctrine/Tests/Models/ValueConversionType/OwningOneToOneCompositeIdEntity.php b/tests/Doctrine/Tests/Models/ValueConversionType/OwningOneToOneCompositeIdEntity.php index bf4282cc1..0798deadc 100644 --- a/tests/Doctrine/Tests/Models/ValueConversionType/OwningOneToOneCompositeIdEntity.php +++ b/tests/Doctrine/Tests/Models/ValueConversionType/OwningOneToOneCompositeIdEntity.php @@ -21,5 +21,5 @@ class OwningOneToOneCompositeIdEntity * @JoinColumn(name="associated_id2", referencedColumnName="id2") * }) */ - public $associatedEntity; + public $associatedComposite; } diff --git a/tests/Doctrine/Tests/ORM/Functional/SchemaValidatorTest.php b/tests/Doctrine/Tests/ORM/Functional/SchemaValidatorTest.php index 948aad2ef..c09f336c9 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SchemaValidatorTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SchemaValidatorTest.php @@ -2,7 +2,6 @@ namespace Doctrine\Tests\ORM\Functional; -use Doctrine\DBAL\Types\Type as DBALType; use Doctrine\ORM\Tools\SchemaValidator; /** diff --git a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyCompositeIdForeignKeyTest.php b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyCompositeIdForeignKeyTest.php index 877d1a279..255a342bb 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyCompositeIdForeignKeyTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyCompositeIdForeignKeyTest.php @@ -2,7 +2,6 @@ namespace Doctrine\Tests\ORM\Functional\ValueConversionType; -use Doctrine\DBAL\Types\Type as DBALType; use Doctrine\Tests\Models\ValueConversionType as Entity; use Doctrine\Tests\OrmFunctionalTestCase; @@ -19,7 +18,7 @@ class ManyToManyCompositeIdForeignKeyTest extends OrmFunctionalTestCase { public function setUp() { - $this->useModelSet('vct_manytomany_compositeid_foreignkey'); + $this->useModelSet('vct'); parent::setUp(); @@ -44,16 +43,6 @@ class ManyToManyCompositeIdForeignKeyTest extends OrmFunctionalTestCase $this->_em->clear(); } - public static function tearDownAfterClass() - { - $conn = static::$_sharedConn; - - $conn->executeUpdate('DROP TABLE vct_xref_manytomany_compositeid_foreignkey'); - $conn->executeUpdate('DROP TABLE vct_owning_manytomany_compositeid_foreignkey'); - $conn->executeUpdate('DROP TABLE vct_inversed_manytomany_compositeid_foreignkey'); - $conn->executeUpdate('DROP TABLE vct_auxiliary'); - } - public function testThatTheValueOfIdentifiersAreConvertedInTheDatabase() { $conn = $this->_em->getConnection(); diff --git a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyCompositeIdTest.php b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyCompositeIdTest.php index 6b56073a3..45f9b0371 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyCompositeIdTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyCompositeIdTest.php @@ -2,7 +2,6 @@ namespace Doctrine\Tests\ORM\Functional\ValueConversionType; -use Doctrine\DBAL\Types\Type as DBALType; use Doctrine\Tests\Models\ValueConversionType as Entity; use Doctrine\Tests\OrmFunctionalTestCase; @@ -18,7 +17,7 @@ class ManyToManyCompositeIdTest extends OrmFunctionalTestCase { public function setUp() { - $this->useModelSet('vct_manytomany_compositeid'); + $this->useModelSet('vct'); parent::setUp(); @@ -39,15 +38,6 @@ class ManyToManyCompositeIdTest extends OrmFunctionalTestCase $this->_em->clear(); } - public static function tearDownAfterClass() - { - $conn = static::$_sharedConn; - - $conn->executeUpdate('DROP TABLE vct_xref_manytomany_compositeid'); - $conn->executeUpdate('DROP TABLE vct_owning_manytomany_compositeid'); - $conn->executeUpdate('DROP TABLE vct_inversed_manytomany_compositeid'); - } - public function testThatTheValueOfIdentifiersAreConvertedInTheDatabase() { $conn = $this->_em->getConnection(); diff --git a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyExtraLazyTest.php b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyExtraLazyTest.php index 3d1df24b8..34f1406ea 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyExtraLazyTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyExtraLazyTest.php @@ -2,7 +2,6 @@ namespace Doctrine\Tests\ORM\Functional\ValueConversionType; -use Doctrine\DBAL\Types\Type as DBALType; use Doctrine\Tests\Models\ValueConversionType as Entity; use Doctrine\Tests\OrmFunctionalTestCase; @@ -19,7 +18,7 @@ class ManyToManyExtraLazyTest extends OrmFunctionalTestCase { public function setUp() { - $this->useModelSet('vct_manytomany_extralazy'); + $this->useModelSet('vct'); parent::setUp(); $inversed1 = new Entity\InversedManyToManyExtraLazyEntity(); @@ -53,15 +52,6 @@ class ManyToManyExtraLazyTest extends OrmFunctionalTestCase $this->_em->clear(); } - public static function tearDownAfterClass() - { - $conn = static::$_sharedConn; - - $conn->executeUpdate('DROP TABLE vct_xref_manytomany_extralazy'); - $conn->executeUpdate('DROP TABLE vct_owning_manytomany_extralazy'); - $conn->executeUpdate('DROP TABLE vct_inversed_manytomany_extralazy'); - } - public function testThatTheExtraLazyCollectionFromOwningToInversedIsCounted() { $owning = $this->_em->find( diff --git a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyTest.php b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyTest.php index 66193fb14..345d90238 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyTest.php @@ -2,7 +2,6 @@ namespace Doctrine\Tests\ORM\Functional\ValueConversionType; -use Doctrine\DBAL\Types\Type as DBALType; use Doctrine\Tests\Models\ValueConversionType as Entity; use Doctrine\Tests\OrmFunctionalTestCase; @@ -18,7 +17,7 @@ class ManyToManyTest extends OrmFunctionalTestCase { public function setUp() { - $this->useModelSet('vct_manytomany'); + $this->useModelSet('vct'); parent::setUp(); @@ -38,15 +37,6 @@ class ManyToManyTest extends OrmFunctionalTestCase $this->_em->clear(); } - public static function tearDownAfterClass() - { - $conn = static::$_sharedConn; - - $conn->executeUpdate('DROP TABLE vct_xref_manytomany'); - $conn->executeUpdate('DROP TABLE vct_owning_manytomany'); - $conn->executeUpdate('DROP TABLE vct_inversed_manytomany'); - } - public function testThatTheValueOfIdentifiersAreConvertedInTheDatabase() { $conn = $this->_em->getConnection(); diff --git a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyCompositeIdForeignKeyTest.php b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyCompositeIdForeignKeyTest.php index 17a8ea873..ed5a124ab 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyCompositeIdForeignKeyTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyCompositeIdForeignKeyTest.php @@ -2,7 +2,6 @@ namespace Doctrine\Tests\ORM\Functional\ValueConversionType; -use Doctrine\DBAL\Types\Type as DBALType; use Doctrine\Tests\Models\ValueConversionType as Entity; use Doctrine\Tests\OrmFunctionalTestCase; @@ -19,7 +18,7 @@ class OneToManyCompositeIdForeignKeyTest extends OrmFunctionalTestCase { public function setUp() { - $this->useModelSet('vct_onetomany_compositeid_foreignkey'); + $this->useModelSet('vct'); parent::setUp(); @@ -45,15 +44,6 @@ class OneToManyCompositeIdForeignKeyTest extends OrmFunctionalTestCase $this->_em->clear(); } - public static function tearDownAfterClass() - { - $conn = static::$_sharedConn; - - $conn->executeUpdate('DROP TABLE vct_owning_manytoone_compositeid_foreignkey'); - $conn->executeUpdate('DROP TABLE vct_inversed_onetomany_compositeid_foreignkey'); - $conn->executeUpdate('DROP TABLE vct_auxiliary'); - } - public function testThatTheValueOfIdentifiersAreConvertedInTheDatabase() { $conn = $this->_em->getConnection(); diff --git a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyCompositeIdTest.php b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyCompositeIdTest.php index c094afa78..64764e7e0 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyCompositeIdTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyCompositeIdTest.php @@ -2,7 +2,6 @@ namespace Doctrine\Tests\ORM\Functional\ValueConversionType; -use Doctrine\DBAL\Types\Type as DBALType; use Doctrine\Tests\Models\ValueConversionType as Entity; use Doctrine\Tests\OrmFunctionalTestCase; @@ -18,7 +17,7 @@ class OneToManyCompositeIdTest extends OrmFunctionalTestCase { public function setUp() { - $this->useModelSet('vct_onetomany_compositeid'); + $this->useModelSet('vct'); parent::setUp(); @@ -40,14 +39,6 @@ class OneToManyCompositeIdTest extends OrmFunctionalTestCase $this->_em->clear(); } - public static function tearDownAfterClass() - { - $conn = static::$_sharedConn; - - $conn->executeUpdate('DROP TABLE vct_owning_manytoone_compositeid'); - $conn->executeUpdate('DROP TABLE vct_inversed_onetomany_compositeid'); - } - public function testThatTheValueOfIdentifiersAreConvertedInTheDatabase() { $conn = $this->_em->getConnection(); diff --git a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyExtraLazyTest.php b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyExtraLazyTest.php index bb9006782..312e270e9 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyExtraLazyTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyExtraLazyTest.php @@ -2,7 +2,6 @@ namespace Doctrine\Tests\ORM\Functional\ValueConversionType; -use Doctrine\DBAL\Types\Type as DBALType; use Doctrine\Tests\Models\ValueConversionType as Entity; use Doctrine\Tests\OrmFunctionalTestCase; @@ -19,7 +18,7 @@ class OneToManyExtraLazyTest extends OrmFunctionalTestCase { public function setUp() { - $this->useModelSet('vct_onetomany_extralazy'); + $this->useModelSet('vct'); parent::setUp(); @@ -51,14 +50,6 @@ class OneToManyExtraLazyTest extends OrmFunctionalTestCase $this->_em->clear(); } - public static function tearDownAfterClass() - { - $conn = static::$_sharedConn; - - $conn->executeUpdate('DROP TABLE vct_owning_manytoone_extralazy'); - $conn->executeUpdate('DROP TABLE vct_inversed_onetomany_extralazy'); - } - public function testThatExtraLazyCollectionIsCounted() { $inversed = $this->_em->find( diff --git a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyTest.php b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyTest.php index e83453714..40034268c 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyTest.php @@ -2,7 +2,6 @@ namespace Doctrine\Tests\ORM\Functional\ValueConversionType; -use Doctrine\DBAL\Types\Type as DBALType; use Doctrine\Tests\Models\ValueConversionType as Entity; use Doctrine\Tests\OrmFunctionalTestCase; @@ -18,7 +17,7 @@ class OneToManyTest extends OrmFunctionalTestCase { public function setUp() { - $this->useModelSet('vct_onetomany'); + $this->useModelSet('vct'); parent::setUp(); @@ -39,14 +38,6 @@ class OneToManyTest extends OrmFunctionalTestCase $this->_em->clear(); } - public static function tearDownAfterClass() - { - $conn = static::$_sharedConn; - - $conn->executeUpdate('DROP TABLE vct_owning_manytoone'); - $conn->executeUpdate('DROP TABLE vct_inversed_onetomany'); - } - public function testThatTheValueOfIdentifiersAreConvertedInTheDatabase() { $conn = $this->_em->getConnection(); diff --git a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToOneCompositeIdForeignKeyTest.php b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToOneCompositeIdForeignKeyTest.php index 4a595c21f..d8cb52836 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToOneCompositeIdForeignKeyTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToOneCompositeIdForeignKeyTest.php @@ -2,7 +2,6 @@ namespace Doctrine\Tests\ORM\Functional\ValueConversionType; -use Doctrine\DBAL\Types\Type as DBALType; use Doctrine\Tests\Models\ValueConversionType as Entity; use Doctrine\Tests\OrmFunctionalTestCase; @@ -19,7 +18,7 @@ class OneToOneCompositeIdForeignKeyTest extends OrmFunctionalTestCase { public function setUp() { - $this->useModelSet('vct_onetoone_compositeid_foreignkey'); + $this->useModelSet('vct'); parent::setUp(); $auxiliary = new Entity\AuxiliaryEntity(); @@ -44,15 +43,6 @@ class OneToOneCompositeIdForeignKeyTest extends OrmFunctionalTestCase $this->_em->clear(); } - public static function tearDownAfterClass() - { - $conn = static::$_sharedConn; - - $conn->executeUpdate('DROP TABLE vct_owning_onetoone_compositeid_foreignkey'); - $conn->executeUpdate('DROP TABLE vct_inversed_onetoone_compositeid_foreignkey'); - $conn->executeUpdate('DROP TABLE vct_auxiliary'); - } - public function testThatTheValueOfIdentifiersAreConvertedInTheDatabase() { $conn = $this->_em->getConnection(); diff --git a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToOneCompositeIdTest.php b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToOneCompositeIdTest.php index 96daa6016..4c4aa7958 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToOneCompositeIdTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToOneCompositeIdTest.php @@ -2,7 +2,6 @@ namespace Doctrine\Tests\ORM\Functional\ValueConversionType; -use Doctrine\DBAL\Types\Type as DBALType; use Doctrine\Tests\Models\ValueConversionType as Entity; use Doctrine\Tests\OrmFunctionalTestCase; @@ -18,7 +17,8 @@ class OneToOneCompositeIdTest extends OrmFunctionalTestCase { public function setUp() { - $this->useModelSet('vct_onetoone_compositeid'); + $this->useModelSet('vct'); + parent::setUp(); $inversed = new Entity\InversedOneToOneCompositeIdEntity(); @@ -30,7 +30,7 @@ class OneToOneCompositeIdTest extends OrmFunctionalTestCase $owning->id3 = 'ghi'; $inversed->associatedEntity = $owning; - $owning->associatedEntity = $inversed; + $owning->associatedComposite = $inversed; $this->_em->persist($inversed); $this->_em->persist($owning); @@ -39,14 +39,6 @@ class OneToOneCompositeIdTest extends OrmFunctionalTestCase $this->_em->clear(); } - public static function tearDownAfterClass() - { - $conn = static::$_sharedConn; - - $conn->executeUpdate('DROP TABLE vct_owning_onetoone_compositeid'); - $conn->executeUpdate('DROP TABLE vct_inversed_onetoone_compositeid'); - } - public function testThatTheValueOfIdentifiersAreConvertedInTheDatabase() { $conn = $this->_em->getConnection(); @@ -108,7 +100,7 @@ class OneToOneCompositeIdTest extends OrmFunctionalTestCase 'ghi' ); - $inversedProxy = $owning->associatedEntity; + $inversedProxy = $owning->associatedComposite; $this->assertEquals('some value to be loaded', $inversedProxy->someProperty); } @@ -123,6 +115,9 @@ class OneToOneCompositeIdTest extends OrmFunctionalTestCase array('id1' => 'abc', 'id2' => 'def') ); - $this->assertInstanceOf('Doctrine\Tests\Models\ValueConversionType\OwningOneToOneCompositeIdEntity', $inversed->associatedEntity); + $this->assertInstanceOf( + 'Doctrine\Tests\Models\ValueConversionType\OwningOneToOneCompositeIdEntity', + $inversed->associatedEntity + ); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToOneTest.php b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToOneTest.php index 15e45f9fe..2be60207e 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToOneTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToOneTest.php @@ -2,7 +2,6 @@ namespace Doctrine\Tests\ORM\Functional\ValueConversionType; -use Doctrine\DBAL\Types\Type as DBALType; use Doctrine\Tests\Models\ValueConversionType as Entity; use Doctrine\Tests\OrmFunctionalTestCase; @@ -18,7 +17,7 @@ class OneToOneTest extends OrmFunctionalTestCase { public function setUp() { - $this->useModelSet('vct_onetoone'); + $this->useModelSet('vct'); parent::setUp(); @@ -39,14 +38,6 @@ class OneToOneTest extends OrmFunctionalTestCase $this->_em->clear(); } - public static function tearDownAfterClass() - { - $conn = static::$_sharedConn; - - $conn->executeUpdate('DROP TABLE vct_owning_onetoone'); - $conn->executeUpdate('DROP TABLE vct_inversed_onetoone'); - } - public function testThatTheValueOfIdentifiersAreConvertedInTheDatabase() { $conn = $this->_em->getConnection(); diff --git a/tests/Doctrine/Tests/OrmFunctionalTestCase.php b/tests/Doctrine/Tests/OrmFunctionalTestCase.php index cfced6d61..0f2964b19 100644 --- a/tests/Doctrine/Tests/OrmFunctionalTestCase.php +++ b/tests/Doctrine/Tests/OrmFunctionalTestCase.php @@ -3,6 +3,7 @@ namespace Doctrine\Tests; use Doctrine\DBAL\Types\Type; +use Doctrine\ORM\Tools\SchemaTool; use Doctrine\Tests\EventListener\CacheMetadataListener; use Doctrine\ORM\Cache\Logging\StatisticsCacheLogger; use Doctrine\ORM\Cache\DefaultCacheFactory; @@ -41,7 +42,7 @@ abstract class OrmFunctionalTestCase extends OrmTestCase protected $_em; /** - * @var \Doctrine\ORM\Tools\SchemaTool + * @var SchemaTool */ protected $_schemaTool; @@ -200,52 +201,30 @@ abstract class OrmFunctionalTestCase extends OrmTestCase 'Doctrine\Tests\Models\Quote\Phone', 'Doctrine\Tests\Models\Quote\User' ), - 'vct_onetoone' => array( + 'vct' => array( 'Doctrine\Tests\Models\ValueConversionType\InversedOneToOneEntity', - 'Doctrine\Tests\Models\ValueConversionType\OwningOneToOneEntity' - ), - 'vct_onetoone_compositeid' => array( + 'Doctrine\Tests\Models\ValueConversionType\OwningOneToOneEntity', 'Doctrine\Tests\Models\ValueConversionType\InversedOneToOneCompositeIdEntity', - 'Doctrine\Tests\Models\ValueConversionType\OwningOneToOneCompositeIdEntity' - ), - 'vct_onetoone_compositeid_foreignkey' => array( + 'Doctrine\Tests\Models\ValueConversionType\OwningOneToOneCompositeIdEntity', 'Doctrine\Tests\Models\ValueConversionType\AuxiliaryEntity', 'Doctrine\Tests\Models\ValueConversionType\InversedOneToOneCompositeIdForeignKeyEntity', - 'Doctrine\Tests\Models\ValueConversionType\OwningOneToOneCompositeIdForeignKeyEntity' - ), - 'vct_onetomany' => array( + 'Doctrine\Tests\Models\ValueConversionType\OwningOneToOneCompositeIdForeignKeyEntity', 'Doctrine\Tests\Models\ValueConversionType\InversedOneToManyEntity', - 'Doctrine\Tests\Models\ValueConversionType\OwningManyToOneEntity' - ), - 'vct_onetomany_compositeid' => array( + 'Doctrine\Tests\Models\ValueConversionType\OwningManyToOneEntity', 'Doctrine\Tests\Models\ValueConversionType\InversedOneToManyCompositeIdEntity', - 'Doctrine\Tests\Models\ValueConversionType\OwningManyToOneCompositeIdEntity' - ), - 'vct_onetomany_compositeid_foreignkey' => array( - 'Doctrine\Tests\Models\ValueConversionType\AuxiliaryEntity', + 'Doctrine\Tests\Models\ValueConversionType\OwningManyToOneCompositeIdEntity', 'Doctrine\Tests\Models\ValueConversionType\InversedOneToManyCompositeIdForeignKeyEntity', - 'Doctrine\Tests\Models\ValueConversionType\OwningManyToOneCompositeIdForeignKeyEntity' - ), - 'vct_onetomany_extralazy' => array( + 'Doctrine\Tests\Models\ValueConversionType\OwningManyToOneCompositeIdForeignKeyEntity', 'Doctrine\Tests\Models\ValueConversionType\InversedOneToManyExtraLazyEntity', - 'Doctrine\Tests\Models\ValueConversionType\OwningManyToOneExtraLazyEntity' - ), - 'vct_manytomany' => array( + 'Doctrine\Tests\Models\ValueConversionType\OwningManyToOneExtraLazyEntity', 'Doctrine\Tests\Models\ValueConversionType\InversedManyToManyEntity', - 'Doctrine\Tests\Models\ValueConversionType\OwningManyToManyEntity' - ), - 'vct_manytomany_compositeid' => array( + 'Doctrine\Tests\Models\ValueConversionType\OwningManyToManyEntity', 'Doctrine\Tests\Models\ValueConversionType\InversedManyToManyCompositeIdEntity', - 'Doctrine\Tests\Models\ValueConversionType\OwningManyToManyCompositeIdEntity' - ), - 'vct_manytomany_compositeid_foreignkey' => array( - 'Doctrine\Tests\Models\ValueConversionType\AuxiliaryEntity', + 'Doctrine\Tests\Models\ValueConversionType\OwningManyToManyCompositeIdEntity', 'Doctrine\Tests\Models\ValueConversionType\InversedManyToManyCompositeIdForeignKeyEntity', - 'Doctrine\Tests\Models\ValueConversionType\OwningManyToManyCompositeIdForeignKeyEntity' - ), - 'vct_manytomany_extralazy' => array( + 'Doctrine\Tests\Models\ValueConversionType\OwningManyToManyCompositeIdForeignKeyEntity', 'Doctrine\Tests\Models\ValueConversionType\InversedManyToManyExtraLazyEntity', - 'Doctrine\Tests\Models\ValueConversionType\OwningManyToManyExtraLazyEntity' + 'Doctrine\Tests\Models\ValueConversionType\OwningManyToManyExtraLazyEntity', ), ); @@ -406,63 +385,33 @@ abstract class OrmFunctionalTestCase extends OrmTestCase $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier("quote-user")); } - if (isset($this->_usedModelSets['vct_onetoone'])) { + if (isset($this->_usedModelSets['vct'])) { $conn->executeUpdate('DELETE FROM vct_owning_onetoone'); $conn->executeUpdate('DELETE FROM vct_inversed_onetoone'); - } - - if (isset($this->_usedModelSets['vct_onetoone_compositeid'])) { $conn->executeUpdate('DELETE FROM vct_owning_onetoone_compositeid'); $conn->executeUpdate('DELETE FROM vct_inversed_onetoone_compositeid'); - } - - if (isset($this->_usedModelSets['vct_onetoone_compositeid_foreignkey'])) { $conn->executeUpdate('DELETE FROM vct_owning_onetoone_compositeid_foreignkey'); $conn->executeUpdate('DELETE FROM vct_inversed_onetoone_compositeid_foreignkey'); $conn->executeUpdate('DELETE FROM vct_auxiliary'); - } - - if (isset($this->_usedModelSets['vct_onetomany'])) { $conn->executeUpdate('DELETE FROM vct_owning_manytoone'); $conn->executeUpdate('DELETE FROM vct_inversed_onetomany'); - } - - if (isset($this->_usedModelSets['vct_onetomany_compositeid'])) { $conn->executeUpdate('DELETE FROM vct_owning_manytoone_compositeid'); $conn->executeUpdate('DELETE FROM vct_inversed_onetomany_compositeid'); - } - - if (isset($this->_usedModelSets['vct_onetomany_compositeid_foreignkey'])) { $conn->executeUpdate('DELETE FROM vct_owning_manytoone_compositeid_foreignkey'); $conn->executeUpdate('DELETE FROM vct_inversed_onetomany_compositeid_foreignkey'); $conn->executeUpdate('DELETE FROM vct_auxiliary'); - } - - if (isset($this->_usedModelSets['vct_onetomany_extralazy'])) { $conn->executeUpdate('DELETE FROM vct_owning_manytoone_extralazy'); $conn->executeUpdate('DELETE FROM vct_inversed_onetomany_extralazy'); - } - - if (isset($this->_usedModelSets['vct_manytomany'])) { $conn->executeUpdate('DELETE FROM vct_xref_manytomany'); $conn->executeUpdate('DELETE FROM vct_owning_manytomany'); $conn->executeUpdate('DELETE FROM vct_inversed_manytomany'); - } - - if (isset($this->_usedModelSets['vct_manytomany_compositeid'])) { $conn->executeUpdate('DELETE FROM vct_xref_manytomany_compositeid'); $conn->executeUpdate('DELETE FROM vct_owning_manytomany_compositeid'); $conn->executeUpdate('DELETE FROM vct_inversed_manytomany_compositeid'); - } - - if (isset($this->_usedModelSets['vct_manytomany_compositeid_foreignkey'])) { $conn->executeUpdate('DELETE FROM vct_xref_manytomany_compositeid_foreignkey'); $conn->executeUpdate('DELETE FROM vct_owning_manytomany_compositeid_foreignkey'); $conn->executeUpdate('DELETE FROM vct_inversed_manytomany_compositeid_foreignkey'); $conn->executeUpdate('DELETE FROM vct_auxiliary'); - } - - if (isset($this->_usedModelSets['vct_manytomany_extralazy'])) { $conn->executeUpdate('DELETE FROM vct_xref_manytomany_extralazy'); $conn->executeUpdate('DELETE FROM vct_owning_manytomany_extralazy'); $conn->executeUpdate('DELETE FROM vct_inversed_manytomany_extralazy'); @@ -507,14 +456,8 @@ abstract class OrmFunctionalTestCase extends OrmTestCase { $this->setUpDBALTypes(); - $forceCreateTables = false; - if ( ! isset(static::$_sharedConn)) { static::$_sharedConn = TestUtil::getConnection(); - - if (static::$_sharedConn->getDriver() instanceof \Doctrine\DBAL\Driver\PDOSqlite\Driver) { - $forceCreateTables = true; - } } if (isset($GLOBALS['DOCTRINE_MARK_SQL_LOGS'])) { @@ -527,7 +470,7 @@ abstract class OrmFunctionalTestCase extends OrmTestCase if ( ! $this->_em) { $this->_em = $this->_getEntityManager(); - $this->_schemaTool = new \Doctrine\ORM\Tools\SchemaTool($this->_em); + $this->_schemaTool = new SchemaTool($this->_em); } $classes = array();