1
0
Fork 0
mirror of synced 2024-07-10 08:56:25 +12:00

Fix worker tenant set/reset

This commit is contained in:
Jake Barnby 2023-11-28 00:27:16 +13:00
parent b9ac8e644d
commit 68548ebd47
No known key found for this signature in database
GPG key ID: C437A8CC85B96E9C

View file

@ -72,9 +72,12 @@ Server::setResource('dbForProject', function (Cache $cache, Registry $register,
if ($project->getAttribute('shareTables')) {
$database
->setShareTables(true)
->setTenant($project->getId());
->setTenant($project->getInternalId())
->setNamespace('');
} else {
$database
->setShareTables(false)
->setTenant(null)
->setNamespace('_' . $project->getInternalId());
}
@ -94,14 +97,19 @@ Server::setResource('getProjectDB', function (Group $pools, Database $dbForConso
if (isset($databases[$databaseName])) {
$database = $databases[$databaseName];
if ($project->getAttribute('shareTables')) {
$database
->setShareTables(true)
->setTenant($project->getId());
->setTenant($project->getInternalId())
->setNamespace('');
} else {
$database
->setShareTables(false)
->setTenant(null)
->setNamespace('_' . $project->getInternalId());
}
return $database;
}
@ -117,9 +125,12 @@ Server::setResource('getProjectDB', function (Group $pools, Database $dbForConso
if ($project->getAttribute('shareTables')) {
$database
->setShareTables(true)
->setTenant($project->getId());
->setTenant($project->getInternalId())
->setNamespace('');
} else {
$database
->setShareTables(false)
->setTenant(null)
->setNamespace('_' . $project->getInternalId());
}