[2.2.4] [WIP] Respect custom connections when creating database

src/Contracts/Future/CanSetConnection.php

@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Stancl\Tenancy\Contracts\Future;
+
+use Illuminate\Database\Connection;
+
+/**
+ * This interface *might* be part of the TenantDatabaseManager interface in 3.x.
+ */
+interface CanSetConnection
+{
+    public function setConnection(Connection $connection);
+}

src/DatabaseManager.php

@@ -8,6 +8,7 @@
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Database\DatabaseManager as BaseDatabaseManager;
 use Illuminate\Foundation\Application;
+use Stancl\Tenancy\Contracts\Future\CanSetConnection;
 use Stancl\Tenancy\Contracts\TenantDatabaseManager;
 use Stancl\Tenancy\Exceptions\DatabaseManagerNotRegisteredException;
 use Stancl\Tenancy\Exceptions\TenantDatabaseAlreadyExistsException;
@@ -226,14 +227,20 @@ public function deleteDatabase(Tenant $tenant)
      */
     public function getTenantDatabaseManager(Tenant $tenant): TenantDatabaseManager
     {
-        $driver = $this->getDriver($this->getBaseConnection($tenant->getConnectionName()));
+        $driver = $this->getDriver($this->getBaseConnection($connectionName = $tenant->getConnectionName()));
 
         $databaseManagers = $this->app['config']['tenancy.database_managers'];
 
         if (! array_key_exists($driver, $databaseManagers)) {
             throw new DatabaseManagerNotRegisteredException($driver);
         }
 
-        return $this->app[$databaseManagers[$driver]];
+        $databaseManager = $this->app[$databaseManagers[$driver]];
+
+        if ($connectionName !== 'tenant' && $databaseManager instanceof CanSetConnection) {
+            $databaseManager->setConnection($this->database->connection($connectionName));
+        }
+
+        return $databaseManager;
     }
 }

src/TenantDatabaseManagers/MySQLDatabaseManager.php

@@ -5,19 +5,26 @@
 namespace Stancl\Tenancy\TenantDatabaseManagers;
 
 use Illuminate\Contracts\Config\Repository;
+use Illuminate\Database\Connection;
 use Illuminate\Database\DatabaseManager as IlluminateDatabaseManager;
+use Stancl\Tenancy\Contracts\Future\CanSetConnection;
 use Stancl\Tenancy\Contracts\TenantDatabaseManager;
 
-class MySQLDatabaseManager implements TenantDatabaseManager
+class MySQLDatabaseManager implements TenantDatabaseManager, CanSetConnection
 {
-    /** @var \Illuminate\Database\Connection */
+    /** @var Connection */
     protected $database;
 
     public function __construct(Repository $config, IlluminateDatabaseManager $databaseManager)
     {
         $this->database = $databaseManager->connection($config['tenancy.database_manager_connections.mysql']);
     }
 
+    public function setConnection(Connection $connection)
+    {
+        $this->database = $connection;
+    }
+
     public function createDatabase(string $name): bool
     {
         $charset = $this->database->getConfig('charset');

src/TenantDatabaseManagers/PostgreSQLDatabaseManager.php

@@ -5,19 +5,25 @@
 namespace Stancl\Tenancy\TenantDatabaseManagers;
 
 use Illuminate\Contracts\Config\Repository;
+use Illuminate\Database\Connection;
 use Illuminate\Database\DatabaseManager as IlluminateDatabaseManager;
 use Stancl\Tenancy\Contracts\TenantDatabaseManager;
 
 class PostgreSQLDatabaseManager implements TenantDatabaseManager
 {
-    /** @var \Illuminate\Database\Connection */
+    /** @var Connection */
     protected $database;
 
     public function __construct(Repository $config, IlluminateDatabaseManager $databaseManager)
     {
         $this->database = $databaseManager->connection($config['tenancy.database_manager_connections.pgsql']);
     }
 
+    public function setConnection(Connection $connection)
+    {
+        $this->database = $connection;
+    }
+
     public function createDatabase(string $name): bool
     {
         return $this->database->statement("CREATE DATABASE \"$name\" WITH TEMPLATE=template0");