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

Fix tests

Browse source
This commit is contained in:
Samuel Štancl 2019-09-21 12:04:25 +02:00
parent 3cd97bdcab
commit cd53ff120d
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/DatabaseManager.php
View file

@ -78,7 +78,7 @@ class DatabaseManager
*/
public function getBaseConnection(string $connectionName): string
{
return $connectionName
return ($connectionName !== 'tenant' ? $connectionName : null) // 'tenant' is not a specific connection, it's the default
?? $this->app['config']['tenancy.database.based_on']
?? $this->originalDefaultConnectionName; // tenancy.database.based_on === null => use the default connection
}
@ -87,9 +87,9 @@ class DatabaseManager
* Get the driver of a database connection.
*
* @param string $connectionName
* @return string
* @return string|null
*/
public function getDriver(string $connectionName): string
public function getDriver(string $connectionName): ?string
{
return $this->app['config']["database.connections.$connectionName.driver"];
}