Skip to content

Fix tenant-aware connection factory lookup in HeaderBasedMultiTenantConnectionFactory #686

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ralfkuehnel wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix tenant-aware connection factory lookup in HeaderBasedMultiTenantConnectionFactory #686

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
324fb90
pass tenant when resolving connection factory
Jul 21, 2026
09e6357
preserve tenant in connection factory errors
Jul 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions packages/Dbal/src/MultiTenant/HeaderBasedMultiTenantConnectionFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public function getManager(?string $tenant = null): ObjectManager
Assert::notNull($connectionReference, "Lack of context about tenant in Message Headers. Please add `{$this->tenantHeaderName}` header metadata to your message.");
}

$connectionFactory = $this->getConnectionFactory();
$connectionFactory = $this->getConnectionFactory($tenant);
Assert::isTrue($connectionFactory instanceof EcotoneManagerRegistryConnectionFactory, 'Connection factory was not registered by `DbalConnection::createForManagerRegistry()`');

/** @var ManagerRegistry $managerRegistry */
Expand All @@ -94,17 +94,17 @@ public function getConnection(?string $tenant = null): Connection
return $dbalConnection->getDbalConnection();
}

public function getConnectionFactory(): ConnectionFactory
public function getConnectionFactory(?string $tenant = null): ConnectionFactory
{
$connectionReference = $this->getCurrentConnectionReferenceOrNull();
$connectionReference = $this->getCurrentConnectionReferenceOrNull($tenant);

if ($connectionReference === null) {
$tenant = $this->getCurrentTenantOrNull();
$resolvedTenant = $tenant ?? $this->getCurrentTenantOrNull();

if ($tenant === null) {
if ($resolvedTenant === null) {
throw new InvalidArgumentException("Lack of context about tenant in Message Headers. Please add `{$this->tenantHeaderName}` header metadata to your message.");
} else {
throw new InvalidArgumentException("Lack of mapping for tenant `{$tenant}`. Please provide mapping for this tenant or default connection name.");
throw new InvalidArgumentException("Lack of mapping for tenant `{$resolvedTenant}`. Please provide mapping for this tenant or default connection name.");
}
}

Expand Down
Loading