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

Fix PDO serialization exception (#289)

Browse source 
* Fix PDO serialization exception when queueing tenant creation

* Apply fixes from StyleCI

* Fix $this->database() calls
This commit is contained in:
Samuel Štancl 2020-02-10 16:04:40 +01:00 • committed by GitHub
parent 01f080450d
commit 95ee295da1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 36 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Contracts/Future/CanSetConnection.php
View file

@ -4,12 +4,10 @@ declare(strict_types=1);
namespace Stancl\Tenancy\Contracts\Future; namespace Stancl\Tenancy\Contracts\Future;
use Illuminate\Database\Connection;
/** /**
* This interface *might* be part of the TenantDatabaseManager interface in 3.x. * This interface *might* be part of the TenantDatabaseManager interface in 3.x.
*/ */
interface CanSetConnection interface CanSetConnection
{ {
public function setConnection(Connection $connection); public function setConnection(string $connection): void;
} }

2
src/DatabaseManager.php
View file

@ -238,7 +238,7 @@ class DatabaseManager
$databaseManager = $this->app[$databaseManagers[$driver]]; $databaseManager = $this->app[$databaseManagers[$driver]];
if ($connectionName !== 'tenant' && $databaseManager instanceof CanSetConnection) { if ($connectionName !== 'tenant' && $databaseManager instanceof CanSetConnection) {
$databaseManager->setConnection($this->database->connection($connectionName)); $databaseManager->setConnection($connectionName);
} }
return $databaseManager; return $databaseManager;

29
src/TenantDatabaseManagers/MySQLDatabaseManager.php
View file

@ -6,40 +6,45 @@ namespace Stancl\Tenancy\TenantDatabaseManagers;
use Illuminate\Contracts\Config\Repository; use Illuminate\Contracts\Config\Repository;
use Illuminate\Database\Connection; use Illuminate\Database\Connection;
use Illuminate\Database\DatabaseManager as IlluminateDatabaseManager; use Illuminate\Support\Facades\DB;
use Stancl\Tenancy\Contracts\Future\CanSetConnection; use Stancl\Tenancy\Contracts\Future\CanSetConnection;
use Stancl\Tenancy\Contracts\TenantDatabaseManager; use Stancl\Tenancy\Contracts\TenantDatabaseManager;
class MySQLDatabaseManager implements TenantDatabaseManager, CanSetConnection class MySQLDatabaseManager implements TenantDatabaseManager, CanSetConnection
{ {
/** @var Connection */ /** @var string */
protected $database; protected $connection;
public function __construct(Repository $config, IlluminateDatabaseManager $databaseManager) public function __construct(Repository $config)
{ {
$this->database = $databaseManager->connection($config['tenancy.database_manager_connections.mysql']); $this->connection = $config->get('tenancy.database_manager_connections.mysql');
} }
public function setConnection(Connection $connection) protected function database(): Connection
{ {
$this->database = $connection; return DB::connection($this->connection);
}
public function setConnection(string $connection): void
{
$this->connection = $connection;
} }
public function createDatabase(string $name): bool public function createDatabase(string $name): bool
{ {
$charset = $this->database->getConfig('charset'); $charset = $this->database()->getConfig('charset');
$collation = $this->database->getConfig('collation'); $collation = $this->database()->getConfig('collation');
return $this->database->statement("CREATE DATABASE `$name` CHARACTER SET `$charset` COLLATE `$collation`"); return $this->database()->statement("CREATE DATABASE `$name` CHARACTER SET `$charset` COLLATE `$collation`");
} }
public function deleteDatabase(string $name): bool public function deleteDatabase(string $name): bool
{ {
return $this->database->statement("DROP DATABASE `$name`"); return $this->database()->statement("DROP DATABASE `$name`");
} }
public function databaseExists(string $name): bool public function databaseExists(string $name): bool
{ {
return (bool) $this->database->select("SELECT SCHEMA_NAME FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = '$name'"); return (bool) $this->database()->select("SELECT SCHEMA_NAME FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = '$name'");
} }
} }

28
src/TenantDatabaseManagers/PostgreSQLDatabaseManager.php
View file

@ -6,36 +6,42 @@ namespace Stancl\Tenancy\TenantDatabaseManagers;
use Illuminate\Contracts\Config\Repository; use Illuminate\Contracts\Config\Repository;
use Illuminate\Database\Connection; use Illuminate\Database\Connection;
use Illuminate\Database\DatabaseManager as IlluminateDatabaseManager; use Illuminate\Support\Facades\DB;
use Stancl\Tenancy\Contracts\Future\CanSetConnection;
use Stancl\Tenancy\Contracts\TenantDatabaseManager; use Stancl\Tenancy\Contracts\TenantDatabaseManager;
class PostgreSQLDatabaseManager implements TenantDatabaseManager class PostgreSQLDatabaseManager implements TenantDatabaseManager, CanSetConnection
{ {
/** @var Connection */ /** @var string */
protected $database; protected $connection;
public function __construct(Repository $config, IlluminateDatabaseManager $databaseManager) public function __construct(Repository $config)
{ {
$this->database = $databaseManager->connection($config['tenancy.database_manager_connections.pgsql']); $this->connection = $config->get('tenancy.database_manager_connections.pgsql');
} }
public function setConnection(Connection $connection) protected function database(): Connection
{ {
$this->database = $connection; return DB::connection($this->connection);
}
public function setConnection(string $connection): void
{
$this->connection = $connection;
} }
public function createDatabase(string $name): bool public function createDatabase(string $name): bool
{ {
return $this->database->statement("CREATE DATABASE \"$name\" WITH TEMPLATE=template0"); return $this->database()->statement("CREATE DATABASE \"$name\" WITH TEMPLATE=template0");
} }
public function deleteDatabase(string $name): bool public function deleteDatabase(string $name): bool
{ {
return $this->database->statement("DROP DATABASE \"$name\""); return $this->database()->statement("DROP DATABASE \"$name\"");
} }
public function databaseExists(string $name): bool public function databaseExists(string $name): bool
{ {
return (bool) $this->database->select("SELECT datname FROM pg_database WHERE datname = '$name'"); return (bool) $this->database()->select("SELECT datname FROM pg_database WHERE datname = '$name'");
} }
} }