From aa74b9081999bb08739145753127729b13538c2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20=C5=A0tancl?= Date: Thu, 30 Apr 2020 20:58:12 +0200 Subject: [PATCH] Pass correct argument to queued DB creators/deleters --- src/DatabaseManager.php | 4 ++-- tests/DatabaseManagerTest.php | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/DatabaseManager.php b/src/DatabaseManager.php index ab3672b7..af5919fe 100644 --- a/src/DatabaseManager.php +++ b/src/DatabaseManager.php @@ -147,7 +147,7 @@ class DatabaseManager } } - QueuedTenantDatabaseCreator::withChain($chain)->dispatch($tenant->database()->manager(), $tenant->database()); + QueuedTenantDatabaseCreator::withChain($chain)->dispatch($tenant->database()->manager(), $tenant); } protected function createDatabaseSynchronously(Tenant $tenant, array $afterCreating) @@ -181,7 +181,7 @@ class DatabaseManager $this->tenancy->event('database.deleting', $database, $tenant); if ($this->app['config']['tenancy.queue_database_deletion'] ?? false) { - QueuedTenantDatabaseDeleter::dispatch($manager, $database); + QueuedTenantDatabaseDeleter::dispatch($manager, $tenant); } else { $manager->deleteDatabase($database); if ($manager instanceof ManagesDatabaseUsers) { diff --git a/tests/DatabaseManagerTest.php b/tests/DatabaseManagerTest.php index 9bf91cb3..9bd7113b 100644 --- a/tests/DatabaseManagerTest.php +++ b/tests/DatabaseManagerTest.php @@ -62,4 +62,10 @@ class DatabaseManagerTest extends TestCase tenancy()->all()->each->delete(); } + + /** @test */ + public function extra_config_is_merged_into_the_connection_config_array() + { + + } }