archtechx/tenancy
1
0
Fork 0
mirror of https://github.com/archtechx/tenancy.git synced 2025-12-12 18:24:04 +00:00
Code Activity

Get rid of tenant DB manager connection config

Browse source
This commit is contained in:
Samuel Štancl 2020-05-21 14:47:29 +02:00
parent 2fedd5ce88
commit 15a7e52208
11 changed files with 58 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

5
tests/DatabasePreparationTest.php
View file

@ -29,7 +29,10 @@ class DatabasePreparationTest extends TestCase
$tenant = Tenant::create();
$this->assertTrue(app(MySQLDatabaseManager::class)->databaseExists($tenant->database()->getName()));
$manager = app(MySQLDatabaseManager::class);
$manager->setConnection('mysql');
$this->assertTrue($manager->databaseExists($tenant->database()->getName()));
}
/** @test */

4
tests/ResourceSyncingTest.php
View file

@ -22,7 +22,7 @@ use Stancl\Tenancy\Events\SyncedResourceSaved;
use Stancl\Tenancy\Events\TenancyEnded;
use Stancl\Tenancy\Events\TenancyInitialized;
use Stancl\Tenancy\Events\TenantCreated;
use Stancl\Tenancy\Exceptions\ModelNotSyncMaster;
use Stancl\Tenancy\Exceptions\ModelNotSyncMasterException;
use Stancl\Tenancy\Jobs\CreateDatabase;
use Stancl\Tenancy\Bootstrappers\DatabaseTenancyBootstrapper;
use Stancl\Tenancy\Tests\Etc\Tenant;
@ -187,7 +187,7 @@ class ResourceSyncingTest extends TestCase
tenancy()->end();
$this->assertFalse(tenancy()->initialized);
$this->expectException(ModelNotSyncMaster::class);
$this->expectException(ModelNotSyncMasterException::class);
ResourceUser::first()->update(['role' => 'foobar']);
}

25
tests/TenantDatabaseManagerTest.php
View file

@ -43,16 +43,19 @@ class TenantDatabaseManagerTest extends TestCase
$name = 'db' . $this->randomString();
$this->assertFalse(app($databaseManager)->databaseExists($name));
$manager = app($databaseManager);
$manager->setConnection($driver);
$this->assertFalse($manager->databaseExists($name));
$tenant = Tenant::create([
'tenancy_db_name' => $name,
'tenancy_db_connection' => $driver,
]);
$this->assertTrue(app($databaseManager)->databaseExists($name));
app($databaseManager)->deleteDatabase($tenant);
$this->assertFalse(app($databaseManager)->databaseExists($name));
$this->assertTrue($manager->databaseExists($name));
$manager->deleteDatabase($tenant);
$this->assertFalse($manager->databaseExists($name));
}
/** @test */
@ -68,23 +71,29 @@ class TenantDatabaseManagerTest extends TestCase
$database = 'db' . $this->randomString();
$this->assertFalse(app(MySQLDatabaseManager::class)->databaseExists($database));
$mysqlmanager = app(MySQLDatabaseManager::class);
$mysqlmanager->setConnection('mysql');
$this->assertFalse($mysqlmanager->databaseExists($database));
Tenant::create([
'tenancy_db_name' => $database,
'tenancy_db_connection' => 'mysql',
]);
$this->assertTrue(app(MySQLDatabaseManager::class)->databaseExists($database));
$this->assertTrue($mysqlmanager->databaseExists($database));
$postgresManager = app(PostgreSQLDatabaseManager::class);
$postgresManager->setConnection('pgsql');
$database = 'db' . $this->randomString();
$this->assertFalse(app(PostgreSQLDatabaseManager::class)->databaseExists($database));
$this->assertFalse($postgresManager->databaseExists($database));
Tenant::create([
'tenancy_db_name' => $database,
'tenancy_db_connection' => 'pgsql',
]);
$this->assertTrue(app(PostgreSQLDatabaseManager::class)->databaseExists($database));
$this->assertTrue($postgresManager->databaseExists($database));
}
public function database_manager_provider()