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

Restructure config

Browse source
This commit is contained in:
Samuel Štancl 2020-05-21 15:05:05 +02:00
parent 15a7e52208
commit fbe43fbb04
10 changed files with 57 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Database/Concerns/CentralConnection.php
View file

@ -6,6 +6,6 @@ trait CentralConnection
{
public function getConnectionName()
{
return config('tenancy.central_connection');
return config('tenancy.database.central_connection');
}
}

4
src/Database/Concerns/HasDataColumn.php
View file

@ -121,6 +121,8 @@ trait HasDataColumn
public static function getCustomColums(): array
{
return array_merge(['id'], config('tenancy.custom_columns'));
return [
'id',
];
}
}

6
src/DatabaseConfig.php
View file

@ -100,8 +100,8 @@ class DatabaseConfig
public function getTemplateConnectionName(): string
{
return $this->tenant->getInternal('db_connection')
?? config('tenancy.template_tenant_connection')
?? config('tenancy.central_connection');
?? config('tenancy.database.template_tenant_connection')
?? config('tenancy.database.central_connection');
}
/**
@ -150,7 +150,7 @@ class DatabaseConfig
{
$driver = config("database.connections.{$this->getTemplateConnectionName()}.driver");
$databaseManagers = config('tenancy.database_managers');
$databaseManagers = config('tenancy.database.managers');
if (! array_key_exists($driver, $databaseManagers)) {
throw new DatabaseManagerNotRegisteredException($driver);

2
src/DatabaseManager.php
View file

@ -56,7 +56,7 @@ class DatabaseManager
$this->database->purge('tenant');
}
$this->setDefaultConnection($this->config->get('tenancy.central_connection'));
$this->setDefaultConnection($this->config->get('tenancy.database.central_connection'));
}
/**