Merge pull request #376 from flip111/patch-3

Update CreateSchemaSqlCollector.php setting default namespace/schema nam...

lib/Doctrine/DBAL/Platforms/AbstractPlatform.php

@@ -2751,6 +2751,18 @@ abstract class AbstractPlatform
         return false;
     }
 
+    /**
+     * Returns the default schema name.
+     *
+     * @return string
+     *
+     * @throws \Doctrine\DBAL\DBALException If not supported on this platform.
+     */
+    public function getDefaultSchemaName()
+    {
+        throw DBALException::notSupported(__METHOD__);
+    }
+
     /**
      * Whether this platform supports create database.
      *

lib/Doctrine/DBAL/Platforms/PostgreSqlPlatform.php

@@ -164,6 +164,14 @@ class PostgreSqlPlatform extends AbstractPlatform
         return true;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function getDefaultSchemaName()
+    {
+        return 'public';
+    }
+
     /**
      * {@inheritDoc}
      */

lib/Doctrine/DBAL/Platforms/SQLServerPlatform.php

@@ -131,6 +131,14 @@ class SQLServerPlatform extends AbstractPlatform
         return true;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function getDefaultSchemaName()
+    {
+        return 'dbo';
+    }
+
     /**
      * {@inheritDoc}
      */

lib/Doctrine/DBAL/Schema/Visitor/CreateSchemaSqlCollector.php

@@ -105,7 +105,11 @@ class CreateSchemaSqlCollector extends AbstractVisitor
      */
     private function getNamespace($asset)
     {
-        $namespace = $asset->getNamespaceName() ?: 'default';
+        $namespace = $asset->getNamespaceName();
+
+        if ( !isset($namespace)) {
+            $namespace = $this->platform->supportsSchemas() ? $this->platform->getDefaultSchemaName() : 'default';
+        }
 
         if ( !isset($this->createTableQueries[$namespace])) {
             $this->createTableQueries[$namespace] = array();

tests/Doctrine/Tests/DBAL/Schema/Visitor/CreateSchemaSqlCollectorTest.php

@@ -13,7 +13,7 @@ class CreateSchemaSqlCollectorTest extends \PHPUnit_Framework_TestCase
             array('supportsSchemas', 'schemaNeedsCreation', 'getCreateTableSQL')
         );
 
-        $platformMock->expects($this->exactly(1))
+        $platformMock->expects($this->any())
                      ->method('supportsSchemas')
                      ->will($this->returnValue(true));
 
@@ -32,6 +32,6 @@ class CreateSchemaSqlCollectorTest extends \PHPUnit_Framework_TestCase
         $sqlCollector = new CreateSchemaSqlCollector($platformMock);
         $sqlCollector->acceptTable($tableMock);
         $sql = $sqlCollector->getQueries();
-        $this->assertEquals('CREATE SCHEMA default', $sql[0]);
+        $this->assertEquals('CREATE SCHEMA public', $sql[0]);
     }
 }