diff --git a/src/TenantDatabaseManagers/MySQLDatabaseManager.php b/src/TenantDatabaseManagers/MySQLDatabaseManager.php index de2ca673..e69aa2ac 100644 --- a/src/TenantDatabaseManagers/MySQLDatabaseManager.php +++ b/src/TenantDatabaseManagers/MySQLDatabaseManager.php @@ -45,7 +45,11 @@ class MySQLDatabaseManager implements TenantDatabaseManager public function databaseExists(string $name): bool { - return config('tenancy.database.check_db_exists') ? (bool) $this->database()->select("SELECT SCHEMA_NAME FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = '$name'") : true; + if(config('tenancy.database.check_db_exists')) { + return (bool) $this->database()->select("SELECT SCHEMA_NAME FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = '$name'"); + } else { + return true; + } } public function makeConnectionConfig(array $baseConfig, string $databaseName): array diff --git a/src/TenantDatabaseManagers/PostgreSQLDatabaseManager.php b/src/TenantDatabaseManagers/PostgreSQLDatabaseManager.php index 65a91c90..d5394eae 100644 --- a/src/TenantDatabaseManagers/PostgreSQLDatabaseManager.php +++ b/src/TenantDatabaseManagers/PostgreSQLDatabaseManager.php @@ -41,7 +41,11 @@ class PostgreSQLDatabaseManager implements TenantDatabaseManager public function databaseExists(string $name): bool { - return config('tenancy.database.check_db_exists') ? (bool)$this->database()->select("SELECT datname FROM pg_database WHERE datname = '$name'") : true; + if (config('tenancy.database.check_db_exists')) { + return (bool)$this->database()->select("SELECT datname FROM pg_database WHERE datname = '$name'"); + } else { + return true; + } } public function makeConnectionConfig(array $baseConfig, string $databaseName): array diff --git a/src/TenantDatabaseManagers/PostgreSQLSchemaManager.php b/src/TenantDatabaseManagers/PostgreSQLSchemaManager.php index 8adc56d9..cec7bd9e 100644 --- a/src/TenantDatabaseManagers/PostgreSQLSchemaManager.php +++ b/src/TenantDatabaseManagers/PostgreSQLSchemaManager.php @@ -41,7 +41,12 @@ class PostgreSQLSchemaManager implements TenantDatabaseManager public function databaseExists(string $name): bool { - return config('tenancy.database.check_db_exists') ? (bool) $this->database()->select("SELECT schema_name FROM information_schema.schemata WHERE schema_name = '$name'") : true; + if(config('tenancy.database.check_db_exists')) { + return (bool) $this->database()->select("SELECT schema_name FROM information_schema.schemata WHERE schema_name = '$name'"); + } else { + return true; + } + } public function makeConnectionConfig(array $baseConfig, string $databaseName): array diff --git a/src/TenantDatabaseManagers/SQLiteDatabaseManager.php b/src/TenantDatabaseManagers/SQLiteDatabaseManager.php index 4a2200d3..cc370a83 100644 --- a/src/TenantDatabaseManagers/SQLiteDatabaseManager.php +++ b/src/TenantDatabaseManagers/SQLiteDatabaseManager.php @@ -29,7 +29,11 @@ class SQLiteDatabaseManager implements TenantDatabaseManager public function databaseExists(string $name): bool { - return config('tenancy.database.check_db_exists') ? file_exists(database_path($name)) : true; + if(config('tenancy.database.check_db_exists')) { + return file_exists(database_path($name)); + } else { + return true; + } } public function makeConnectionConfig(array $baseConfig, string $databaseName): array