From 4e26118facae69ae8c37b6ca3481f44b9a44b1f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20=C5=A0tancl?= Date: Fri, 12 Jul 2019 23:01:01 +0200 Subject: [PATCH] Fix bugs --- src/TenantDatabaseManagers/PostgreSQLDatabaseManager.php | 2 +- tests/TenantDatabaseManagerTest.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/TenantDatabaseManagers/PostgreSQLDatabaseManager.php b/src/TenantDatabaseManagers/PostgreSQLDatabaseManager.php index 71aaa5d2..2f56ff38 100644 --- a/src/TenantDatabaseManagers/PostgreSQLDatabaseManager.php +++ b/src/TenantDatabaseManagers/PostgreSQLDatabaseManager.php @@ -9,7 +9,7 @@ class PostgreSQLDatabaseManager implements TenantDatabaseManager { public function createDatabase(string $name): bool { - return DB::statement("CREATE DATABASE $name WITH ENCODING 'UTF8' LC_COLLATE = 'en_US.UTF-8' LC_CTYPE = 'en_US.UTF-8'"); + return DB::statement("CREATE DATABASE $name WITH TEMPLATE=template0"); } public function deleteDatabase(string $name): bool diff --git a/tests/TenantDatabaseManagerTest.php b/tests/TenantDatabaseManagerTest.php index ac81e183..dc68ac03 100644 --- a/tests/TenantDatabaseManagerTest.php +++ b/tests/TenantDatabaseManagerTest.php @@ -87,7 +87,7 @@ class TenantDatabaseManagerTest extends TestCase config()->set('database.default', 'pgsql'); - $db_name = 'testdatabase' . $this->randomString(10); + $db_name = strtolower('testdatabase' . $this->randomString(10)); $this->assertTrue(app(DatabaseManager::class)->create($db_name, 'pgsql')); $this->assertNotEmpty(DB::select("SELECT datname FROM pg_database WHERE datname = '$db_name'")); @@ -104,7 +104,7 @@ class TenantDatabaseManagerTest extends TestCase config()->set('database.default', 'pgsql'); - $db_name = 'testdatabase' . $this->randomString(10); + $db_name = strtolower('testdatabase' . $this->randomString(10)); $databaseManagers = config('tenancy.database_managers'); $job = new QueuedTenantDatabaseCreator(app($databaseManagers['pgsql']), $db_name);