From 193e044777a0ad5f9f9f6af0e174a2c70f4184fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20=C5=A0tancl?= Date: Thu, 29 Sep 2022 16:02:40 +0200 Subject: [PATCH] remove remaining version checks --- .../TenantDatabaseManagers/PostgreSQLSchemaManager.php | 6 +----- tests/BootstrapperTest.php | 4 ---- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Database/TenantDatabaseManagers/PostgreSQLSchemaManager.php b/src/Database/TenantDatabaseManagers/PostgreSQLSchemaManager.php index fa5aa593..a7558e1b 100644 --- a/src/Database/TenantDatabaseManagers/PostgreSQLSchemaManager.php +++ b/src/Database/TenantDatabaseManagers/PostgreSQLSchemaManager.php @@ -25,11 +25,7 @@ class PostgreSQLSchemaManager extends TenantDatabaseManager public function makeConnectionConfig(array $baseConfig, string $databaseName): array { - if (version_compare(app()->version(), '9.0', '>=')) { - $baseConfig['search_path'] = $databaseName; - } else { - $baseConfig['schema'] = $databaseName; - } + $baseConfig['search_path'] = $databaseName; return $baseConfig; } diff --git a/tests/BootstrapperTest.php b/tests/BootstrapperTest.php index a610fbd2..ba4ea41a 100644 --- a/tests/BootstrapperTest.php +++ b/tests/BootstrapperTest.php @@ -332,10 +332,6 @@ function getDiskPrefix(string $disk): string $disk = Storage::disk($disk); $adapter = $disk->getAdapter(); - if (! Str::startsWith(app()->version(), '9.')) { - return $adapter->getPathPrefix(); - } - $prefixer = (new ReflectionObject($adapter))->getProperty('prefixer'); $prefixer->setAccessible(true);