Merge db46ba6 into 3be404d

doctrine · Nov 4, 2016 · 95dee2d · 95dee2d
2 parents 3be404d + db46ba6
commit 95dee2d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 26 deletions.
diff --git a/lib/Doctrine/ODM/MongoDB/SchemaManager.php b/lib/Doctrine/ODM/MongoDB/SchemaManager.php
@@ -403,30 +403,25 @@ public function dropDocumentDatabase($documentName)
 
     /**
      * Create all the mapped document databases in the metadata factory.
+     *
+     * @deprecated document databases must not be created, databases are created automatically
      */
     public function createDatabases()
     {
-        foreach ($this->metadataFactory->getAllMetadata() as $class) {
-            if ($class->isMappedSuperclass || $class->isEmbeddedDocument) {
-                continue;
-            }
-            $this->createDocumentDatabase($class->name);
-        }
+        return;
     }
 
     /**
      * Create the document database for a mapped class.
      *
      * @param string $documentName
      * @throws \InvalidArgumentException
+     *
+     * @deprecated document databases must not be created, databases are created automatically
      */
     public function createDocumentDatabase($documentName)
     {
-        $class = $this->dm->getClassMetadata($documentName);
-        if ($class->isMappedSuperclass || $class->isEmbeddedDocument) {
-            throw new \InvalidArgumentException('Cannot delete document indexes for mapped super classes or embedded documents.');
-        }
-        $this->dm->getDocumentDatabase($documentName)->execute('function() { return true; }');
+        return;
     }
 
     /**

diff --git a/lib/Doctrine/ODM/MongoDB/Tools/Console/Command/Schema/CreateCommand.php b/lib/Doctrine/ODM/MongoDB/Tools/Console/Command/Schema/CreateCommand.php
@@ -96,12 +96,12 @@ protected function processCollection(SchemaManager $sm)
 
     protected function processDocumentDb(SchemaManager $sm, $document)
     {
-        $sm->createDocumentDatabase($document);
+        return;
     }
 
     protected function processDb(SchemaManager $sm)
     {
-        $sm->createDatabases();
+        return;
     }
 
     protected function processDocumentIndex(SchemaManager $sm, $document)

diff --git a/tests/Doctrine/ODM/MongoDB/Tests/SchemaManagerTest.php b/tests/Doctrine/ODM/MongoDB/Tests/SchemaManagerTest.php
@@ -253,19 +253,6 @@ public function testDropDocumentCollection()
         $this->schemaManager->dropDocumentCollection(\Documents\CmsArticle::class);
     }
 
-    public function testCreateDocumentDatabase()
-    {
-        foreach ($this->documentDatabases as $class => $database) {
-            if ($class === \Documents\CmsArticle::class) {
-                $database->expects($this->once())->method('execute');
-            } else {
-                $database->expects($this->never())->method('execute');
-            }
-        }
-
-        $this->schemaManager->createDocumentDatabase(\Documents\CmsArticle::class);
-    }
-
     public function testDropDocumentDatabase()
     {
         foreach ($this->documentDatabases as $class => $database) {