Fix signatures

Author: GromNaN

composer.json

@@ -30,7 +30,7 @@
         "illuminate/database": "^10.30|^11|^12",
         "illuminate/events": "^10.0|^11|^12",
         "illuminate/support": "^10.0|^11|^12",
-        "mongodb/mongodb": "^1.18",
+        "mongodb/mongodb": "^1.21",
         "symfony/http-foundation": "^6.4|^7"
     },
     "require-dev": {

src/Connection.php

@@ -114,13 +114,31 @@ public function getSchemaBuilder()
     /**
      * Get the MongoDB database object.
      *
+     * @deprecated Use getDatabase() instead
+     *
      * @return Database
      */
     public function getMongoDB()
     {
         return $this->db;
     }
 
+    /**
+     * Get the MongoDB database object
+     *
+     * @param string|null $name Name of the database, or null to get the default one
+     *
+     * @return Database
+     */
+    public function getDatabase(?string $name = null): Database
+    {
+        if ($name === null) {
+            return $this->db;
+        }
+
+        return $this->connection->{$name};
+    }
+
     /**
      * return MongoDB object.
      *

src/Schema/Blueprint.php

@@ -19,18 +19,16 @@
 class Blueprint extends SchemaBlueprint
 {
     /**
-     * The MongoConnection object for this blueprint.
-     *
-     * @var Connection
+     * The MongoDB connection object for this blueprint.
      */
-    protected $connection;
+    protected Connection $connection;
 
     /**
-     * The Collection object for this blueprint.
+     * The MongoDB collection object for this blueprint.
      *
      * @var Collection
      */
-    protected $collection;
+    protected Collection $collection;
 
     /**
      * Fluent columns.
@@ -44,7 +42,7 @@ class Blueprint extends SchemaBlueprint
      */
     public function __construct(Connection $connection, string $collection)
     {
-        parent::__construct($collection);
+        parent::__construct($connection, $collection);
 
         $this->connection = $connection;
 

src/Schema/Builder.php

@@ -7,6 +7,7 @@
 use Closure;
 use MongoDB\Collection;
 use MongoDB\Driver\Exception\ServerException;
+use MongoDB\Laravel\Connection;
 use MongoDB\Model\CollectionInfo;
 use MongoDB\Model\IndexInfo;
 
@@ -16,18 +17,22 @@
 use function array_keys;
 use function array_map;
 use function array_merge;
+use function array_values;
 use function assert;
 use function count;
 use function current;
 use function implode;
 use function in_array;
+use function is_array;
+use function is_string;
 use function iterator_to_array;
 use function sort;
 use function sprintf;
 use function str_ends_with;
 use function substr;
 use function usort;
 
+/** @property Connection $connection */
 class Builder extends \Illuminate\Database\Schema\Builder
 {
     /**
@@ -137,9 +142,10 @@ public function dropAllTables()
         }
     }
 
-    public function getTables()
+    /** @param string|null $schema Database name */
+    public function getTables($schema = null)
     {
-        $db = $this->connection->getMongoDB();
+        $db = $this->connection->getDatabase($schema);
         $collections = [];
 
         foreach ($db->listCollectionNames() as $collectionName) {
@@ -165,9 +171,23 @@ public function getTables()
         return $collections;
     }
 
-    public function getTableListing()
+    public function getTableListing($schema = null, $schemaQualified = true)
     {
-        $collections = iterator_to_array($this->connection->getMongoDB()->listCollectionNames());
+        $collections = [];
+
+        if ($schema === null || is_string($schema)) {
+            $collections[$schema ?? ''] = iterator_to_array($this->connection->getDatabase($schema)->listCollectionNames());
+        } elseif (is_array($schema)) {
+            foreach ($schema as $db) {
+                $collections[$db] = iterator_to_array($this->connection->getDatabase($db)->listCollectionNames());
+            }
+        }
+
+        if ($schema && $schemaQualified) {
+            $collections = array_map(fn ($db, $collections) => array_map(static fn ($collection) => $db . '.' . $collection, $collections), array_keys($collections), $collections);
+        }
+
+        $collections = array_merge(...array_values($collections));
 
         sort($collections);
 

tests/Query/BuilderTest.php

@@ -1605,7 +1605,7 @@ private static function getBuilder(): Builder
         $connection = m::mock(Connection::class);
         $processor  = m::mock(Processor::class);
         $connection->shouldReceive('getSession')->andReturn(null);
-        $connection->shouldReceive('getQueryGrammar')->andReturn(new Grammar());
+        $connection->shouldReceive('getQueryGrammar')->andReturn(new Grammar($connection));
 
         return new Builder($connection, null, $processor);
     }