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

Refactor DB config & Tenant DB managers

Browse source
This commit is contained in:
Samuel Štancl 2020-05-12 03:32:28 +02:00
parent 3c4d2189dc
commit 64383b4c56
8 changed files with 51 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/TenantDatabaseManagers/MySQLDatabaseManager.php
View file

@ -54,4 +54,11 @@ class MySQLDatabaseManager implements TenantDatabaseManager, CanSetConnection
{
return (bool) $this->database()->select("SELECT SCHEMA_NAME FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = '$name'");
}
public function makeConnectionConfig(array $baseConfig, string $databaseName): array
{
$baseConfig['database'] = $databaseName;
return $baseConfig;
}
}

7
src/TenantDatabaseManagers/PermissionControlledMySQLDatabaseManager.php
View file

@ -59,4 +59,11 @@ class PermissionControlledMySQLDatabaseManager extends MySQLDatabaseManager impl
{
return (bool) $this->database()->select("SELECT count(*) FROM mysql.user WHERE user = '$username'")[0]->{'count(*)'};
}
public function makeConnectionConfig(array $baseConfig, string $databaseName): array
{
$baseConfig['database'] = $databaseName;
return $baseConfig;
}
}

13
src/TenantDatabaseManagers/PostgreSQLDatabaseManager.php
View file

@ -9,7 +9,7 @@ use Illuminate\Database\Connection;
use Illuminate\Support\Facades\DB;
use Stancl\Tenancy\Contracts\Future\CanSetConnection;
use Stancl\Tenancy\Contracts\TenantDatabaseManager;
use Stancl\Tenancy\Tenant;
use Stancl\Tenancy\Contracts\TenantWithDatabase;
class PostgreSQLDatabaseManager implements TenantDatabaseManager, CanSetConnection
{
@ -36,12 +36,12 @@ class PostgreSQLDatabaseManager implements TenantDatabaseManager, CanSetConnecti
$this->connection = $connection;
}
public function createDatabase(Tenant $tenant): bool
public function createDatabase(TenantWithDatabase $tenant): bool
{
return $this->database()->statement("CREATE DATABASE \"{$tenant->database()->getName()}\" WITH TEMPLATE=template0");
}
public function deleteDatabase(Tenant $tenant): bool
public function deleteDatabase(TenantWithDatabase $tenant): bool
{
return $this->database()->statement("DROP DATABASE \"{$tenant->database()->getName()}\"");
}
@ -50,4 +50,11 @@ class PostgreSQLDatabaseManager implements TenantDatabaseManager, CanSetConnecti
{
return (bool) $this->database()->select("SELECT datname FROM pg_database WHERE datname = '$name'");
}
public function makeConnectionConfig(array $baseConfig, string $databaseName): array
{
$baseConfig['database'] = $databaseName;
return $baseConfig;
}
}

13
src/TenantDatabaseManagers/PostgreSQLSchemaManager.php
View file

@ -9,7 +9,7 @@ use Illuminate\Database\Connection;
use Illuminate\Support\Facades\DB;
use Stancl\Tenancy\Contracts\Future\CanSetConnection;
use Stancl\Tenancy\Contracts\TenantDatabaseManager;
use Stancl\Tenancy\Tenant;
use Stancl\Tenancy\Contracts\TenantWithDatabase;
class PostgreSQLSchemaManager implements TenantDatabaseManager, CanSetConnection
{
@ -36,12 +36,12 @@ class PostgreSQLSchemaManager implements TenantDatabaseManager, CanSetConnection
$this->connection = $connection;
}
public function createDatabase(Tenant $tenant): bool
public function createDatabase(TenantWithDatabase $tenant): bool
{
return $this->database()->statement("CREATE SCHEMA \"{$tenant->database()->getName()}\"");
}
public function deleteDatabase(Tenant $tenant): bool
public function deleteDatabase(TenantWithDatabase $tenant): bool
{
return $this->database()->statement("DROP SCHEMA \"{$tenant->database()->getName()}\"");
}
@ -50,4 +50,11 @@ class PostgreSQLSchemaManager implements TenantDatabaseManager, CanSetConnection
{
return (bool) $this->database()->select("SELECT schema_name FROM information_schema.schemata WHERE schema_name = '$name'");
}
public function makeConnectionConfig(array $baseConfig, string $databaseName): array
{
$baseConfig['schema'] = $databaseName;
return $baseConfig;
}
}

9
src/TenantDatabaseManagers/SQLiteDatabaseManager.php
View file

@ -4,11 +4,10 @@ declare(strict_types=1);
namespace Stancl\Tenancy\TenantDatabaseManagers;
use Stancl\Tenancy\Contracts\ModifiesDatabaseNameForConnection;
use Stancl\Tenancy\Contracts\TenantDatabaseManager;
use Stancl\Tenancy\Contracts\TenantWithDatabase;
class SQLiteDatabaseManager implements TenantDatabaseManager, ModifiesDatabaseNameForConnection
class SQLiteDatabaseManager implements TenantDatabaseManager
{
public function getSeparator(): string
{
@ -38,8 +37,10 @@ class SQLiteDatabaseManager implements TenantDatabaseManager, ModifiesDatabaseNa
return file_exists(database_path($name));
}
public function getDatabaseNameForConnection(string $original): string
public function makeConnectionConfig(array $baseConfig, string $databaseName): array
{
return database_path($original);
$baseConfig['database'] = database_path($databaseName);;
return $baseConfig;
}
}