From 1b252935bbe83a724075f274084a397ac91a4b4d Mon Sep 17 00:00:00 2001 From: Nathan Dunn Date: Thu, 7 Apr 2022 10:41:53 +0100 Subject: [PATCH] Update PostgreSQLSchemaManager to set correct config key value --- src/TenantDatabaseManagers/PostgreSQLSchemaManager.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/TenantDatabaseManagers/PostgreSQLSchemaManager.php b/src/TenantDatabaseManagers/PostgreSQLSchemaManager.php index 9d815b25..9a8cbbbf 100644 --- a/src/TenantDatabaseManagers/PostgreSQLSchemaManager.php +++ b/src/TenantDatabaseManagers/PostgreSQLSchemaManager.php @@ -5,6 +5,7 @@ declare(strict_types=1); namespace Stancl\Tenancy\TenantDatabaseManagers; use Illuminate\Database\Connection; +use Illuminate\Support\Arr; use Illuminate\Support\Facades\DB; use Stancl\Tenancy\Contracts\TenantDatabaseManager; use Stancl\Tenancy\Contracts\TenantWithDatabase; @@ -46,7 +47,8 @@ class PostgreSQLSchemaManager implements TenantDatabaseManager public function makeConnectionConfig(array $baseConfig, string $databaseName): array { - $baseConfig['schema'] = $databaseName; + Arr::has($baseConfig, 'search_path') ? $baseConfig['search_path'] = $databaseName : null; + Arr::has($baseConfig, 'schema') ? $baseConfig['schema'] = $databaseName : null; return $baseConfig; }