PHPLIB-65: Database drop methods

Author: jmikola

src/Client.php

@@ -2,8 +2,7 @@
 
 namespace MongoDB;
 
-use MongoDB\Collection;
-use MongoDB\Database;
+use MongoDB\Driver\Command;
 use MongoDB\Driver\Manager;
 use MongoDB\Driver\ReadPreference;
 use MongoDB\Driver\Result;
@@ -35,12 +34,17 @@ public function __construct($uri, array $options = array(), array $driverOptions
     /**
      * Drop a database.
      *
+     * @see http://docs.mongodb.org/manual/reference/command/dropDatabase/
      * @param string $databaseName
      * @return Result
      */
     public function dropDatabase($databaseName)
     {
-        // TODO
+        $databaseName = (string) $databaseName;
+        $command = new Command(array('dropDatabase' => 1));
+        $readPreference = new ReadPreference(ReadPreference::RP_PRIMARY);
+
+        return $this->manager->executeCommand($databaseName, $command, $readPreference);
     }
 
     /**

src/Database.php

@@ -3,6 +3,7 @@
 namespace MongoDB;
 
 use MongoDB\Collection;
+use MongoDB\Driver\Command;
 use MongoDB\Driver\Manager;
 use MongoDB\Driver\ReadPreference;
 use MongoDB\Driver\Result;
@@ -51,11 +52,15 @@ public function createCollection($collectionName, array $options = array())
     /**
      * Drop this database.
      *
+     * @see http://docs.mongodb.org/manual/reference/command/dropDatabase/
      * @return Result
      */
     public function drop()
     {
-        // TODO
+        $command = new Command(array('dropDatabase' => 1));
+        $readPreference = new ReadPreference(ReadPreference::RP_PRIMARY);
+
+        return $this->manager->executeCommand($this->databaseName, $command, $readPreference);
     }
 
     /**

tests/ClientFunctionalTest.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace MongoDB\Tests;
+
+use MongoDB\Client;
+
+/**
+ * Functional tests for the Client class.
+ */
+class ClientFunctionalTest extends FunctionalTestCase
+{
+    public function testDropDatabase()
+    {
+        $writeResult = $this->manager->executeInsert($this->getNamespace(), array('x' => 1));
+        $this->assertEquals(1, $writeResult->getInsertedCount());
+
+        $client = new Client($this->getUri());
+        $commandResult = $client->dropDatabase($this->getDatabaseName());
+        $this->assertCommandSucceeded($commandResult);
+        $this->assertCollectionCount($this->getNamespace(), 0);
+    }
+}

tests/DatabaseFunctionalTest.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace MongoDB\Tests;
+
+use MongoDB\Client;
+use MongoDB\Database;
+
+/**
+ * Functional tests for the Database class.
+ */
+class DatabaseFunctionalTest extends FunctionalTestCase
+{
+    public function testDrop()
+    {
+        $writeResult = $this->manager->executeInsert($this->getNamespace(), array('x' => 1));
+        $this->assertEquals(1, $writeResult->getInsertedCount());
+
+        $database = new Database($this->manager, $this->getDatabaseName());
+        $commandResult = $database->drop();
+        $this->assertCommandSucceeded($commandResult);
+        $this->assertCollectionCount($this->getNamespace(), 0);
+    }
+}

tests/FunctionalTestCase.php

@@ -2,7 +2,9 @@
 
 namespace MongoDB\Tests;
 
+use MongoDB\Driver\Command;
 use MongoDB\Driver\Manager;
+use MongoDB\Driver\Result;
 
 abstract class FunctionalTestCase extends TestCase
 {
@@ -12,4 +14,22 @@ public function setUp()
     {
         $this->manager = new Manager($this->getUri());
     }
+
+    public function assertCollectionCount($namespace, $count)
+    {
+        list($databaseName, $collectionName) = explode('.', $namespace, 2);
+
+        $result = $this->manager->executeCommand($databaseName, new Command(array('count' => $collectionName)));
+
+        $document = $result->toArray();
+        $this->assertArrayHasKey('n', $document);
+        $this->assertEquals($count, $document['n']);
+    }
+
+    public function assertCommandSucceeded(Result $result)
+    {
+        $document = $result->toArray();
+        $this->assertArrayHasKey('ok', $document);
+        $this->assertEquals(1, $document['ok']);
+    }
 }