Merge pull request #1266 from Ocramius/hotfix/fix-schema-generation-i…

…n-tests-on-pgsql [2.4] Fix schema generation in the test suite
doctrine · Jan 22, 2015 · ec84953 · ec84953
2 parents ee9aebf + 56c5cb4
commit ec84953
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/PostgreSqlSchemaToolTest.php b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/PostgreSqlSchemaToolTest.php
@@ -9,8 +9,10 @@
 
 class PostgreSqlSchemaToolTest extends \Doctrine\Tests\OrmFunctionalTestCase
 {
-    protected function setUp() {
+    protected function setUp()
+    {
         parent::setUp();
+
         if ($this->_em->getConnection()->getDatabasePlatform()->getName() !== 'postgresql') {
             $this->markTestSkipped('The ' . __CLASS__ .' requires the use of postgresql.');
         }
@@ -19,6 +21,7 @@ protected function setUp() {
     public function testPostgresMetadataSequenceIncrementedBy10()
     {
         $address = $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress');
+
         $this->assertEquals(1, $address->sequenceGeneratorDefinition['allocationSize']);
     }
 
@@ -97,7 +100,9 @@ public function testGetDropSchemaSql()
         $sql = $tool->getDropSchemaSQL($classes);
 
         $this->assertEquals(14, count($sql));
+
         $dropSequenceSQLs = 0;
+
         foreach ($sql AS $stmt) {
             if (strpos($stmt, "DROP SEQUENCE") === 0) {
                 $dropSequenceSQLs++;
@@ -115,10 +120,6 @@ public function testUpdateSchemaWithPostgreSQLSchema()
             $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1657Screen'),
             $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1657Avatar'),
         );
-        try {
-            $this->_em->getConnection()->exec("CREATE SCHEMA stonewood");
-        } catch(\Exception $e) {
-        }
 
         $tool = new SchemaTool($this->_em);
         $tool->createSchema($classes);

diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1360Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1360Test.php
@@ -20,6 +20,7 @@ public function testSchemaDoubleQuotedCreate()
         ));
 
         $this->assertEquals(array(
+            'CREATE SCHEMA user',
             'CREATE TABLE "user"."user" (id INT NOT NULL, PRIMARY KEY(id))',
             'CREATE SEQUENCE "user"."user_id_seq" INCREMENT BY 1 MINVALUE 1 START 1',
         ), $sql);