Revert "#1178 - simplified ValueConversionType tests by using a single model-set for the entire subset of tests (faster as well)"

This reverts commit 2702540930.

tests/Doctrine/Tests/Models/ValueConversionType/InversedOneToOneCompositeIdEntity.php

@@ -26,7 +26,7 @@ class InversedOneToOneCompositeIdEntity
     public $someProperty;
 
     /**
-     * @OneToOne(targetEntity="OwningOneToOneCompositeIdEntity", mappedBy="associatedComposite")
+     * @OneToOne(targetEntity="OwningOneToOneCompositeIdEntity", mappedBy="associatedEntity")
      */
     public $associatedEntity;
 }

tests/Doctrine/Tests/Models/ValueConversionType/OwningOneToOneCompositeIdEntity.php

@@ -21,5 +21,5 @@ class OwningOneToOneCompositeIdEntity
      *     @JoinColumn(name="associated_id2", referencedColumnName="id2")
      * })
      */
-    public $associatedComposite;
+    public $associatedEntity;
 }

tests/Doctrine/Tests/ORM/Functional/SchemaValidatorTest.php

@@ -2,6 +2,7 @@
 
 namespace Doctrine\Tests\ORM\Functional;
 
+use Doctrine\DBAL\Types\Type as DBALType;
 use Doctrine\ORM\Tools\SchemaValidator;
 
 /**

tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyCompositeIdForeignKeyTest.php

@@ -2,6 +2,7 @@
 
 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 +19,7 @@ class ManyToManyCompositeIdForeignKeyTest extends OrmFunctionalTestCase
 {
     public function setUp()
     {
-        $this->useModelSet('vct');
+        $this->useModelSet('vct_manytomany_compositeid_foreignkey');
 
         parent::setUp();
 
@@ -43,6 +44,16 @@ 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();

tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyCompositeIdTest.php

@@ -2,6 +2,7 @@
 
 namespace Doctrine\Tests\ORM\Functional\ValueConversionType;
 
+use Doctrine\DBAL\Types\Type as DBALType;
 use Doctrine\Tests\Models\ValueConversionType as Entity;
 use Doctrine\Tests\OrmFunctionalTestCase;
 
@@ -17,7 +18,7 @@ class ManyToManyCompositeIdTest extends OrmFunctionalTestCase
 {
     public function setUp()
     {
-        $this->useModelSet('vct');
+        $this->useModelSet('vct_manytomany_compositeid');
 
         parent::setUp();
 
@@ -38,6 +39,15 @@ 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();

tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyExtraLazyTest.php

@@ -2,6 +2,7 @@
 
 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 +19,7 @@ class ManyToManyExtraLazyTest extends OrmFunctionalTestCase
 {
     public function setUp()
     {
-        $this->useModelSet('vct');
+        $this->useModelSet('vct_manytomany_extralazy');
         parent::setUp();
 
         $inversed1 = new Entity\InversedManyToManyExtraLazyEntity();
@@ -52,6 +53,15 @@ 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(

tests/Doctrine/Tests/ORM/Functional/ValueConversionType/ManyToManyTest.php

@@ -2,6 +2,7 @@
 
 namespace Doctrine\Tests\ORM\Functional\ValueConversionType;
 
+use Doctrine\DBAL\Types\Type as DBALType;
 use Doctrine\Tests\Models\ValueConversionType as Entity;
 use Doctrine\Tests\OrmFunctionalTestCase;
 
@@ -17,7 +18,7 @@ class ManyToManyTest extends OrmFunctionalTestCase
 {
     public function setUp()
     {
-        $this->useModelSet('vct');
+        $this->useModelSet('vct_manytomany');
 
         parent::setUp();
 
@@ -37,6 +38,15 @@ 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();

tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyCompositeIdForeignKeyTest.php

@@ -2,6 +2,7 @@
 
 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 +19,7 @@ class OneToManyCompositeIdForeignKeyTest extends OrmFunctionalTestCase
 {
     public function setUp()
     {
-        $this->useModelSet('vct');
+        $this->useModelSet('vct_onetomany_compositeid_foreignkey');
 
         parent::setUp();
 
@@ -44,6 +45,15 @@ 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();

tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyCompositeIdTest.php

@@ -2,6 +2,7 @@
 
 namespace Doctrine\Tests\ORM\Functional\ValueConversionType;
 
+use Doctrine\DBAL\Types\Type as DBALType;
 use Doctrine\Tests\Models\ValueConversionType as Entity;
 use Doctrine\Tests\OrmFunctionalTestCase;
 
@@ -17,7 +18,7 @@ class OneToManyCompositeIdTest extends OrmFunctionalTestCase
 {
     public function setUp()
     {
-        $this->useModelSet('vct');
+        $this->useModelSet('vct_onetomany_compositeid');
 
         parent::setUp();
 
@@ -39,6 +40,14 @@ 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();

tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyExtraLazyTest.php

@@ -2,6 +2,7 @@
 
 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 +19,7 @@ class OneToManyExtraLazyTest extends OrmFunctionalTestCase
 {
     public function setUp()
     {
-        $this->useModelSet('vct');
+        $this->useModelSet('vct_onetomany_extralazy');
 
         parent::setUp();
 
@@ -50,6 +51,14 @@ 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(

tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyTest.php

@@ -2,6 +2,7 @@
 
 namespace Doctrine\Tests\ORM\Functional\ValueConversionType;
 
+use Doctrine\DBAL\Types\Type as DBALType;
 use Doctrine\Tests\Models\ValueConversionType as Entity;
 use Doctrine\Tests\OrmFunctionalTestCase;
 
@@ -17,7 +18,7 @@ class OneToManyTest extends OrmFunctionalTestCase
 {
     public function setUp()
     {
-        $this->useModelSet('vct');
+        $this->useModelSet('vct_onetomany');
 
         parent::setUp();
 
@@ -38,6 +39,14 @@ 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();

tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToOneCompositeIdForeignKeyTest.php

@@ -2,6 +2,7 @@
 
 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 +19,7 @@ class OneToOneCompositeIdForeignKeyTest extends OrmFunctionalTestCase
 {
     public function setUp()
     {
-        $this->useModelSet('vct');
+        $this->useModelSet('vct_onetoone_compositeid_foreignkey');
         parent::setUp();
 
         $auxiliary = new Entity\AuxiliaryEntity();
@@ -43,6 +44,15 @@ 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();

tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToOneCompositeIdTest.php

@@ -2,6 +2,7 @@
 
 namespace Doctrine\Tests\ORM\Functional\ValueConversionType;
 
+use Doctrine\DBAL\Types\Type as DBALType;
 use Doctrine\Tests\Models\ValueConversionType as Entity;
 use Doctrine\Tests\OrmFunctionalTestCase;
 
@@ -17,8 +18,7 @@ class OneToOneCompositeIdTest extends OrmFunctionalTestCase
 {
     public function setUp()
     {
-        $this->useModelSet('vct');
+        $this->useModelSet('vct_onetoone_compositeid');
-
         parent::setUp();
 
         $inversed = new Entity\InversedOneToOneCompositeIdEntity();
@@ -30,7 +30,7 @@ class OneToOneCompositeIdTest extends OrmFunctionalTestCase
         $owning->id3 = 'ghi';
 
         $inversed->associatedEntity = $owning;
-        $owning->associatedComposite = $inversed;
+        $owning->associatedEntity = $inversed;
 
         $this->_em->persist($inversed);
         $this->_em->persist($owning);
@@ -39,6 +39,14 @@ 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();
@@ -100,7 +108,7 @@ class OneToOneCompositeIdTest extends OrmFunctionalTestCase
             'ghi'
         );
 
-        $inversedProxy = $owning->associatedComposite;
+        $inversedProxy = $owning->associatedEntity;
 
         $this->assertEquals('some value to be loaded', $inversedProxy->someProperty);
     }
@@ -115,9 +123,6 @@ class OneToOneCompositeIdTest extends OrmFunctionalTestCase
             array('id1' => 'abc', 'id2' => 'def')
         );
 
-        $this->assertInstanceOf(
+        $this->assertInstanceOf('Doctrine\Tests\Models\ValueConversionType\OwningOneToOneCompositeIdEntity', $inversed->associatedEntity);
-            'Doctrine\Tests\Models\ValueConversionType\OwningOneToOneCompositeIdEntity',
-            $inversed->associatedEntity
-        );
     }
 }

tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToOneTest.php

@@ -2,6 +2,7 @@
 
 namespace Doctrine\Tests\ORM\Functional\ValueConversionType;
 
+use Doctrine\DBAL\Types\Type as DBALType;
 use Doctrine\Tests\Models\ValueConversionType as Entity;
 use Doctrine\Tests\OrmFunctionalTestCase;
 
@@ -17,7 +18,7 @@ class OneToOneTest extends OrmFunctionalTestCase
 {
     public function setUp()
     {
-        $this->useModelSet('vct');
+        $this->useModelSet('vct_onetoone');
 
         parent::setUp();
 
@@ -38,6 +39,14 @@ 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();

tests/Doctrine/Tests/OrmFunctionalTestCase.php

@@ -3,7 +3,6 @@
 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;
@@ -42,7 +41,7 @@ abstract class OrmFunctionalTestCase extends OrmTestCase
     protected $_em;
 
     /**
-     * @var SchemaTool
+     * @var \Doctrine\ORM\Tools\SchemaTool
      */
     protected $_schemaTool;
 
@@ -201,30 +200,52 @@ abstract class OrmFunctionalTestCase extends OrmTestCase
             'Doctrine\Tests\Models\Quote\Phone',
             'Doctrine\Tests\Models\Quote\User'
         ),
-        'vct' => array(
+        'vct_onetoone' => array(
             'Doctrine\Tests\Models\ValueConversionType\InversedOneToOneEntity',
-            'Doctrine\Tests\Models\ValueConversionType\OwningOneToOneEntity',
+            'Doctrine\Tests\Models\ValueConversionType\OwningOneToOneEntity'
+        ),
+        'vct_onetoone_compositeid' => array(
             'Doctrine\Tests\Models\ValueConversionType\InversedOneToOneCompositeIdEntity',
-            'Doctrine\Tests\Models\ValueConversionType\OwningOneToOneCompositeIdEntity',
+            'Doctrine\Tests\Models\ValueConversionType\OwningOneToOneCompositeIdEntity'
+        ),
+        'vct_onetoone_compositeid_foreignkey' => array(
             'Doctrine\Tests\Models\ValueConversionType\AuxiliaryEntity',
             'Doctrine\Tests\Models\ValueConversionType\InversedOneToOneCompositeIdForeignKeyEntity',
-            'Doctrine\Tests\Models\ValueConversionType\OwningOneToOneCompositeIdForeignKeyEntity',
+            'Doctrine\Tests\Models\ValueConversionType\OwningOneToOneCompositeIdForeignKeyEntity'
+        ),
+        'vct_onetomany' => array(
             'Doctrine\Tests\Models\ValueConversionType\InversedOneToManyEntity',
-            'Doctrine\Tests\Models\ValueConversionType\OwningManyToOneEntity',
+            'Doctrine\Tests\Models\ValueConversionType\OwningManyToOneEntity'
+        ),
+        'vct_onetomany_compositeid' => array(
             'Doctrine\Tests\Models\ValueConversionType\InversedOneToManyCompositeIdEntity',
-            'Doctrine\Tests\Models\ValueConversionType\OwningManyToOneCompositeIdEntity',
+            'Doctrine\Tests\Models\ValueConversionType\OwningManyToOneCompositeIdEntity'
+        ),
+        'vct_onetomany_compositeid_foreignkey' => array(
+            'Doctrine\Tests\Models\ValueConversionType\AuxiliaryEntity',
             'Doctrine\Tests\Models\ValueConversionType\InversedOneToManyCompositeIdForeignKeyEntity',
-            'Doctrine\Tests\Models\ValueConversionType\OwningManyToOneCompositeIdForeignKeyEntity',
+            'Doctrine\Tests\Models\ValueConversionType\OwningManyToOneCompositeIdForeignKeyEntity'
+        ),
+        'vct_onetomany_extralazy' => array(
             'Doctrine\Tests\Models\ValueConversionType\InversedOneToManyExtraLazyEntity',
-            'Doctrine\Tests\Models\ValueConversionType\OwningManyToOneExtraLazyEntity',
+            'Doctrine\Tests\Models\ValueConversionType\OwningManyToOneExtraLazyEntity'
+        ),
+        'vct_manytomany' => array(
             'Doctrine\Tests\Models\ValueConversionType\InversedManyToManyEntity',
-            'Doctrine\Tests\Models\ValueConversionType\OwningManyToManyEntity',
+            'Doctrine\Tests\Models\ValueConversionType\OwningManyToManyEntity'
+        ),
+        'vct_manytomany_compositeid' => array(
             'Doctrine\Tests\Models\ValueConversionType\InversedManyToManyCompositeIdEntity',
-            'Doctrine\Tests\Models\ValueConversionType\OwningManyToManyCompositeIdEntity',
+            'Doctrine\Tests\Models\ValueConversionType\OwningManyToManyCompositeIdEntity'
+        ),
+        'vct_manytomany_compositeid_foreignkey' => array(
+            'Doctrine\Tests\Models\ValueConversionType\AuxiliaryEntity',
             'Doctrine\Tests\Models\ValueConversionType\InversedManyToManyCompositeIdForeignKeyEntity',
-            'Doctrine\Tests\Models\ValueConversionType\OwningManyToManyCompositeIdForeignKeyEntity',
+            'Doctrine\Tests\Models\ValueConversionType\OwningManyToManyCompositeIdForeignKeyEntity'
+        ),
+        'vct_manytomany_extralazy' => array(
             'Doctrine\Tests\Models\ValueConversionType\InversedManyToManyExtraLazyEntity',
-            'Doctrine\Tests\Models\ValueConversionType\OwningManyToManyExtraLazyEntity',
+            'Doctrine\Tests\Models\ValueConversionType\OwningManyToManyExtraLazyEntity'
         ),
     );
 
@@ -385,33 +406,63 @@ abstract class OrmFunctionalTestCase extends OrmTestCase
             $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier("quote-user"));
         }
 
-        if (isset($this->_usedModelSets['vct'])) {
+        if (isset($this->_usedModelSets['vct_onetoone'])) {
             $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');
@@ -456,8 +507,14 @@ 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'])) {
@@ -470,7 +527,7 @@ abstract class OrmFunctionalTestCase extends OrmTestCase
 
         if ( ! $this->_em) {
             $this->_em = $this->_getEntityManager();
-            $this->_schemaTool = new SchemaTool($this->_em);
+            $this->_schemaTool = new \Doctrine\ORM\Tools\SchemaTool($this->_em);
         }
 
         $classes = array();