archtechx/tenancy
1
0
Fork 0
mirror of https://github.com/archtechx/tenancy.git synced 2026-06-21 08:24:04 +00:00
Code Activity

Validate in-memory DBs outside of isInMemory

Browse source 
isInMemory should check if the name looks ilke an in-memory database name and return bool (it shouldn't throw validation errors).

Also, make the validation methods non-static.
This commit is contained in:
lukinovec 2026-05-01 15:22:40 +02:00
parent 429e0985fd
commit ea20eb13b6
2 changed files with 17 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/Database/TenantDatabaseManagers/SQLiteDatabaseManager.php
View file

@ -136,6 +136,9 @@ class SQLiteDatabaseManager implements TenantDatabaseManager
public function makeConnectionConfig(array $baseConfig, string $databaseName): array
{
if ($this->isInMemory($databaseName)) {
// Named in-memory DBs are formatted like 'file:_tenancy_inmemory_tenant123?mode=memory&cache=shared'
$this->validateDatabaseName($databaseName, ':?=&');
$baseConfig['database'] = $databaseName;
if (static::$persistInMemoryConnectionUsing !== null) {
@ -162,30 +165,21 @@ class SQLiteDatabaseManager implements TenantDatabaseManager
public static function isInMemory(string $name): bool
{
if ($name === ':memory:') {
return true;
}
$isNamed = str_starts_with($name, 'file:_tenancy_inmemory_') &&
str_ends_with($name, '?mode=memory&cache=shared');
if (str_starts_with($name, 'file:_tenancy_inmemory_') &&
str_ends_with($name, '?mode=memory&cache=shared')) {
// Named in-memory DBs are formatted like 'file:_tenancy_inmemory_tenant123?mode=memory&cache=shared'
static::validateDatabaseName($name, ':?=&');
return true;
}
return false;
return $name === ':memory:' || $isNamed;
}
/**
* Ensure database name only contains allowed characters
* (static::allowedDatabaseNameCharacters() + $extraAllowedCharacters) and is not a directory name.
* (allowedDatabaseNameCharacters() + $extraAllowedCharacters) and is not a directory name.
*
* @throws InvalidArgumentException
*/
protected static function validateDatabaseName(string $name, string $extraAllowedCharacters = ''): void
protected function validateDatabaseName(string $name, string $extraAllowedCharacters = ''): void
{
static::validateParameter($name, static::allowedDatabaseNameCharacters() . $extraAllowedCharacters);
$this->validateParameter($name, $this->allowedDatabaseNameCharacters() . $extraAllowedCharacters);
if ($name === '') {
throw new InvalidArgumentException('Database name cannot be empty.');