Fix worker tenant set/reset
This commit is contained in:
parent
b9ac8e644d
commit
68548ebd47
1 changed files with 15 additions and 4 deletions
|
@ -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());
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue