This commit is contained in:
Jake Barnby
2024-03-06 21:50:31 +01:00
parent 3312ed1c5d
commit 2bed17de35
3 changed files with 42 additions and 42 deletions
+14 -14
View File
@@ -104,17 +104,17 @@ CLI::setResource('getProjectDB', function (Group $pools, Database $dbForConsole,
if (isset($databases[$databaseName])) {
$database = $databases[$databaseName];
if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
// if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
$database
->setShareTables(true)
->setTenant($project->getInternalId())
->setNamespace('');
} else {
$database
->setShareTables(false)
->setTenant(null)
->setNamespace('_' . $project->getInternalId());
}
// } else {
// $database
// ->setShareTables(false)
// ->setTenant(null)
// ->setNamespace('_' . $project->getInternalId());
// }
return $database;
}
@@ -128,17 +128,17 @@ CLI::setResource('getProjectDB', function (Group $pools, Database $dbForConsole,
$databases[$databaseName] = $database;
if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
// if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
$database
->setShareTables(true)
->setTenant($project->getInternalId())
->setNamespace('');
} else {
$database
->setShareTables(false)
->setTenant(null)
->setNamespace('_' . $project->getInternalId());
}
// } else {
// $database
// ->setShareTables(false)
// ->setTenant(null)
// ->setNamespace('_' . $project->getInternalId());
// }
$database
->setNamespace('_' . $project->getInternalId())
+7 -7
View File
@@ -1183,17 +1183,17 @@ App::setResource('getProjectDB', function (Group $pools, Database $dbForConsole,
->setMetadata('project', $project->getId())
->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS);
if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
// if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
$database
->setShareTables(true)
->setTenant($project->getInternalId())
->setNamespace('');
} else {
$database
->setShareTables(false)
->setTenant(null)
->setNamespace('_' . $project->getInternalId());
}
// } else {
// $database
// ->setShareTables(false)
// ->setTenant(null)
// ->setNamespace('_' . $project->getInternalId());
// }
});
if (isset($databases[$databaseName])) {
+21 -21
View File
@@ -75,17 +75,17 @@ Server::setResource('dbForProject', function (Cache $cache, Registry $register,
->setMetadata('host', \gethostname())
->setMetadata('project', $project->getId());
if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
// if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
$database
->setShareTables(true)
->setTenant($project->getInternalId())
->setNamespace('');
} else {
$database
->setShareTables(false)
->setTenant(null)
->setNamespace('_' . $project->getInternalId());
}
// } else {
// $database
// ->setShareTables(false)
// ->setTenant(null)
// ->setNamespace('_' . $project->getInternalId());
// }
return $database;
}, ['cache', 'register', 'message', 'dbForConsole']);
@@ -114,17 +114,17 @@ Server::setResource('getProjectDB', function (Group $pools, Database $dbForConso
if (isset($databases[$databaseName])) {
$database = $databases[$databaseName];
if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
// if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
$database
->setShareTables(true)
->setTenant($project->getInternalId())
->setNamespace('');
} else {
$database
->setShareTables(false)
->setTenant(null)
->setNamespace('_' . $project->getInternalId());
}
// } else {
// $database
// ->setShareTables(false)
// ->setTenant(null)
// ->setNamespace('_' . $project->getInternalId());
// }
return $database;
}
@@ -138,17 +138,17 @@ Server::setResource('getProjectDB', function (Group $pools, Database $dbForConso
$databases[$databaseName] = $database;
if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
// if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
$database
->setShareTables(true)
->setTenant($project->getInternalId())
->setNamespace('');
} else {
$database
->setShareTables(false)
->setTenant(null)
->setNamespace('_' . $project->getInternalId());
}
// } else {
// $database
// ->setShareTables(false)
// ->setTenant(null)
// ->setNamespace('_' . $project->getInternalId());
// }
return $database;
};